From 1582e0f12fd7ae7beeda1e3b23212948d5819b8a Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sat, 20 Mar 2021 09:38:58 +0800
Subject: [PATCH] 1.设备状态
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml | 8 +++++---
1 files changed, 5 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 f2fd78d..46e9ac8 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
@@ -67,6 +67,7 @@
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.addvcd,equipment.pay,equipment.expireTime from sys_equipment equipment
left join sys_catalog catalog on catalog.eqid = equipment.deviceNumber
@@ -126,7 +127,7 @@
parent_id,
jd ,
wd ,
- street,
+ street,state,reason,
addvcd,pay,expireTime from sys_equipment
</select>
@@ -195,7 +196,7 @@
SELECT
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,
+ 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,
(
SELECT
@@ -211,7 +212,7 @@
</select>
<select id="selectList" resultMap="deptVOResultMap">
- SELECT e.id,e.deviceName,e.deviceNumber,e.deviceType,e.ownership,
+ SELECT e.id,e.deviceName,e.deviceNumber,e.deviceType,e.ownership,e.state,e.reason,
e.ownerId,e.devicestate,e.stime,e.street as streeName,
ST_ASTEXT(e.coordinate) as coordinate,e.dtype,
e.parent_id,e.jd,e.wd,e.addvcd,
@@ -240,6 +241,7 @@
dept.parent_id,
dept.jd,
dept.wd,
+ dept.state,dept.reason,
dept.street AS streeName,
u.yname,
dept.addvcd,
--
Gitblit v1.9.3