From 33d0574e951c9d8dfb7441259e8d38d8ca7f4c65 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 01 Feb 2021 23:40:54 +0800
Subject: [PATCH] 初版

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml |    9 +++------
 1 files changed, 3 insertions(+), 6 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 1c16a1e..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,
@@ -238,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