From a1de31cb6df040d28e1ad5afceb53dce7150c5de Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 14 Jan 2021 23:30:59 +0800
Subject: [PATCH] 客户列表接口修改

---
 src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml |   64 ++++++++++++++++++++++++++++++--
 1 files changed, 60 insertions(+), 4 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 0b92245..8f57f7f 100644
--- a/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml
+++ b/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml
@@ -24,6 +24,11 @@
         <result column="wd" property="wd"/>
         <result column="jtype" property="jtype"/>
         <result column="rname" property="rname"/>
+        <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"/>
     </resultMap>
 
 
@@ -63,15 +68,20 @@
         a.region,
         a.addvcd,
         a.alarmId,
+        a.czTime,
+        a.bz,
         a.LEVEL,
         ST_ASTEXT (a.coordinate ) AS coordinate,
         a.jd,
         a.wd,
         a.jtype,
         a.rname,
-        d.addvnm
+        d.addvnm,
+        e.serialNumber,
+        e.stype,
+        e.channelNumber
         FROM
-        sys_alarm a LEFT JOIN sys_district d on d.addvcds=a.addvcd where 1=1
+        sys_alarm a LEFT JOIN sys_district d on d.addvcds=a.addvcd LEFT JOIN sys_equipment e on e.deviceNumber=a.deviceNumber where 1=1
         <if test="jtype!=null and jtype!=''">
             and a.jtype=#{jtype}
         </if>
@@ -100,6 +110,8 @@
         a.sex,
         a.phoneNumber,
         a.place,
+        a.czTime,
+        a.bz,
         a.content,
         a.waringType,
         a.deviceNumber,
@@ -143,9 +155,12 @@
         a.jd,
         a.wd,
         a.jtype,
-        d.addvnm
+        d.addvnm,
+        e.serialNumber,
+        e.stype,
+        e.channelNumber
         FROM
-        sys_alarm a LEFT JOIN sys_district d on d.addvcds=a.addvcd where 1=1
+        sys_alarm a LEFT JOIN sys_district d on d.addvcds=a.addvcd LEFT JOIN sys_equipment e on e.deviceNumber=a.deviceNumber where 1=1
         <if test="id!=null and id!=''">
             and a.id &gt;#{id}
         </if>
@@ -168,4 +183,45 @@
     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}
 </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} where id=#{id}
+</update>
 </mapper>

--
Gitblit v1.9.3