From a4ff2b571be305e2641c9dd67797f4102e795ebb Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sun, 25 Apr 2021 10:47:56 +0800
Subject: [PATCH] 1.App警情反馈接口调整 2.租户接口新增
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 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 39095ee..52ccd43 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,14 @@
<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"/>
</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 +188,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,
@@ -398,7 +404,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}
@@ -598,8 +608,16 @@
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>
--
Gitblit v1.9.3