From 36afc3a1f1437b8a3283dc0bf6475e96fded05a7 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 12 Apr 2021 22:35:36 +0800
Subject: [PATCH] 新增主动报警alarm，健康码，体温，包裹，违禁品导出数据接口

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml |  106 +++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 98 insertions(+), 8 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 6b447fe..b467021 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
@@ -29,6 +29,7 @@
         <result column="district" property="district"/>
         <result column="state" property="state"/>
         <result column="reason" property="reason"/>
+        <result column="jtype" property="jtype"/>
     </resultMap>
 
     <resultMap id="treeNodeResultMap" type="org.springblade.core.tool.node.TreeNode">
@@ -164,8 +165,11 @@
             and dtype=#{equipment.dtype}
         </if>
 
-        <if test="dxtype!=null">
+        <if test="dxtype!=null and dxtype == 1">
             and heartbeat >= DATE_SUB(NOW(),INTERVAL 1 DAY)
+        </if>
+        <if test="dxtype!=null and dxtype == 0">
+            and heartbeat &lt; DATE_SUB(NOW(),INTERVAL 1 DAY)
         </if>
 
         <if test="childList!=null and childList.size>0">
@@ -187,12 +191,88 @@
     </select>
 
     <select id="listAll" resultMap="equipmentResultMap">
-          select id,deviceName,deviceNumber,deviceType,ownership,ownerId,devicestate,stime,dtype,heartbeat,expireTime,pay,
-        parent_id,
-        jd ,
-        wd ,
-        street,state,reason,
-        addvcd,pay,expireTime from sys_equipment
+        SELECT
+        IF
+        ( alarm.jtype IS NULL, 0, 1 ) AS jtype,
+        equipment.id,
+        equipment.deviceName,
+        equipment.deviceNumber,
+        equipment.deviceType,
+        equipment.ownership,
+        equipment.ownerId,
+        equipment.devicestate,
+        equipment.stime,
+        equipment.dtype,
+        equipment.heartbeat,
+        equipment.expireTime,
+        equipment.parent_id,
+        equipment.district,
+        equipment.province,
+        equipment.city,
+        equipment.serialNumber,
+        equipment.channelNumber,
+        equipment.jd,
+        equipment.wd,
+        equipment.state,
+        equipment.reason,
+        equipment.street,
+        catalog.pid,
+        equipment.oneContacts,
+        equipment.onePhone,
+        equipment.oneId,
+        equipment.twoContacts,
+        equipment.twoPhone,
+        equipment.twoId,
+        equipment.ThreeContacts,
+        equipment.ThreePhone,
+        equipment.threeId,
+        equipment.deptId,
+        equipment.addvcd,
+        equipment.pay,
+        equipment.expireTime
+        FROM
+        sys_equipment equipment
+        LEFT JOIN sys_catalog catalog ON catalog.eqid = equipment.deviceNumber
+        LEFT JOIN (
+        SELECT
+        count( id ) AS jtype,
+        deviceNumber
+        FROM
+        sys_alarm
+        WHERE
+        waringType = "紧急求救"
+        AND jtype = 0
+        OR jtype = 1
+        GROUP BY
+        deviceNumber
+        ) alarm ON alarm.deviceNumber = equipment.deviceNumber
+        WHERE
+        1 =1
+
+        <if test="equipment.deviceName!=null and equipment.deviceName!=''">
+            and (
+            deviceName like concat('%',#{equipment.deviceName},'%')
+            or deviceNumber like concat('%',#{equipment.deviceName},'%')
+            or street like concat('%',#{equipment.deviceName},'%')
+            )
+        </if>
+    </select>
+
+    <select id="listAlls" resultMap="equipmentResultMap">
+          select equipment.id,equipment.deviceName,equipment.deviceNumber,equipment.deviceType,equipment.ownership
+        ,equipment.ownerId,equipment.devicestate,equipment.stime,equipment.dtype,equipment.heartbeat,equipment.expireTime,
+        equipment.parent_id,equipment.district,equipment.province,equipment.city,equipment.serialNumber,equipment.channelNumber,
+        equipment.jd ,
+        equipment.wd ,
+        equipment.state,equipment.reason,
+        equipment.street,catalog.pid,
+        equipment.oneContacts,equipment.onePhone,equipment.oneId,
+        equipment.twoContacts,equipment.twoPhone,equipment.twoId,
+        equipment.ThreeContacts,equipment.ThreePhone,equipment.threeId,
+        equipment.deptId,
+        equipment.addvcd,equipment.pay,equipment.expireTime from sys_equipment equipment
+        left join sys_catalog catalog on catalog.eqid = equipment.deviceNumber
+        where 1=1
     </select>
 
 
@@ -338,7 +418,17 @@
 
     <!--查询预警设备数量-->
     <select id="selectEqCy" resultType="java.util.HashMap">
-        SELECT COUNT(deviceNumber) as cou,deviceNumber FROM `sys_alarm` WHERE alarmTime like concat(concat('%', #{time}), '%') and waringType NOT IN("系统测试","主机重新上电") group by deviceNumber
+        SELECT
+            count( id ) AS jtype,
+            deviceNumber
+        FROM
+            sys_alarm
+        WHERE
+            waringType = "紧急求救"
+            AND jtype = 0
+            OR jtype = 1
+        GROUP BY
+            deviceNumber
     </select>
 
     <!--查询设故障数量-->

--
Gitblit v1.9.3