From f34a510629676ebf22d75bde2e89e2fe4a2f56be Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 24 Mar 2021 18:22:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml | 21 ++++++++++++++++++++-
1 files changed, 20 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 bc3a278..fd874f8 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
@@ -223,7 +223,7 @@
</delete>
<!--新增-->
- <insert id="s" parameterType="org.springblade.jfpt.alarm.entity.Alarm">
+ <insert id="s" parameterType="org.springblade.jfpt.alarm.entity.Alarm" useGeneratedKeys="true" keyProperty="id">
INSERT INTO sys_alarm (alarmType,jjTime,alarmPeople,alarmTime,galarmPeople,sex,phoneNumber,place,content,waringType,deviceNumber,
region,district,alarmId,level,rname,coordinate,jd,wd,jtype,province,city,cid) VALUES
(#{alarmType},#{jjTime},#{alarmPeople},#{alarmTime},#{galarmPeople},#{sex},#{phoneNumber},#{place},#{content},#{waringType},
@@ -402,4 +402,23 @@
LIMIT 1
</select>
+
+ <select id="queryBa" resultType="java.util.HashMap">
+ SELECT
+ s.id,
+ s.CODE,
+ s.NAME,
+ s.real_name,
+ s.phone,
+ p.jd,
+ p.wd,
+ ST_ASTEXT ( e.coordinate )
+ FROM
+ jfpth.blade_user s
+ LEFT JOIN sys_position p ON p.snumber = s.
+ CODE LEFT JOIN sys_enclosure e ON e.anumber = s.CODE
+ WHERE
+ is_deleted != '1'
+ AND role_id = "1370562810882502657"
+ </select>
</mapper>
--
Gitblit v1.9.3