From 80be018676ee9063820f2edf5a71d7d422ab3451 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 18 Mar 2021 18:18:47 +0800
Subject: [PATCH] 报警分发接口调整
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml | 44 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 39 insertions(+), 5 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 bf79fbc..1e648bd 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.oneContacts,e.ThreeContacts,e.twoContacts,onePhone,twoPhone,ThreePhone,
+ 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
@@ -203,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
@@ -335,6 +341,34 @@
sa.alarmType = sb.alarmType
</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