From 2c2b1ab406d3049a0e69fff01e3daade5cbe90ea Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 08 Apr 2021 19:59:26 +0800
Subject: [PATCH] 预警数量统计接口修改,新增按时间条件查询条件，违禁品统计接口修改
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml | 44 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 44 insertions(+), 0 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 740fc3d..eeed1f9 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
@@ -201,6 +201,31 @@
equipment.addvcd,equipment.pay,equipment.expireTime from sys_equipment equipment
left join sys_catalog catalog on catalog.eqid = equipment.deviceNumber
where 1=1
+
+ <if test="equipment.deviceName!=null">
+ 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>
@@ -334,4 +359,23 @@
update sys_equipment SET state=#{state},reason=#{reason} where deviceNumber=#{deviceNumber}
</update>
+ <!--查询设备在线数量-->
+ <select id="selectEqCz" resultType="Integer">
+ select COUNT(*) from sys_equipment where heartbeat >= DATE_SUB(NOW(),INTERVAL 1 DAY)
+ </select>
+
+ <!--查询设备掉线数量-->
+ <select id="selectEqCd" resultType="Integer">
+ select COUNT(*) from sys_equipment where heartbeat < DATE_SUB(NOW(),INTERVAL 1 DAY)
+ </select>
+
+ <!--查询预警设备数量-->
+ <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>
+
+ <!--查询设故障数量-->
+ <select id="selectEqCg" resultType="Integer">
+ select COUNT(*) from sys_equipment where heartbeat >= DATE_SUB(NOW(),INTERVAL 1 DAY) and state!=null
+ </select>
</mapper>
--
Gitblit v1.9.3