From f93d7ab13ce3b722849a03f64bdb92579cfc8b39 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 29 Apr 2021 10:43:31 +0800
Subject: [PATCH] APP接口调整
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml | 80 ++++++++++++++++++++++++++++++++++++----
1 files changed, 72 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 9f10dcf..bad379d 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
@@ -34,9 +34,17 @@
<result column="vaddress" property="vaddress"/>
<result column="aaddress" property="aaddress"/>
<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">
+ <if test="alarm.id!=null">
+ and a.id = #{alarm.id}
+ </if>
<if test="alarm.jtype!=null">
and a.jtype like concat('%',#{alarm.jtype},'%')
</if>
@@ -183,6 +191,7 @@
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,
@@ -190,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("紧急求救")
@@ -398,7 +412,11 @@
<update id="updateJtype">
- update sys_alarm SET jtype=#{jtype},bz=#{bz}
+ update sys_alarm SET jtype=#{jtype}
+
+ <if test="bz!=null and bz!=''">
+ ,bz=#{bz}
+ </if>
<if test="securityArr!=null and id!=''">
,securityArr =#{securityArr}
@@ -553,17 +571,63 @@
AND role_id = "1370562810882502657"
</select>
- <select id="getAlarm" resultType="java.util.HashMap">
- SELECT
- *
+ <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
+ sys_alarm a
+ LEFT JOIN sys_equipment e ON e.deviceNumber = a.deviceNumber
WHERE
- securityId IS NULL
- AND securityArr LIKE concat('%',#{alarm.securityArr},'%')
+
+ <if test="alarm.securityArr!=null and alarm.securityArr!=''">
+ securityId IS NULL
+ AND securityArr LIKE concat('%',#{alarm.securityArr},'%')
+ </if>
+
+ <if test="alarm.id!=null and alarm.id!=''">
+ a.id = #{alarm.id}
+ </if>
+
</select>
+ <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}
+
+ </select>
+
+ <update id="setAlarm">
+ update sys_alarm SET securityId=#{alarm.securityId} where id=#{alarm.id}
+ </update>
+
<update id="updateVaddress">
update sys_alarm SET vaddress=#{vaddress},uids=#{uids} where id=#{jid}
</update>
--
Gitblit v1.9.3