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

页面返回增加isError及hasGoods

Browse Source
This commit is contained in:
pangshenghao
2023-06-07 17:06:18 +08:00
parent 52b234ff9c
commit 32fea12355
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/device_status/DeviceStatusDeviceDriver.java
View File

@@ -75,6 +75,9 @@ public class DeviceStatusDeviceDriver extends AbstractOpcDeviceDriver implements
String alarm = ""; String alarm = "";
String task_id = ""; String task_id = "";
Boolean iserror = false;
Boolean hasGoods = false;
@Override @Override
public void setDeviceStatus(JSONObject data) { public void setDeviceStatus(JSONObject data) {
String flag = data.getString("option"); String flag = data.getString("option");
@@ -108,6 +111,8 @@ public class DeviceStatusDeviceDriver extends AbstractOpcDeviceDriver implements
jo.put("alarm", alarm); jo.put("alarm", alarm);
jo.put("task_id", task_id); jo.put("task_id", task_id);
jo.put("isOnline", this.getIsonline()); jo.put("isOnline", this.getIsonline());
jo.put("isError",this.getIserror());
jo.put("hasGoods", this.getHasGoods());
return jo; return jo;
} }
} }

10
acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryLKDeviceStatus.java
View File

@@ -71,6 +71,16 @@ public class QueryLKDeviceStatus {
deviceStatusDeviceDriver.setAlarm(deviceStatusData.getAlarm()); deviceStatusDeviceDriver.setAlarm(deviceStatusData.getAlarm());
deviceStatusDeviceDriver.setTask_id(deviceStatusData.getTaskId()); deviceStatusDeviceDriver.setTask_id(deviceStatusData.getTaskId());
deviceStatusDeviceDriver.setIsonline(true); deviceStatusDeviceDriver.setIsonline(true);
if(!"0".equals(deviceStatusData.getAlarm())) {
deviceStatusDeviceDriver.setIserror(true);
}else{
deviceStatusDeviceDriver.setIserror(false);
}
if(!"0".equals(deviceStatusData.getLoad())) {
deviceStatusDeviceDriver.setHasGoods(true);
}else{
deviceStatusDeviceDriver.setHasGoods(false);
}
} }
} }
} }