From d7dd6cbbad5213476bd1e98d65fee6056ad4c2fc Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 06 Apr 2021 14:31:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
index 6d4def8..f5642ef 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
@@ -253,6 +253,7 @@
<select id="selectListSe" resultMap="alarmResultMap">
+
SELECT
a.id,
a.alarmType,
@@ -328,6 +329,7 @@
) b
on
a.click_date = b.datetime
+ order by a.click_date asc
</select>
@@ -433,4 +435,9 @@
<update id="updateVaddress">
update sys_alarm SET vaddress=#{vaddress} where id=#{jid}
</update>
+
+
+ <select id="selectEq" resultType="java.util.HashMap">
+ SELECT COUNT(deviceNumber) as cou,deviceNumber FROM `sys_alarm` WHERE alarmTime like concat(concat('%', #{time}), '%') and waringType NOT IN("系统测试","主机重新上电") group by deviceNumber
+ </select>
</mapper>
--
Gitblit v1.9.3