yangjun
/
hldy_yunwei_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

物联设备BUG处理

This commit is contained in:
曹磊 2026-04-17 17:31:59 +08:00
parent 9304d2fc74
commit 53c8194f63
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/entity/DeviceIntegration.java
View File

@ -24,4 +24,5 @@ public class DeviceIntegration implements Serializable {
private String maintainStatus; private String maintainStatus;
//是否同步 //是否同步
private String izSync; private String izSync;
private String deviceIndex;
} }

4
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/mapper/xml/DeviceManagerMapper.xml
View File

@ -11,6 +11,7 @@
b.audit_time b.audit_time
from sys_depart a from sys_depart a
inner join nu_org_info b on a.id = b.id 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'
<where> <where>
<if test="params.orgCode != null and params.orgCode != ''"> <if test="params.orgCode != null and params.orgCode != ''">
AND a.org_code LIKE concat('%',#{params.orgCode},'%') 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) else (case ifnull(b.device_status,'') when '0' then '离线' when '1' then '在线' else '-' end)
end end
) as device_status, ) as device_status,
a.device_status as maintainStatus a.device_status as maintainStatus,
b.device_index
from nu_iot_device_preview a from nu_iot_device_preview a
left join nu_iot_tplink_camera b on a.sn = b.mac left join nu_iot_tplink_camera b on a.sn = b.mac
where a.org_code = #{params.orgCode} where a.org_code = #{params.orgCode}