From f14966e7c0338b4c749fee51c73470ca0230f163 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 07 Apr 2021 17:39:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml |   34 ++++++++++++++++++++++++++++++++++
 1 files changed, 34 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 f5642ef..7d50353 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
@@ -332,6 +332,25 @@
 		 order by a.click_date asc
     </select>
 
+    <!--查询警情当前时间段内每天的数据-->
+    <select id="selectTimeAlarmData" resultType="java.lang.Integer">
+       select a.days, ifnull(count,0) count from
+            (
+                SELECT @date := DATE_ADD( @date, INTERVAL + 1 DAY ) days FROM
+                (
+                    SELECT @date := DATE_ADD( #{conditionVo.startTime}, INTERVAL - 1 DAY ) FROM sys_date
+                ) time
+                    WHERE to_days( @date ) &lt; to_days( #{conditionVo.endTime} )
+            ) a
+            left join
+            (
+            select DATE_FORMAT(alarmTime,'%Y-%m-%d') as datetime, count(*) as count from sys_alarm
+            where waringType = '紧急求救'
+            group by DATE_FORMAT(alarmTime,'%Y-%m-%d')
+            ) b
+            on
+            a.days = b.datetime
+    </select>
 
 <!--    &lt;!&ndash;查询本日，本周，本月 主动报警的数量&ndash;&gt;-->
 <!--    <select id="selectAlarmSum" resultType="java.util.HashMap">-->
@@ -440,4 +459,19 @@
     <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>
+
+    <select id="selAlarmTimeCount" resultType="java.lang.Integer">
+        select count(*) from sys_alarm
+        where waringType = '紧急求救'
+        <if test="conditionVo.startTime!=null and conditionVo.startTime!='' and conditionVo.endTime!=null and conditionVo.endTime!=''">
+            and alarmTime between #{conditionVo.startTime} and #{conditionVo.endTime}
+        </if>
+    </select>
+
+    <!--查询当前时间段内一键求助报警的数据集合-->
+    <select id="selectAlarmList" resultType="org.springblade.jfpt.alarm.entity.Alarm">
+        SELECT waringType,alarmTime,alarmId,alarmPeople,jtype,czTime FROM `sys_alarm`
+        where waringType='紧急求救'
+        and alarmTime between #{conditionVo.startTime} and #{conditionVo.endTime}
+    </select>
 </mapper>

--
Gitblit v1.9.3