今日报警总数

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

@@ -21,6 +21,18 @@ public class AlarmInformationVo {
      */
     private Integer processingAlarm = 0;
 
+
+    /**
+     * 今日报警总数
+     */
+    private Integer alarmsTotalToday = 0;
+
+    /**
+     * 今日总处理报警
+     */
+    private Integer processingAlarmToday = 0;
+
+
     /**
      * 强制报警
      */

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java

@@ -649,7 +649,7 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
     /**
      * 获取设备使用数据
      *
-     * @param deviceId 设备ID
+     * @param deviceTypeId 设备ID
      * @param range    时间范围 1:半年 2:一年
      * @return 每月使用数据列表
      */

fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml

@@ -347,30 +347,38 @@
 
     <!-- 获取告警信息 -->
     <select id="getAlarmInformation" resultType="com.fuyuanshen.equipment.domain.vo.AlarmInformationVo">
-        SELECT (SELECT COUNT(1) FROM device_alarm WHERE treatment_state = 0 AND DATE (create_time) = CURDATE()) AS alarmsTotal, (
+        SELECT (SELECT COUNT(1) FROM device_alarm WHERE treatment_state = 0) AS alarmsTotal
+             , (SELECT COUNT(1)
+                FROM device_alarm
+                WHERE treatment_state = 0)                                   AS processingAlarm
+             , (SELECT COUNT(1)
+                FROM device_alarm
+                WHERE treatment_state = 0 AND
+            DATE (create_time) = CURDATE()) AS alarmsTotalToday
+             , (
         SELECT COUNT (1)
         FROM device_alarm
         WHERE treatment_state = 0
-          AND DATE (create_time) = CURDATE()) AS processingAlarm
+          AND DATE (create_time) = CURDATE()) AS processingAlarmToday
             , (
         SELECT COUNT (1)
         FROM device_alarm
         WHERE device_action = 0
-          AND DATE (create_time) = CURDATE()) AS alarmForced
+            ) AS alarmForced
             , (
         SELECT COUNT (1)
         FROM device_alarm
         WHERE device_action = 1
-          AND DATE (create_time) = CURDATE()) AS intrusionImpact
+            ) AS intrusionImpact
             , (
         SELECT COUNT (1)
         FROM device_alarm
         WHERE device_action = 2
-          AND DATE (create_time) = CURDATE()) AS alarmManual
+            ) AS alarmManual
             , (
         SELECT COUNT (1)
         FROM device_alarm
-        WHERE device_action = 3 AND DATE (create_time) = CURDATE()) AS fenceElectronic
+        WHERE device_action = 3) AS fenceElectronic
 
     </select>