From 4d6a0cdf54a36b88634629700e5ce7d4bf8d90e9 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 03 Feb 2021 10:27:10 +0800
Subject: [PATCH] 客户管理接口改动

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 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 630c430..33fb909 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
@@ -93,17 +93,16 @@
         a.czTime,
         a.bz,
         a.LEVEL,
-        ST_ASTEXT (a.coordinate ) AS coordinate,
         a.jd,
         a.wd,
         a.jtype,
         a.rname,
-        d.addvnm,
+        jfpth.blade_region.name as addvnm,
         e.serialNumber,
         e.stype,
         e.channelNumber
         FROM
-        sys_alarm a LEFT JOIN sys_district d on d.addvcds=a.district LEFT JOIN sys_equipment e on e.deviceNumber=a.deviceNumber where 1=1
+        sys_alarm a  LEFT JOIN sys_equipment e on e.deviceNumber=a.deviceNumber LEFT JOIN jfpth.blade_region on jfpth.blade_region.`code`=a.district where 1=1
         <if test="jtype!=null and jtype!=''">
             and a.jtype=#{jtype}
         </if>
@@ -142,7 +141,6 @@
         a.alarmId,
         a.rname,
         a.LEVEL,
-        ST_ASTEXT(a.coordinate) AS coordinate,
         a.jd,
         a.wd,
         a.jtype,
@@ -173,7 +171,6 @@
         a.alarmId,
         a.rname,
         a.LEVEL,
-        ST_ASTEXT (a.coordinate ) AS coordinate,
         a.jd,
         a.wd,
         a.jtype,
@@ -195,8 +192,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 +228,6 @@
         a.district,
         a.alarmId,
         a.LEVEL,
-        ST_ASTEXT (a.coordinate ) AS coordinate,
         a.jd,
         a.wd,
         a.jtype,
@@ -237,7 +235,7 @@
         e.serialNumber,
         e.stype,
         e.channelNumber,
-        jfpth.blade_region.`name`
+        jfpth.blade_region.`name` as addvnm
         FROM
         sys_alarm a LEFT JOIN sys_equipment e on e.deviceNumber=a.deviceNumber LEFT JOIN jfpth.blade_region on jfpth.blade_region.`code`=a.district where
         DATE_FORMAT(alarmTime,'%Y-%m-%d') &gt;=#{beginTime} and DATE_FORMAT(alarmTime,'%Y-%m-%d') &lt;=#{endTime} ORDER BY alarmTime desc

--
Gitblit v1.9.3