root/liaoNingShengHua2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 设备监控

Browse Source
This commit is contained in:
liyongde
2023-04-26 15:51:34 +08:00
parent 6fe9a25ea1
commit 3881bc289f
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lms/nladmin-system/src/main/java/org/nl/wms/cockpit/service/dto/DeviceInfoDto.java
View File

@@ -32,7 +32,7 @@ public class DeviceInfoDto implements Serializable {
*/ */
private String device_model; private String device_model;
/** /**
* 设备状态枚举: 0关机（停机），1开机（运行），2故障 * 设备状态枚举: 0关机，1待机，2生产中，3故障
*/ */
private String device_status; private String device_status;
/** /**
@@ -72,5 +72,9 @@ public class DeviceInfoDto implements Serializable {
/** /**
* 图片名字 * 图片名字
*/ */
private int error;
private String open_time;
private int stand_time;
private int error_time;
private String device_url; private String device_url;
} }

2
lms/nladmin-system/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java
View File

@@ -226,7 +226,7 @@ public class CockpitServiceImpl implements CockpitService{
JSONArray data = ObjectUtil.isNotEmpty( JSONArray data = ObjectUtil.isNotEmpty(
devicesStatus.getJSONArray("data"))?devicesStatus.getJSONArray("data"):result; devicesStatus.getJSONArray("data"))?devicesStatus.getJSONArray("data"):result;
if(ObjectUtil.isNotEmpty(data)) { if(ObjectUtil.isNotEmpty(data)) {
res = result.toJavaList(DeviceInfoDto.class); res = data.toJavaList(DeviceInfoDto.class);
res.forEach(d -> { res.forEach(d -> {
DeviceEnum deviceEnum = DeviceEnum.get(d.getDevice_model(), d.getDevice_code()); DeviceEnum deviceEnum = DeviceEnum.get(d.getDevice_model(), d.getDevice_code());
// 添加图片名字 // 添加图片名字