admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
guo 2024-01-30 18:29:23 +08:00
parent 9081280f40
commit e6d5cf808b
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/zhgd/xmgl/modules/electrical/mapper/xml/ElectricAlarmMapper.xml
View File

@ -27,16 +27,18 @@
FROM FROM
electric_alarm a electric_alarm a
LEFT JOIN electrical_dev c ON (a.dev_sn =c.dev_sn and a.project_sn=c.project_sn) 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 order by a.creat_time desc
limit 10 limit 10
</select> </select>
<select id="gettElectricAlarmNumCount" resultType="java.util.Map"> <select id="gettElectricAlarmNumCount" resultType="java.util.Map">
SELECT SELECT
COUNT(1) totalAlarmNum, 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-%d')=DATE_FORMAT(NOW(),'%Y-%m-%d') THEN 1 ELSE 0 END)),0)
IFNULL(SUM((CASE WHEN DATE_FORMAT(creat_time,'%Y-%m')=DATE_FORMAT(NOW(),'%Y-%m') THEN 1 ELSE 0 END)),0) monthAlarmNum 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 from electric_alarm
where project_sn=#{projectSn} where project_sn=#{projectSn} and type=0
</select> </select>
</mapper> </mapper>

12
src/main/java/com/zhgd/xmgl/task/DischargingPlatformCurrentDataTask.java
View File

@ -137,31 +137,31 @@ public class DischargingPlatformCurrentDataTask {
if (Objects.equals(dto.getWeightStatus(), 1)) { if (Objects.equals(dto.getWeightStatus(), 1)) {
data.setIsAlarm(1); data.setIsAlarm(1);
data.setAlarmLevel(3); data.setAlarmLevel(3);
data.setAlarmType("重量状态预警"); data.setAlarmType("重量状态次要告警");
} else if (Objects.equals(dto.getWeightStatus(), 2)) { } else if (Objects.equals(dto.getWeightStatus(), 2)) {
data.setIsAlarm(1); data.setIsAlarm(1);
data.setAlarmLevel(1); data.setAlarmLevel(1);
data.setAlarmType("重量状态报警"); data.setAlarmType("重量状态紧急告警");
} }
if (Objects.equals(dto.getInclinationXStatus(), 1)) { if (Objects.equals(dto.getInclinationXStatus(), 1)) {
data.setIsAlarm(1); data.setIsAlarm(1);
data.setAlarmLevel(3); data.setAlarmLevel(3);
data.setAlarmType("倾角X状态预警"); data.setAlarmType("倾角X状态次要告警");
} else if (Objects.equals(dto.getInclinationXStatus(), 2)) { } else if (Objects.equals(dto.getInclinationXStatus(), 2)) {
data.setIsAlarm(1); data.setIsAlarm(1);
data.setAlarmLevel(1); data.setAlarmLevel(1);
data.setAlarmType("倾角X状态报警"); data.setAlarmType("倾角X状态紧急告警");
} }
if (Objects.equals(dto.getInclinationYStatus(), 1)) { if (Objects.equals(dto.getInclinationYStatus(), 1)) {
data.setIsAlarm(1); data.setIsAlarm(1);
data.setAlarmLevel(3); data.setAlarmLevel(3);
data.setAlarmType("倾角Y状态预警"); data.setAlarmType("倾角Y状态次要告警");
} else if (Objects.equals(dto.getInclinationYStatus(), 2)) { } else if (Objects.equals(dto.getInclinationYStatus(), 2)) {
data.setIsAlarm(1); data.setIsAlarm(1);
data.setAlarmLevel(1); data.setAlarmLevel(1);
data.setAlarmType("倾角Y状态报警"); data.setAlarmType("倾角Y状态紧急告警");
} }
} }