From d5a8a64768db15ff6917e150358a954582e384fd Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 18 Mar 2021 18:18:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml | 91 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 78 insertions(+), 13 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 436f7cc..b120c62 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
@@ -19,7 +19,7 @@
<result column="district" property="district"/>
<result column="alarmId" property="alarmId"/>
<result column="level" property="level"/>
- <result column="coordinate" property="coordinate"/>
+ <!--<result column="coordinate" property="coordinate"/>-->
<result column="jd" property="jd"/>
<result column="wd" property="wd"/>
<result column="jtype" property="jtype"/>
@@ -39,7 +39,7 @@
a.id,a.alarmType,a.alarmPeople,a.alarmTime,a.galarmPeople,a.sex,a.phoneNumber,a.place,a.content,a.waringType,
a.deviceNumber,a.region,a.district,
a.alarmId,a.LEVEL,e.jd,e.wd,a.jtype,a.rname,a.jjTime,a.province,a.city,a.cid,
- e.serialNumber,
+ e.serialNumber,e.oneContacts,e.ThreeContacts,e.twoContacts,e.onePhone,e.twoPhone,e.ThreePhone,
e.stype,
e.channelNumber from sys_alarm a
LEFT JOIN sys_equipment e on e.deviceNumber=a.deviceNumber
@@ -191,6 +191,8 @@
a.deviceNumber,
a.region,
a.district,
+ a.province,
+ a.city,
a.alarmId,
a.rname,
a.LEVEL,
@@ -201,7 +203,13 @@
d.addvnm,
e.serialNumber,
e.stype,
- e.channelNumber
+ e.channelNumber,
+ e.oneContacts,
+ e.ThreeContacts,
+ e.twoContacts,
+ e.onePhone,
+ e.twoPhone,
+ e.ThreePhone
FROM
sys_alarm a LEFT JOIN sys_district d on d.addvcds=a.district LEFT JOIN sys_equipment e on
e.deviceNumber=a.deviceNumber where 1=1
@@ -305,6 +313,7 @@
left join
(
select DATE_FORMAT(alarmTime,'%Y-%m-%d') as datetime, count(*) as count from sys_alarm
+ where alarmType = '一键求助'
group by DATE_FORMAT(alarmTime,'%Y-%m-%d')
) b
on
@@ -312,12 +321,31 @@
</select>
+<!-- <!–查询本日，本周，本月 主动报警的数量–>-->
+<!-- <select id="selectAlarmSum" resultType="java.util.HashMap">-->
+<!-- select sa.alarmType name,IFNULL(sb.count, 0) value from (select alarmType from sys_alarm GROUP BY alarmType) sa-->
+<!-- left join-->
+<!-- ( select alarmType,count(*) count from sys_alarm-->
+<!-- where 1=1-->
+<!-- <if test="conditionVo.status==0">-->
+<!-- and to_days(alarmTime) = to_days(now())-->
+<!-- </if>-->
+<!-- <if test="conditionVo.status==1">-->
+<!-- and YEARWEEK(date_format(alarmTime,'%Y-%m-%d'),1) = YEARWEEK(now(),1)-->
+<!-- </if>-->
+<!-- <if test="conditionVo.status==2">-->
+<!-- and date_format(alarmTime,'%Y%m') = date_format(now(),'%Y%m')-->
+<!-- </if>-->
+<!-- group by alarmType-->
+<!-- ) sb-->
+<!-- on-->
+<!-- sa.alarmType = sb.alarmType-->
+<!-- </select>-->
+
<!--查询本日，本周，本月 主动报警的数量-->
<select id="selectAlarmSum" resultType="java.util.HashMap">
- select sa.alarmType name,IFNULL(sb.count, 0) value from (select alarmType from sys_alarm GROUP BY alarmType) sa
- left join
- ( select alarmType,count(*) count from sys_alarm
- where 1=1
+ select '一键求助' name,ifnull(count(*),0 ) value from sys_alarm
+ where alarmType = '一键求助'
<if test="conditionVo.status==0">
and to_days(alarmTime) = to_days(now())
</if>
@@ -327,12 +355,49 @@
<if test="conditionVo.status==2">
and date_format(alarmTime,'%Y%m') = date_format(now(),'%Y%m')
</if>
- group by alarmType
- ) sb
- on
- sa.alarmType = sb.alarmType
+ union all
+ select '电话报警' name,ifnull(count(*),0 ) value from sys_alarm
+ where alarmType = '电话报警'
+ <if test="conditionVo.status==0">
+ and to_days(alarmTime) = to_days(now())
+ </if>
+ <if test="conditionVo.status==1">
+ and YEARWEEK(date_format(alarmTime,'%Y-%m-%d'),1) = YEARWEEK(now(),1)
+ </if>
+ <if test="conditionVo.status==2">
+ and date_format(alarmTime,'%Y%m') = date_format(now(),'%Y%m')
+ </if>
+
</select>
- <select id="queryPolice" resultType="java.util.List">
- SELECT * FROM jfpth.blade_user WHERE is_deleted != '1' and role_id ="1370562810882502657"</select>
+ <select id="queryPolice" resultType="java.util.HashMap">
+ SELECT * FROM jfpth.blade_user WHERE is_deleted != '1' and role_id ="1372092102682521602"
+ </select>
+
+
+ <select id="queryPoliceTime" resultType="java.util.HashMap">
+
+ SELECT
+ a.alarmPeople,
+ a.alarmId,
+ max( a.jjTime ) AS jjTime
+ FROM
+ sys_alarm a
+ WHERE
+ 1 =1
+
+ <if test="policeIdArr!=null and policeIdArr.size>0">
+ and alarmId in
+ <foreach collection="policeIdArr" index="index" item="item" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ </if>
+ GROUP BY
+ a.alarmPeople,
+ a.alarmId
+ ORDER BY
+ jjTime
+ LIMIT 1
+
+ </select>
</mapper>
--
Gitblit v1.9.3