From ad7b7464780debdbcd76542b34aa4eaf8344930d Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 30 Mar 2021 17:19:54 +0800
Subject: [PATCH] 分发接口调整
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml | 9 ++++++++-
1 files changed, 8 insertions(+), 1 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 9046a9a..a360718 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
@@ -164,6 +164,10 @@
and dtype=#{equipment.dtype}
</if>
+ <if test="dxtype!=null">
+ and heartbeat >= DATE_SUB(NOW(),INTERVAL 1 DAY)
+ </if>
+
<if test="childList!=null and childList.size>0">
and deptId in
<foreach collection="childList" index="index" item="item" open="(" separator="," close=")">
@@ -247,10 +251,13 @@
<select id="selectInfo" resultMap="deptVOResultMap"
parameterType="org.springblade.jfpt.equipment.entity.Equipment">
SELECT
- dept.id,dept.deviceName,dept.deviceNumber,dept.deviceType,dept.ownership,
+ dept.deptId,dept.id,dept.deviceName,dept.deviceNumber,dept.deviceType,dept.ownership,
dept.ownerId,dept.devicestate,dept.stime,dept.district,dept.province,dept.city,
ST_ASTEXT(dept.coordinate) as coordinate,dept.dtype,dept.expireTime,dept.heartbeat, dept.state,dept.reason,
dept.parent_id,dept.jd,dept.wd,dept.street,u.yname,d.addvnm,dept.addvcd,dept.serialNumber,dept.channelNumber,
+ dept.oneContacts,dept.onePhone,dept.oneId,
+ dept.twoContacts,dept.twoPhone,dept.twoId,
+ dept.ThreeContacts,dept.ThreePhone,dept.threeId,
(
SELECT
CASE WHEN count(1) > 0 THEN 1 ELSE 0 END
--
Gitblit v1.9.3