From 25403780e34eca3299ef48bc92ca9488abeb8e98 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 30 Apr 2021 11:51:45 +0800
Subject: [PATCH] webcosket调整
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml | 136 ++++++++++++++++----------------------------
1 files changed, 50 insertions(+), 86 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 711b970..1deb79f 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
@@ -41,6 +41,22 @@
<result column="baphone" property="baphone"/>
</resultMap>
+ <!-- 通用查询映射结果 -->
+ <resultMap id="alarmonline" type="org.springblade.jfpt.alarm.vo.AlarmVO">
+ <id column="alarmPeople" property="alarmPeople"/>
+ <result column="alarmId" property="alarmId"/>
+ <result column="phoneNumber" property="phoneNumber"/>
+ </resultMap>
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="userResultMap" type="org.springblade.system.user.entity.User">
+ <result column="id" property="id"/>
+ <result column="name" property="name"/>
+ <result column="phone" property="phone"/>
+ <result column="online_status" property="online_status"/>
+ <result column="work_status" property="work_status"/>
+ </resultMap>
+
<sql id="alarmCondition">
<if test="alarm.id!=null">
and a.id = #{alarm.id}
@@ -521,16 +537,17 @@
</select>
- <select id="queryPolice" resultType="java.util.HashMap">
+ <select id="queryPolice" resultMap="userResultMap">
SELECT * FROM jfpth.blade_user WHERE is_deleted != '1' and role_id ="1372092102682521602"
</select>
- <select id="queryPoliceTime" resultType="java.util.HashMap">
+ <select id="queryPoliceTime" resultMap="alarmonline">
SELECT
a.alarmPeople,
a.alarmId,
+ a.phoneNumber,
max( a.jjTime ) AS jjTime
FROM
sys_alarm a
@@ -545,7 +562,8 @@
</if>
GROUP BY
a.alarmPeople,
- a.alarmId
+ a.alarmId,
+ a.phoneNumber
ORDER BY
jjTime
LIMIT 1
@@ -571,47 +589,20 @@
AND role_id = "1370562810882502657"
</select>
- <select id="getAlarm" resultType="java.util.HashMap">
- SELECT
- a.id,
- a.alarmType,
- a.alarmPeople,
- a.alarmTime,
- a.galarmPeople,
- a.sex,
- a.phoneNumber,
- a.content,
- a.waringType,
- a.bz,
- a.deviceNumber,
- a.region,
- a.district,
- a.vaddress,
- a.aaddress,
- 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,
- e.onePhone,
- e.twoPhone,
- e.ThreePhone,
- e.stype,
- e.oneId,
- e.twoId,
- e.threeId,
- e.deptId,
- e.street AS place,
- e.channelNumber
+ <select id="getAlarm" resultMap="alarmResultMap">
+ select
+ a.id,a.alarmType,a.alarmPeople,a.alarmTime,a.galarmPeople,a.sex,a.phoneNumber,a.content,a.waringType,a.bz,
+ a.deviceNumber,a.region,a.district,a.vaddress,a.aaddress,
+ a.alarmId,a.LEVEL,e.jd,e.wd,a.jtype,a.rname,a.jjTime,a.province,a.city,a.cid,
+ a.securityArr,a.securityId,
+ e.serialNumber,e.oneContacts,e.ThreeContacts,e.twoContacts,e.onePhone,e.twoPhone,e.ThreePhone,
+ e.stype,
+ e.oneId,
+ e.twoId,
+ e.threeId,
+ e.deptId,
+ e.street as place,
+ e.channelNumber
FROM
sys_alarm a
LEFT JOIN sys_equipment e ON e.deviceNumber = a.deviceNumber
@@ -629,52 +620,25 @@
</select>
- <select id="getAlarming" resultType="java.util.HashMap">
- SELECT
- a.id,
- a.alarmType,
- a.alarmPeople,
- a.alarmTime,
- a.galarmPeople,
- a.sex,
- a.phoneNumber,
- a.content,
- a.waringType,
- a.bz,
- a.deviceNumber,
- a.region,
- a.district,
- a.vaddress,
- a.aaddress,
- 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,
- e.onePhone,
- e.twoPhone,
- e.ThreePhone,
- e.stype,
- e.oneId,
- e.twoId,
- e.threeId,
- e.deptId,
- e.street AS place,
- e.channelNumber
+ <select id="getAlarming" resultMap="alarmResultMap">
+ select
+ a.id,a.alarmType,a.alarmPeople,a.alarmTime,a.galarmPeople,a.sex,a.phoneNumber,a.content,a.waringType,a.bz,
+ a.deviceNumber,a.region,a.district,a.vaddress,a.aaddress,
+ a.alarmId,a.LEVEL,e.jd,e.wd,a.jtype,a.rname,a.jjTime,a.province,a.city,a.cid,
+ a.securityArr,a.securityId,
+ e.serialNumber,e.oneContacts,e.ThreeContacts,e.twoContacts,e.onePhone,e.twoPhone,e.ThreePhone,
+ e.stype,
+ e.oneId,
+ e.twoId,
+ e.threeId,
+ e.deptId,
+ e.street as place,
+ e.channelNumber
FROM
sys_alarm a
LEFT JOIN sys_equipment e ON e.deviceNumber = a.deviceNumber
WHERE
- securityId =#{alarm.securityId}
+ securityId =#{alarm.securityId} and jtype != 2
</select>
--
Gitblit v1.9.3