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 | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 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 7699a9c..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
@@ -165,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 < DATE_SUB(NOW(),INTERVAL 1 DAY)
</if>
<if test="childList!=null and childList.size>0">
@@ -246,7 +249,7 @@
WHERE
1 =1
- <if test="equipment.deviceName!=null">
+ <if test="equipment.deviceName!=null and equipment.deviceName!=''">
and (
deviceName like concat('%',#{equipment.deviceName},'%')
or deviceNumber like concat('%',#{equipment.deviceName},'%')
@@ -415,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