From e6d5cf808bb278e1083d39f298eada1606af2e2d Mon Sep 17 00:00:00 2001
From: guo <guo@guo>
Date: Tue, 30 Jan 2024 18:29:23 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../electrical/mapper/xml/ElectricAlarmMapper.xml    | 12 +++++++-----
 .../task/DischargingPlatformCurrentDataTask.java     | 12 ++++++------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/electrical/mapper/xml/ElectricAlarmMapper.xml b/src/main/java/com/zhgd/xmgl/modules/electrical/mapper/xml/ElectricAlarmMapper.xml
index 1a4b9b609..6344462ff 100644
--- a/src/main/java/com/zhgd/xmgl/modules/electrical/mapper/xml/ElectricAlarmMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/electrical/mapper/xml/ElectricAlarmMapper.xml
@@ -27,16 +27,18 @@
         FROM
         electric_alarm a
         LEFT JOIN electrical_dev c ON (a.dev_sn =c.dev_sn and a.project_sn=c.project_sn)
-        where a.project_sn=#{projectSn}
+        where a.project_sn=#{projectSn} and a.type=0
         order by a.creat_time desc
         limit 10
     </select>
     <select id="gettElectricAlarmNumCount" resultType="java.util.Map">
         SELECT
-            COUNT(1) totalAlarmNum,
-            IFNULL(SUM((CASE WHEN DATE_FORMAT(creat_time,'%Y-%m-%d')=DATE_FORMAT(NOW(),'%Y-%m-%d') THEN 1 ELSE 0 END)),0) dayAlarmNum,
-            IFNULL(SUM((CASE WHEN DATE_FORMAT(creat_time,'%Y-%m')=DATE_FORMAT(NOW(),'%Y-%m') THEN 1 ELSE 0 END)),0) monthAlarmNum
+        COUNT(1) totalAlarmNum,
+        IFNULL(SUM((CASE WHEN DATE_FORMAT(creat_time,'%Y-%m-%d')=DATE_FORMAT(NOW(),'%Y-%m-%d') THEN 1 ELSE 0 END)),0)
+        dayAlarmNum,
+        IFNULL(SUM((CASE WHEN DATE_FORMAT(creat_time,'%Y-%m')=DATE_FORMAT(NOW(),'%Y-%m') THEN 1 ELSE 0 END)),0)
+        monthAlarmNum
         from electric_alarm
-        where project_sn=#{projectSn}
+        where project_sn=#{projectSn} and type=0
     </select>
 </mapper>
diff --git a/src/main/java/com/zhgd/xmgl/task/DischargingPlatformCurrentDataTask.java b/src/main/java/com/zhgd/xmgl/task/DischargingPlatformCurrentDataTask.java
index bf3793bd4..2d04c19c4 100644
--- a/src/main/java/com/zhgd/xmgl/task/DischargingPlatformCurrentDataTask.java
+++ b/src/main/java/com/zhgd/xmgl/task/DischargingPlatformCurrentDataTask.java
@@ -137,31 +137,31 @@ public class DischargingPlatformCurrentDataTask {
         if (Objects.equals(dto.getWeightStatus(), 1)) {
             data.setIsAlarm(1);
             data.setAlarmLevel(3);
-            data.setAlarmType("重量状态预警");
+            data.setAlarmType("重量状态次要告警");
         } else if (Objects.equals(dto.getWeightStatus(), 2)) {
             data.setIsAlarm(1);
             data.setAlarmLevel(1);
-            data.setAlarmType("重量状态报警");
+            data.setAlarmType("重量状态紧急告警");
         }
 
         if (Objects.equals(dto.getInclinationXStatus(), 1)) {
             data.setIsAlarm(1);
             data.setAlarmLevel(3);
-            data.setAlarmType("倾角X状态预警");
+            data.setAlarmType("倾角X状态次要告警");
         } else if (Objects.equals(dto.getInclinationXStatus(), 2)) {
             data.setIsAlarm(1);
             data.setAlarmLevel(1);
-            data.setAlarmType("倾角X状态报警");
+            data.setAlarmType("倾角X状态紧急告警");
         }
 
         if (Objects.equals(dto.getInclinationYStatus(), 1)) {
             data.setIsAlarm(1);
             data.setAlarmLevel(3);
-            data.setAlarmType("倾角Y状态预警");
+            data.setAlarmType("倾角Y状态次要告警");
         } else if (Objects.equals(dto.getInclinationYStatus(), 2)) {
             data.setIsAlarm(1);
             data.setAlarmLevel(1);
-            data.setAlarmType("倾角Y状态报警");
+            data.setAlarmType("倾角Y状态紧急告警");
         }
 
     }