From abbaf2374fff7d02ecc3eecd6bf62504fbf27c4b Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 06 Apr 2021 22:33:25 +0800
Subject: [PATCH] 预警数量统计接口修改，预警数量分布接口修改，预警分类占比接口新增

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml |   27 +++++++++++++++++++++++++++
 1 files changed, 27 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..1ae2085 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,12 @@
     <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>
 </mapper>

--
Gitblit v1.9.3