From 2e9d51ac8b7835f2b002eb686f23304da4c3559e Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 12 十二月 2024 10:00:29 +0800
Subject: [PATCH] 告警
---
src/main/resources/mapper/BattAlarmMapper.xml | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/mapper/BattAlarmMapper.xml b/src/main/resources/mapper/BattAlarmMapper.xml
index dc5b0ca..42130bd 100644
--- a/src/main/resources/mapper/BattAlarmMapper.xml
+++ b/src/main/resources/mapper/BattAlarmMapper.xml
@@ -3,23 +3,23 @@
<mapper namespace="com.whyc.mapper.BattAlarmMapper">
<select id="getBattAlarm" resultType="com.whyc.pojo.db_alarm.BattAlarm">
- select batt_alarm.*,batt_inf.binf_name from db_alarm.batt_alarm,db_batt.batt_inf
+ select batt_alarm.*,batt_inf.binf_name from db_alarm.batt_alarm,db_batt.power_inf
<where>
- batt_alarm.binf_id=batt_inf.binf_id
+ batt_alarm.binf_id=power_inf.binf_id
and batt_alarm.alm_start_time>=#{startTime}
and batt_alarm.alm_start_time<=#{endTime}
<if test="almLevel!=null">
and batt_alarm.alm_level=#{almLevel}
</if>
- order by batt_alarm.alm_start_time asc
+ order by batt_alarm.alm_start_time desc
</where>
</select>
<select id="getResBattAlm" resultType="com.whyc.pojo.db_alarm.BattAlarm">
select batt_alarm.*,power_inf.binf_name from db_alarm.batt_alarm,db_batt.power_inf
<where>
batt_alarm.binf_id=power_inf.binf_id
- and batt_alarm.binf_id>=#{binfId}
- order by batt_alarm.alm_start_time asc
+ and batt_alarm.binf_id=#{binfId}
+ order by batt_alarm.alm_start_time desc
</where>
</select>
<select id="getAlm2" resultType="com.whyc.pojo.db_alarm.BattAlarm">
@@ -27,8 +27,8 @@
from db_alarm.tb_battalarm_data
<where>
BattGroupId=#{battGroupId}
- and alm_signal_id in(13)
- and alm_severity=1
+ and alm_type=1
+ and alm_level=1
</where>
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1