From 83bed9e77878cbe11e797b58fa2c2a48061e4555 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 29 Jan 2021 11:45:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml | 7 ++++---
1 files changed, 4 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 e5ad292..3ba1456 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
@@ -195,8 +195,10 @@
<!--新增-->
<insert id="s" parameterType="org.springblade.jfpt.alarm.entity.Alarm">
INSERT INTO sys_alarm (alarmType,alarmPeople,alarmTime,galarmPeople,sex,phoneNumber,place,content,waringType,deviceNumber,
- region,district,alarmId,level,rname,coordinate,jd,wd,jtype) VALUES
- (#{alarmType},#{alarmPeople},#{alarmTime},#{galarmPeople},#{sex},#{phoneNumber},#{place},#{content},#{waringType},#{deviceNumber},#{region},#{district},#{alarmId},#{level},#{rname},POINT(#{jd},#{wd}),#{jd},#{wd},#{jtype})
+ region,district,alarmId,level,rname,coordinate,jd,wd,jtype,province,city) VALUES
+ (#{alarmType},#{alarmPeople},#{alarmTime},#{galarmPeople},#{sex},#{phoneNumber},#{place},#{content},#{waringType},
+ #{deviceNumber},#{region},#{district},#{alarmId},#{level},#{rname},POINT(#{jd},#{wd}),
+ #{jd},#{wd},#{jtype},#{province},#{city})
</insert>
<update id="updateOne" parameterType="org.springblade.jfpt.alarm.entity.Alarm">
@@ -229,7 +231,6 @@
a.district,
a.alarmId,
a.LEVEL,
- ST_ASTEXT (a.coordinate ) AS coordinate,
a.jd,
a.wd,
a.jtype,
--
Gitblit v1.9.3