diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/entity/DeviceIntegration.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/entity/DeviceIntegration.java index 1d0b33d..26f8d15 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/entity/DeviceIntegration.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/entity/DeviceIntegration.java @@ -24,4 +24,5 @@ public class DeviceIntegration implements Serializable { private String maintainStatus; //是否同步 private String izSync; + private String deviceIndex; } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/mapper/xml/DeviceManagerMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/mapper/xml/DeviceManagerMapper.xml index 50b8ec4..8e89304 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/mapper/xml/DeviceManagerMapper.xml +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/mapper/xml/DeviceManagerMapper.xml @@ -11,6 +11,7 @@ b.audit_time from sys_depart a inner join nu_org_info b on a.id = b.id + inner join nu_work_order c on c.org_id = a.id and c.status = '3' AND a.org_code LIKE concat('%',#{params.orgCode},'%') @@ -409,7 +410,8 @@ else (case ifnull(b.device_status,'') when '0' then '离线' when '1' then '在线' else '-' end) end ) as device_status, - a.device_status as maintainStatus + a.device_status as maintainStatus, + b.device_index from nu_iot_device_preview a left join nu_iot_tplink_camera b on a.sn = b.mac where a.org_code = #{params.orgCode}