From 67b3ae8d17016d79d584754b4fe2b39987499404 Mon Sep 17 00:00:00 2001
From: dy <2389062315@qq.com>
Date: Thu, 14 Aug 2025 17:18:33 +0800
Subject: [PATCH] 1

---
 .../java/org/dromara/property/domain/AttendanceArea.java   | 2 +-
 .../org/dromara/property/domain/bo/AttendanceAreaBo.java   | 4 +++-
 .../property/service/impl/AttendanceAreaServiceImpl.java   | 7 +++++++
 .../org/dromara/sis/controller/AlarmPushController.java    | 2 +-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceArea.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceArea.java
index 12dd4157..e93cd13d 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceArea.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceArea.java
@@ -30,7 +30,7 @@ public class AttendanceArea extends TenantEntity {
     /**
      * 摄像机id
      */
-    private Long deviceManageId;
+    private String deviceManageId;
 
     /**
      * 区域
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceAreaBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceAreaBo.java
index 6f4b3039..b65fc902 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceAreaBo.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceAreaBo.java
@@ -9,6 +9,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
 
+import java.util.List;
+
 /**
  * 区域区域管理业务对象 attendance_area
  *
@@ -29,7 +31,7 @@ public class AttendanceAreaBo extends BaseEntity {
     /**
      * 摄像机id
      */
-    private Long deviceManageId;
+    private List<Long> deviceManageId;
 
     /**
      * 区域
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceAreaServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceAreaServiceImpl.java
index e22440b7..113999b1 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceAreaServiceImpl.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceAreaServiceImpl.java
@@ -1,5 +1,6 @@
 package org.dromara.property.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -89,6 +90,12 @@ public class AttendanceAreaServiceImpl implements IAttendanceAreaService {
     @Override
     public Boolean insertByBo(AttendanceAreaBo bo) {
         AttendanceArea add = MapstructUtils.convert(bo, AttendanceArea.class);
+        if (ObjectUtil.isNotEmpty(bo.getDeviceManageId())) {
+            assert add != null;
+            // 将 deviceManageId 集合转换为以逗号分隔的字符串
+            String deviceManageIdsStr = StringUtils.join(bo.getDeviceManageId(), ",");
+            add.setDeviceManageId(deviceManageIdsStr);
+        }
         validEntityBeforeSave(add);
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/AlarmPushController.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/AlarmPushController.java
index 929d50c0..1ed9b47c 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/AlarmPushController.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/AlarmPushController.java
@@ -130,7 +130,7 @@ public class AlarmPushController {
         sisAlarmEvents.setId(recordId);
 
         // 转换类型和级别
-        sisAlarmEvents.setType(convertToLong(recordMap.get("Type")));
+//        sisAlarmEvents.setType(convertToLong(recordMap.get("Type")));
         sisAlarmEvents.setLevel(convertToLong(recordMap.get("Level")));
 
         // 设备信息