From 60031b8a01b08b7e83ca869f208ddb62145fc0d8 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 29 Apr 2021 13:55:12 +0800
Subject: [PATCH] APP接口调整
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml | 122 ++++++++++++----------------------------
1 files changed, 38 insertions(+), 84 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 52ccd43..a04d822 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
@@ -36,6 +36,9 @@
<result column="uids" property="uids"/>
<result column="securityArr" property="securityArr"/>
<result column="securityId" property="securityId"/>
+ <result column="baname" property="baname"/>
+ <result column="baid" property="baid"/>
+ <result column="baphone" property="baphone"/>
</resultMap>
<sql id="alarmCondition">
@@ -196,9 +199,14 @@
e.threeId,
e.deptId,
e.street as place,
- e.channelNumber from sys_alarm a
+ e.channelNumber,
+ u.name as baname,
+ u.id as baid,
+ u.phone as baphone
+ from sys_alarm a
LEFT JOIN
sys_equipment e on e.deviceNumber=a.deviceNumber
+ LEFT JOIN jfpth.blade_user u ON u.id = a.securityId
where 1=1
<include refid="alarmCondition"></include>
and a.waringType IN("紧急求救")
@@ -563,47 +571,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
@@ -621,52 +602,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