From 5230a958654dad7f63b3d1f47d4a218f91858453 Mon Sep 17 00:00:00 2001
From: daiyongfei <974332738@qq.com>
Date: Sun, 28 Sep 2025 15:28:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=8A=A5=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equipment/domain/vo/AlarmInformationVo.java          | 9 ++++-----
 .../equipment/domain/vo/AlarmStatisticsVo.java           | 4 ++--
 .../resources/mapper/equipment/DeviceAlarmMapper.xml     | 2 +-
 .../src/main/resources/mapper/equipment/DeviceMapper.xml | 2 +-
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AlarmInformationVo.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AlarmInformationVo.java
index 1d2e248..24016f9 100644
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AlarmInformationVo.java
+++ b/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;
 
diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AlarmStatisticsVo.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AlarmStatisticsVo.java
index 7de7149..edde9bb 100644
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AlarmStatisticsVo.java
+++ b/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;
     
     /**
      * 电子围栏告警数量
diff --git a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceAlarmMapper.xml b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceAlarmMapper.xml
index 413c1da..034cd1d 100644
--- a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceAlarmMapper.xml
+++ b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceAlarmMapper.xml
@@ -76,7 +76,7 @@
             (SELECT COUNT(1) FROM device_alarm WHERE treatment_state = 0) AS processedAlarms,
             (SELECT COUNT(1) FROM device_alarm WHERE device_action = 0) AS forcedAlarms,
             (SELECT COUNT(1) FROM device_alarm WHERE device_action = 1) AS intrusionImpactAlarms,
-            (SELECT COUNT(1) FROM device_alarm WHERE device_action = 2) AS manualAlarms,
+            (SELECT COUNT(1) FROM device_alarm WHERE device_action = 2) AS autoAlarms,
             (SELECT COUNT(1) FROM device_alarm WHERE device_action = 3) AS geoFenceAlarms
     </select>
     
diff --git a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml
index f4681e3..1e4ece1 100644
--- a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml
+++ b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml
@@ -404,7 +404,7 @@
         SELECT COUNT (1)
         FROM device_alarm
         WHERE device_action = 2
-            ) AS alarmManual
+            ) AS alarmAuto
             , (
         SELECT COUNT (1)
         FROM device_alarm