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 |   61 +++++++++++++++++++++++++++++-
 1 files changed, 58 insertions(+), 3 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 63803f2..68b593f 100644
--- a/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml
+++ b/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml
@@ -27,6 +27,9 @@
         <result column="serialNumber" property="serialNumber"/>
         <result column="stype" property="stype"/>
         <result column="channelNumber" property="channelNumber"/>
+        <result column="czTime" property="czTime"/>
+        <result column="bz" property="bz"/>
+        <result column="jjTime" property="jjTime"/>
     </resultMap>
 
 
@@ -66,6 +69,9 @@
         a.region,
         a.addvcd,
         a.alarmId,
+        a.czTime,
+        a.bz,
+        a.jjTime,
         a.LEVEL,
         ST_ASTEXT (a.coordinate ) AS coordinate,
         a.jd,
@@ -106,6 +112,8 @@
         a.sex,
         a.phoneNumber,
         a.place,
+        a.czTime,
+        a.bz,
         a.content,
         a.waringType,
         a.deviceNumber,
@@ -113,6 +121,7 @@
         a.addvcd,
         a.alarmId,
         a.rname,
+        a.jjTime,
         a.LEVEL,
         ST_ASTEXT(a.coordinate) AS coordinate,
         a.jd,
@@ -143,6 +152,7 @@
         a.region,
         a.addvcd,
         a.alarmId,
+        a.jjTime,
         a.rname,
         a.LEVEL,
         ST_ASTEXT (a.coordinate ) AS coordinate,
@@ -167,14 +177,59 @@
     <!--新增-->
     <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>
 
+
+    <select id="selectScount" resultType="java.util.HashMap">
+        SELECT COUNT(*) as cou,waringType FROM `sys_alarm` WHERE alarmTime like concat(concat('%', #{time}), '%') GROUP BY waringType
+    </select>
+
+
+    <select id="selectListSe" resultMap="alarmResultMap">
+        SELECT
+        a.id,
+        a.alarmType,
+        a.alarmPeople,
+        a.alarmTime,
+        a.galarmPeople,
+        a.sex,
+        a.phoneNumber,
+        a.place,
+        a.content,
+        a.waringType,
+        a.deviceNumber,
+        a.region,
+        a.addvcd,
+        a.alarmId,
+        a.LEVEL,
+        ST_ASTEXT (a.coordinate ) AS coordinate,
+        a.jd,
+        a.wd,
+        a.jtype,
+        a.rname,
+        d.addvnm,
+        e.serialNumber,
+        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
+        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},jjTime=#{jjTime} where id=#{id}
+</update>
 </mapper>

--
Gitblit v1.9.3