From abe248d82d6c5cd13410e87d32563cf5010d4ca9 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 09 Apr 2021 15:50:39 +0800
Subject: [PATCH] 设备掉线跳转

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml |   26 +++++++++++++++++++++++++-
 1 files changed, 25 insertions(+), 1 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 b1843e4..0d71c49 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
@@ -295,7 +295,7 @@
         jfpth.blade_region.`name` as addvnm
         FROM
         sys_alarm a LEFT JOIN sys_equipment e on e.deviceNumber=a.deviceNumber LEFT JOIN jfpth.blade_region on jfpth.blade_region.`code`=a.district where
-        DATE_FORMAT(alarmTime,'%Y-%m-%d') &gt;=#{beginTime} and DATE_FORMAT(alarmTime,'%Y-%m-%d') &lt;=#{endTime} and a.waringType NOT IN("系统测试","主机重新上电") ORDER BY alarmTime desc
+        DATE_FORMAT(alarmTime,'%Y-%m-%d') &gt;=#{beginTime} and DATE_FORMAT(alarmTime,'%Y-%m-%d') &lt;=#{endTime} and a.waringType  IN("紧急求救") ORDER BY alarmTime desc
     </select>
 
 
@@ -492,4 +492,28 @@
         on
         a.days = b.datetime
     </select>
+
+
+    <!--查询本年所有月份的预警数量-->
+    <select id="queryYearAlarm" resultType="java.util.HashMap">
+
+        <if test="childList!=null and childList.size>0">
+
+            <foreach collection="childList" index="index" item="item" open="" separator="union all" close="">
+                SELECT
+                #{item} as month,count(ce.id) as count
+                FROM
+                sys_alarm as ce
+                WHERE
+                YEAR ( alarmTime ) = date_format(now(),'%Y%')
+                AND MONTH ( alarmTime ) = #{item}
+
+                AND waringType = "紧急求救"
+                AND deviceNumber = #{deviceNumber}
+
+            </foreach>
+        </if>
+
+    </select>
+
 </mapper>

--
Gitblit v1.9.3