From 5549170855c433b45957d2142aefc54ba66ed3e0 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 27 Apr 2021 20:57:02 +0800
Subject: [PATCH] 1.设备详情接口修改，新增deptName字段返回 2.system 模块新增tcp,upd测试服务
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml | 10 +++++++++-
1 files changed, 9 insertions(+), 1 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..711b970 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("紧急求救")
--
Gitblit v1.9.3