From 97a0bbd8b75c7ba8df78a1e8f67bbaad23edf298 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sat, 24 Apr 2021 15:47:52 +0800
Subject: [PATCH] 1.App警情反馈新增
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 107 insertions(+), 4 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..57330f2 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
@@ -37,6 +37,9 @@
</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>
@@ -555,15 +558,115 @@
<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
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" 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
+ 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