Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks

ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAlarmEvents.java

@@ -30,12 +30,17 @@ public class SisAlarmEvents extends TenantEntity {
     private Long id;
 
     /**
-     * 报警事件类型
+     * 事件大类
      */
-    private Long type;
+    private Long bigType;
 
     /**
-     * 报警记录级别(1：一般，2：中级，3：紧急)
+     * 事件小类
+     */
+    private Long smallType;
+
+    /**
+     * 报警记录级别(0:特急;1:紧急;2:普通)
      */
     private Long level;
 

ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAlarmEventsBo.java

@@ -29,15 +29,19 @@ public class SisAlarmEventsBo extends BaseEntity {
     private Long id;
 
     /**
-     * 报警事件类型
+     * 事件大类
      */
-    @NotNull(message = "报警事件类型不能为空", groups = {AddGroup.class, EditGroup.class})
-    private Long type;
+    private Long bigType;
+
+    /**
+     * 事件小类
+     */
+    private Long smallType;
 
     /**
      * 报警记录级别(1：一般，2：中级，3：紧急)
      */
-    @NotNull(message = "报警记录级别(1：一般，2：中级，3：紧急)不能为空", groups = {AddGroup.class, EditGroup.class})
+    @NotNull(message = "报警记录级别(0:特急;1:紧急;2:普通)不能为空", groups = {AddGroup.class, EditGroup.class})
     private Long level;
 
     /**

ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/enums/EventBigTypeEnum.java

@@ -0,0 +1,44 @@
+package org.dromara.sis.domain.enums;
+
+import lombok.Getter;
+
+/**
+ * 事件大类枚举
+ *
+ * @author lxj
+ */
+@Getter
+public enum EventBigTypeEnum {
+    /**
+     * 10：设备上报
+     */
+    EQUIPMENT_UP(10, "设备上报"),
+    /**
+     * 20:系统报警
+     */
+    SYSTEM_ALERM(20, "系统报警"),
+
+    /**
+     * 30:移动端上报
+     */
+    MOBILE_REPORT(30, "移动端上报"),
+
+    /**
+     * 40:客户求助
+     */
+    CUST_NEED_HELP(40, "客户求助"),
+
+    /**
+     * 50:客户投诉
+     */
+    CUST_COMPLAINT(50, "客户投诉");
+
+    private final Integer code;
+
+    private final String desc;
+
+    EventBigTypeEnum(Integer code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+}

ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/enums/EventSmallTypeEnum.java

@@ -0,0 +1,40 @@
+package org.dromara.sis.domain.enums;
+
+import lombok.Getter;
+
+/**
+ * 事件小类
+ *
+ * @author lxj
+ */
+@Getter
+public enum EventSmallTypeEnum {
+
+    EQP_REPORT_RYLG(1001, "人员离岗"),
+    EQP_REPORT_RYSG(1002, "人员睡岗"),
+    EQP_REPORT_RYDD(1003, "人员倒地"),
+    EQP_REPORT_CY(1004, "抽烟"),
+    EQP_REPORT_DDH(1005, "打电话"),
+    EQP_REPORT_WSJ(1006, "玩手机"),
+    EQP_REPORT_RYJJ(1007, "人员聚集"),
+    EQP_REPORT_ZJCR(1008, "周界闯入"),
+    EQP_REPORT_RYPH(1009, "人员徘徊"),
+
+
+    ;
+
+    /**
+     * 事件编码
+     */
+    private final Integer code;
+
+    /**
+     * 事件描述
+     */
+    private final String desc;
+
+    EventSmallTypeEnum(Integer code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+}

ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAlarmEventsVo.java

@@ -31,21 +31,19 @@ public class SisAlarmEventsVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 报警记录ID
+     * 事件大类
      */
-    @ExcelProperty(value = "报警记录ID")
-    private Long id;
+    private Long bigType;
 
     /**
-     * 报警事件类型
+     * 事件小类
      */
-    @ExcelProperty(value = "报警事件类型")
-    private Long type;
+    private Long smallType;
 
     /**
      * 报警记录级别(1：一般，2：中级，3：紧急)
      */
-    @ExcelProperty(value = "报警记录级别(1：一般，2：中级，3：紧急)")
+    @ExcelProperty(value = "报警记录级别(0:特急;1:紧急;2:普通)")
     private Long level;
 
     /**

ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAlarmEventsServiceImpl.java

@@ -87,7 +87,6 @@ public class SisAlarmEventsServiceImpl implements ISisAlarmEventsService {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<SisAlarmEvents> lqw = Wrappers.lambdaQuery();
         lqw.orderByAsc(SisAlarmEvents::getId);
-        lqw.eq(bo.getType() != null, SisAlarmEvents::getType, bo.getType());
         lqw.eq(bo.getLevel() != null, SisAlarmEvents::getLevel, bo.getLevel());
         lqw.eq(StringUtils.isNotBlank(bo.getDeviceIp()), SisAlarmEvents::getDeviceIp, bo.getDeviceIp());
         lqw.like(StringUtils.isNotBlank(bo.getDeviceName()), SisAlarmEvents::getDeviceName, bo.getDeviceName());
@@ -161,7 +160,9 @@ public class SisAlarmEventsServiceImpl implements ISisAlarmEventsService {
         }
         // 生成时间信息
         SisAlarmEvents alarmEvents = new SisAlarmEvents();
-        alarmEvents.setType(1L);
+        //
+        alarmEvents.setBigType(10L);
+        alarmEvents.setSmallType(1008L);
         alarmEvents.setLevel(Long.valueOf(level));
         alarmEvents.setDeviceIp(deviceIp);
         alarmEvents.setDeviceName(sisDeviceManage.getDeviceName());