Merge remote-tracking branch 'origin/master'

ruoyi-modules/Property/src/main/java/org/dromara/property/controller/mobile/MServiceWorkOrdersController.java

@@ -6,14 +6,15 @@ import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
+import org.dromara.property.domain.bo.ServiceWorkOrdersBo;
 import org.dromara.property.domain.bo.mobile.MServiceWorkOrdersBo;
+import org.dromara.property.domain.vo.ServiceWorkOrdersVo;
 import org.dromara.property.service.IServiceWorkOrdersService;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 【业务管理-工单处理】
@@ -38,4 +39,11 @@ public class MServiceWorkOrdersController extends BaseController {
     public R<Void> add(@Validated(AddGroup.class) @RequestBody MServiceWorkOrdersBo bo) {
         return toAjax(serviceWorkOrdersService.insertMServiceWorkOrdersBo(bo));
     }
+    /**
+     * 小程序查询【工单处理】
+     */
+    @GetMapping("/list")
+    public TableDataInfo<ServiceWorkOrdersVo> list(ServiceWorkOrdersBo bo, PageQuery pageQuery) {
+        return serviceWorkOrdersService.queryPageList(bo, pageQuery);
+    }
 }

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;
 
     /**
      * 区域

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;
 
     /**
      * 区域

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) {

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")));
 
         // 设备信息

ruoyi-modules/Sis/src/main/java/org/dromara/sis/task/DataSyncTask.java

@@ -86,7 +86,7 @@ public class DataSyncTask {
                     //同步成功后，将两张表的数据合并到alarmEvents表中
                     SisAlarmEventsBo sisAlarmEvents = new SisAlarmEventsBo();
                     sisAlarmEvents.setId(recordId);
-                    sisAlarmEvents.setType(Long.valueOf((Integer) recordMap.get("Type")));
+//                    sisAlarmEvents.setType(Long.valueOf((Integer) recordMap.get("Type")));
                     sisAlarmEvents.setLevel(Long.valueOf((Integer) recordMap.get("Level")));
                     sisAlarmEvents.setDeviceIp((String) recordMap.get("DeviceSipNum"));
                     sisAlarmEvents.setDeviceName(recordMap.get("DeviceName").toString());