From 1f0e04ea6f31164bf2f6d0c41a9d927d0ae8748d Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 19 Mar 2021 18:57:18 +0800
Subject: [PATCH] 报警分发接口完成
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml | 55 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 47 insertions(+), 8 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 855f566..ce83521 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"/>
@@ -36,10 +36,10 @@
<select id="selectAlarmPage" resultMap="alarmResultMap">
select
- a.id,a.alarmType,a.alarmPeople,a.alarmTime,a.galarmPeople,a.sex,a.phoneNumber,a.place,a.content,a.waringType,
+ a.id,a.alarmType,a.alarmPeople,a.alarmTime,a.galarmPeople,a.sex,a.phoneNumber,a.place,a.content,a.waringType,a.bz,
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
@@ -75,7 +75,7 @@
and a.alarmTime<=#{alarm.endTime}
</if>
- and a.waringType NOT IN("系统测试","主机重新上电")
+ and a.waringType IN("紧急求救")
ORDER BY
a.jtype ASC,
@@ -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
@@ -271,7 +277,11 @@
<update id="updateJtype">
- update sys_alarm SET jtype=1,czTime=#{czTime},bz=#{bz} where id=#{id}
+ update sys_alarm SET jtype=#{jtype},bz=#{bz},jjTime where id=#{id}
+ </update>
+
+ <update id="updatePoliceStatus">
+ update jfpth.blade_user SET work_status=#{status} where id=#{id}
</update>
<!--查询当天警情总数-->
@@ -307,6 +317,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
@@ -363,6 +374,34 @@
</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