From 70f01fd17bb642c2f773d5c5567018d7573a2dde Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 12 Mar 2021 17:31:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 50831aa..c302eea 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
@@ -261,6 +261,17 @@
<update id="updateJtype">
- update sys_alarm SET jtype=1,czTime=#{czTime},bz=#{bz} where id=#{id}
-</update>
+ update sys_alarm SET jtype=1,czTime=#{czTime},bz=#{bz} where id=#{id}
+ </update>
+
+ <!--查询当天警情总数-->
+ <select id="selectAlarmCount" resultType="java.lang.Integer">
+ SELECT count(*) FROM `sys_alarm`
+ where
+ waringType != '系统测试'
+ and
+ waringType!='主机重新上电'
+ and
+ to_days(alarmTime) = to_days(curdate())
+ </select>
</mapper>
--
Gitblit v1.9.3