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

add: 强制完成前的确认

Browse Source
This commit is contained in:
liyongde
2023-04-20 11:02:03 +08:00
parent ae1446e7b3
commit 27b0ec1436
3 changed files with 75 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lms/nladmin-system/src/main/java/org/nl/modules/common/utils/PointUpdateUtil.java
View File

@@ -110,15 +110,26 @@ public class PointUpdateUtil {
devices.add(device);
// 向ACS查询点位状态
JSONObject deviceStatus = wmsToAcsService.getPointStatus(devices);
if (ObjectUtil.isEmpty(deviceStatus.get("data"))) return DeviceStatusEnum.SHUTDOWN.getCode();
JSONArray statusJSONArray = deviceStatus.getJSONArray("data");
if (ObjectUtil.isEmpty(statusJSONArray)) return DeviceStatusEnum.SHUTDOWN.getCode();
if (ObjectUtil.isEmpty(deviceStatus.get("data"))) {
return DeviceStatusEnum.SHUTDOWN.getCode();
}
JSONArray statusJSONArray = null;
try {
statusJSONArray = deviceStatus.getJSONArray("data");
} catch (Exception e) {
return DeviceStatusEnum.SHUTDOWN.getCode();
}
if (ObjectUtil.isEmpty(statusJSONArray)) {
return DeviceStatusEnum.SHUTDOWN.getCode();
}
JSONObject deviceJson = statusJSONArray.getJSONObject(0);
String point_code = deviceJson.getString("device_code");
String mode = deviceJson.getString("mode"); // 工作状态：0脱机，其他正常
String error = deviceJson.getString("error"); // 0是正常
log.info("device_code: " + point_code + ", mode: " + mode + ", error: " + error);
if (!error.equals("0")) return DeviceStatusEnum.FAILURE.getCode();
if (!error.equals("0")) {
return DeviceStatusEnum.FAILURE.getCode();
}
return mode.equals("0") ? DeviceStatusEnum.STANDBY.getCode() : DeviceStatusEnum.RUNNING.getCode();
}
}

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

@@ -215,8 +215,8 @@ public class CockpitServiceImpl implements CockpitService{
Duration duration = Duration.between(dateTime, now);
d.setWork_time(duration.toHours() + "");
}
// 设备状态
// d.setDevice_status(PointUpdateUtil.getDeviceStatus(d.getDevice_code()));
// 设置设备状态
d.setDevice_status(PointUpdateUtil.getDeviceStatus(d.getDevice_code()));
DeviceEnum deviceEnum = DeviceEnum.get(d.getDevice_model(), d.getDevice_code());
// 添加图片名字
d.setDevice_url(deviceEnum.getPictureName());