自动报警

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AlarmInformationVo.java

@@ -4,6 +4,7 @@ import lombok.Data;
 
 /**
  * 报警信息
+ * 0-强制报警，1-撞击闯入，2-自动报警，3-电子围栏告警
  *
  * @author: 默苍璃
  * @date: 2025-09-0114:24
@@ -21,7 +22,6 @@ public class AlarmInformationVo {
      */
     private Integer processingAlarm = 0;
 
-
     /**
      * 今日报警总数
      */
@@ -32,7 +32,6 @@ public class AlarmInformationVo {
      */
     private Integer processingAlarmToday = 0;
 
-
     /**
      * 强制报警
      */
@@ -44,12 +43,12 @@ public class AlarmInformationVo {
     private Integer intrusionImpact = 0;
 
     /**
-     * 手动报警
+     * 自动报警
      */
-    private Integer alarmManual = 0;
+    private Integer alarmAuto = 0;
 
     /**
-     *
+     * 电子围栏告警
      */
     private Integer fenceElectronic = 0;
 

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AlarmStatisticsVo.java

@@ -43,10 +43,10 @@ public class AlarmStatisticsVo implements Serializable {
     private Integer intrusionImpactAlarms = 0;
     
     /**
-     * 手动报警数量
+     * 自动报警数量
      * device_action = 2
      */
-    private Integer manualAlarms = 0;
+    private Integer autoAlarms = 0;
     
     /**
      * 电子围栏告警数量