From 9dc69563217ae69a187533b638fe7e3ca797dacb Mon Sep 17 00:00:00 2001
From: nnnjjj123 <494715143@qq.com>
Date: Fri, 15 Jan 2021 16:27:10 +0800
Subject: [PATCH] 1.接警调整 2.警单排序

---
 src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml b/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml
index 8f57f7f..68b593f 100644
--- a/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml
+++ b/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml
@@ -29,6 +29,7 @@
         <result column="channelNumber" property="channelNumber"/>
         <result column="czTime" property="czTime"/>
         <result column="bz" property="bz"/>
+        <result column="jjTime" property="jjTime"/>
     </resultMap>
 
 
@@ -70,6 +71,7 @@
         a.alarmId,
         a.czTime,
         a.bz,
+        a.jjTime,
         a.LEVEL,
         ST_ASTEXT (a.coordinate ) AS coordinate,
         a.jd,
@@ -119,6 +121,7 @@
         a.addvcd,
         a.alarmId,
         a.rname,
+        a.jjTime,
         a.LEVEL,
         ST_ASTEXT(a.coordinate) AS coordinate,
         a.jd,
@@ -149,6 +152,7 @@
         a.region,
         a.addvcd,
         a.alarmId,
+        a.jjTime,
         a.rname,
         a.LEVEL,
         ST_ASTEXT (a.coordinate ) AS coordinate,
@@ -173,14 +177,18 @@
     <!--新增-->
     <insert id="s" parameterType="org.springblade.modules.alarm.entity.Alarm">
        INSERT INTO sys_alarm (alarmType,alarmPeople,alarmTime,galarmPeople,sex,phoneNumber,place,content,waringType,deviceNumber,
-       region,addvcd,alarmId,level,rname,coordinate,jd,wd,jtype) VALUES
-        (#{alarmType},#{alarmPeople},#{alarmTime},#{galarmPeople},#{sex},#{phoneNumber},#{place},#{content},#{waringType},#{deviceNumber},#{region},#{addvcd},#{alarmId},#{level},#{rname},POINT(#{jd},#{wd}),#{jd},#{wd},#{jtype})
+       region,addvcd,alarmId,level,rname,coordinate,jd,wd,jtype,czTime,bz,jjTime) VALUES
+        (#{alarmType},#{alarmPeople},#{alarmTime},#{galarmPeople},#{sex},#{phoneNumber},#{place},#{content},#{waringType},#{deviceNumber},#{region},#{addvcd},
+        #{alarmId},#{level},#{rname},POINT(#{jd},#{wd}),#{jd},#{wd},#{jtype}
+        ,#{czTime},#{bz},#{jjTime})
     </insert>
 
     <update id="updateOne" parameterType="org.springblade.modules.alarm.entity.Alarm">
     update sys_alarm SET alarmType=#{alarmType},alarmPeople=#{alarmPeople},alarmTime=#{alarmTime},
     galarmPeople=#{galarmPeople},sex=#{sex},phoneNumber=#{phoneNumber},place=#{place},
-    content=#{content},waringType=#{waringType},deviceNumber=#{deviceNumber},region=#{region},addvcd=#{addvcd},alarmId=#{alarmId},level=#{level},rname=#{rname},jd=#{jd},wd=#{wd},coordinate=POINT(#{jd},#{wd}),jtype=#{jtype} where id=#{id}
+    content=#{content},waringType=#{waringType},deviceNumber=#{deviceNumber},region=#{region},
+    addvcd=#{addvcd},alarmId=#{alarmId},level=#{level},rname=#{rname},jd=#{jd},
+    wd=#{wd},coordinate=POINT(#{jd},#{wd}),jtype=#{jtype},jtype=#{jtype},czTime=#{czTime},bz=#{bz},jjTime=#{jjTime} where id=#{id}
 </update>
 
 
@@ -216,12 +224,12 @@
         e.stype,
         e.channelNumber
         FROM
-        sys_alarm a LEFT JOIN sys_district d on d.addvcds=a.addvcd LEFT JOIN sys_equipment e on e.deviceNumber=a.deviceNumber where
+        sys_alarm a LEFT JOIN sys_district d on d.addvcds=a.addvcd LEFT JOIN sys_equipment e on e.deviceNumber=a.deviceNumber  where
         DATE_FORMAT(alarmTime,'%Y-%m-%d') &gt;=#{beginTime} and DATE_FORMAT(alarmTime,'%Y-%m-%d') &lt;=#{endTime} ORDER BY alarmTime desc
     </select>
 
 
     <update id="updateJtype">
-    update sys_alarm SET jtype=1,czTime=#{czTime},bz=#{bz} where id=#{id}
+    update sys_alarm SET jtype=1,czTime=#{czTime},bz=#{bz},jjTime=#{jjTime} where id=#{id}
 </update>
 </mapper>

--
Gitblit v1.9.3