From b3e96428a7ba42f8402f656885218c56d7ae1421 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 23 Apr 2021 23:02:05 +0800
Subject: [PATCH] app接口
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml | 86 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 82 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 b63ae3b..39095ee 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
@@ -555,9 +555,48 @@
<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},'%')
@@ -566,9 +605,48 @@
<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
+ sys_alarm a
+ LEFT JOIN sys_equipment e ON e.deviceNumber = a.deviceNumber
WHERE
securityId =#{alarm.securityId}
--
Gitblit v1.9.3