From 606a427fd3242fcebb039800a967d8adfef9a99c Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 07 May 2021 19:26:01 +0800
Subject: [PATCH] 1.设备列表接口修改，警情状态的排最前 2.新增设备查询的拦截器，更新设备状态

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml
index de41668..3c57a77 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml
@@ -160,19 +160,16 @@
         deviceNumber
         ) alarm ON alarm.deviceN = equipment.deviceNumber
         where 1=1
-
         <if test="equipment.deviceName!=null">
             and (deviceName like concat('%',#{equipment.deviceName},'%') or deviceNumber like
             concat('%',#{equipment.deviceName},'%'))
         </if>
-
         <if test="equipment.beginTime!=null and equipment.beginTime!=''">
             and expireTime&gt;=#{equipment.beginTime}
         </if>
         <if test="equipment.endTime!=null and equipment.endTime!=''">
             and expireTime&lt;=#{equipment.endTime}
         </if>
-
         <if test="equipment.district!=null">
             and district like concat('%',#{equipment.district},'%')
         </if>
@@ -185,31 +182,34 @@
         <if test="equipment.manufacturers!=null and equipment.manufacturers!=''">
             and manufacturers = #{equipment.manufacturers}
         </if>
-
         <if test="equipment.devicestate!=null">
             and devicestate =#{equipment.devicestate}
         </if>
-
         <if test="equipment.dtype!=null">
             and dtype=#{equipment.dtype}
         </if>
-
         <if test="dxtype!=null and dxtype == 0">
-            and heartbeat &lt; DATE_SUB(NOW(),INTERVAL 1 DAY)
+            and heartbeat &lt; DATE_SUB(NOW(),INTERVAL 1 DAY)  and dtype=0
         </if>
         <if test="dxtype!=null and dxtype == 1">
-            and heartbeat >= DATE_SUB(NOW(),INTERVAL 1 DAY)
+            and heartbeat >= DATE_SUB(NOW(),INTERVAL 1 DAY) and dtype=1
         </if>
         <if test="dxtype!=null and dxtype == 2">
-            and alarm.jtype IS NOT NULL
+            and heartbeat >= DATE_SUB(NOW(),INTERVAL 1 DAY) and dtype=2
         </if>
         <if test="dxtype!=null and dxtype == 3">
-            and heartbeat >= DATE_SUB(NOW(),INTERVAL 1 DAY) and state!=null
+            and heartbeat >= DATE_SUB(NOW(),INTERVAL 1 DAY)  and dtype=3
         </if>
         <if test="pid!=null and pid!=''">
             and deptId like concat('%',#{pid},'%')
         </if>
-
+        order by (
+            case
+                when dtype=2  then 1
+                when dtype=3 then 2
+                when dtype=0  then 3
+                when dtype=1  then 4
+            END)
     </select>
 
     <!--新增-->

--
Gitblit v1.9.3