From af83304e2ca46ace2cde325df5acde6b8e51ab8d Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 12 Mar 2021 14:17:45 +0800
Subject: [PATCH] 包裹，违禁品，在线设备统计接口ok

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml |   30 ++++++++++++++++++++++++------
 1 files changed, 24 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 caf4216..50831aa 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
@@ -30,12 +30,13 @@
         <result column="czTime" property="czTime"/>
         <result column="bz" property="bz"/>
         <result column="name" property="name"/>
+        <result column="cid" property="cid"/>
     </resultMap>
 
 
     <select id="selectAlarmPage" 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.district, a.alarmId,a.LEVEL,a.jd,a.wd,a.jtype,a.rname,a.jjTime,a.province,a.city,
+        a.deviceNumber,a.region,a.district, a.alarmId,a.LEVEL,a.jd,a.wd,a.jtype,a.rname,a.jjTime,a.province,a.city,a.cid,
         e.serialNumber,
         e.stype,
         e.channelNumber from sys_alarm a
@@ -71,7 +72,15 @@
         <if test="alarm.endTime!=null and alarm.endTime!=''">
             and a.alarmTime&lt;=#{alarm.endTime}
         </if>
-        ORDER BY a.alarmTime desc
+        ORDER BY
+        a.jtype ASC,
+        a.alarmTime DESC
+    </select>
+
+    <select id="listAll" 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.district, a.alarmId,a.LEVEL,a.jd,a.wd,a.jtype,a.rname,a.jjTime,a.province,a.city,a.cid
+         from sys_alarm a
     </select>
 
     <select id="selectList" resultMap="alarmResultMap">
@@ -96,6 +105,7 @@
         a.jd,
         a.wd,
         a.jtype,
+        a.cid,
         a.rname,
         jfpth.blade_region.name as addvnm,
         e.serialNumber,
@@ -106,7 +116,7 @@
         <if test="jtype!=null and jtype!=''">
             and a.jtype=#{jtype}
         </if>
-        <if test="addvcd!=null and addvcd!=''">
+        <if test="district!=null and district!=''">
             and a.district=#{district}
         </if>
         <if test="waringType!=null and waringType!=''">
@@ -119,6 +129,11 @@
             and a.alarmTime&lt;=#{endTime}
         </if>
         ORDER BY id ASC
+    </select>
+
+    <select id="getLimit" 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.district, a.alarmId,a.LEVEL,a.jd,a.wd,a.jtype,a.rname,a.jjTime,a.province,a.city,a.cid from sys_alarm a ORDER BY id DESC LIMIT 1
     </select>
 
     <select id="selectInfo" resultMap="alarmResultMap">
@@ -141,6 +156,7 @@
         a.alarmId,
         a.rname,
         a.LEVEL,
+        a.cid,
         a.jd,
         a.wd,
         a.jtype,
@@ -171,6 +187,7 @@
         a.alarmId,
         a.rname,
         a.LEVEL,
+        a.cid,
         a.jd,
         a.wd,
         a.jtype,
@@ -192,17 +209,17 @@
     <!--新增-->
     <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,province,city) VALUES
+       region,district,alarmId,level,rname,coordinate,jd,wd,jtype,province,city,cid) VALUES
         (#{alarmType},#{alarmPeople},#{alarmTime},#{galarmPeople},#{sex},#{phoneNumber},#{place},#{content},#{waringType},
         #{deviceNumber},#{region},#{district},#{alarmId},#{level},#{rname},POINT(#{jd},#{wd}),
-        #{jd},#{wd},#{jtype},#{province},#{city})
+        #{jd},#{wd},#{jtype},#{province},#{city},#{cid})
     </insert>
 
     <update id="updateOne" parameterType="org.springblade.jfpt.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},district=#{district},alarmId=#{alarmId},level=#{level},rname=#{rname},jd=#{jd},wd=#{wd},
-    coordinate=POINT(#{jd},#{wd}),jtype=#{jtype},province=#{province},city=#{city} where id=#{id}
+    coordinate=POINT(#{jd},#{wd}),jtype=#{jtype},province=#{province},city=#{city},cid=#{cid} where id=#{id}
 </update>
 
 
@@ -229,6 +246,7 @@
         a.alarmId,
         a.LEVEL,
         a.jd,
+        a.cid,
         a.wd,
         a.jtype,
         a.rname,

--
Gitblit v1.9.3