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

add: agv状态

Browse Source
This commit is contained in:
liyongde
2023-07-04 18:37:32 +08:00
parent 00bbc04eaf
commit 3625c88ec1
1 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -470,6 +470,26 @@ public class BigScreenServiceImpl implements BigScreenService {
map.put("IoKilnTrussTask", null);
return null;
});
// 19、AGV数据
CompletableFuture<JSONObject> AGVStatusTask = CompletableFuture.supplyAsync(() -> {
JSONObject result = new JSONObject();
JSONArray res = new JSONArray();
JSONObject devicesStatus = PointUpdateUtil.getDevicesStatus(res);
// JSONObject devicesStatus = null;
JSONArray data = ObjectUtil.isNotEmpty(devicesStatus) ? devicesStatus.getJSONArray("data") : res;
for (int i = 0; i < data.size(); i++) {
JSONObject object = data.getJSONObject(i);
result.put(object.getString("device_code"), object);
}
return result;
}, pool);
AGVStatusTask.thenAccept(result -> {
map.put("AGVStatusList", result);
}).exceptionally((e) -> {
log.error("AGV数据: {}", e.getMessage(), e);
map.put("AGVStatusList", e);
return null;
});
CompletableFuture<Void> allQuery = CompletableFuture.allOf(
mixDayProductionTask,
pressDayProductionTask,
@@ -486,7 +506,8 @@ public class BigScreenServiceImpl implements BigScreenService {
manipulatorInfoTask,
kilneye4InfoTask,
KilnPassage2InfoTask,
ioKilnTrussTask);
ioKilnTrussTask,
AGVStatusTask);
CompletableFuture<ConcurrentHashMap<String, Object>> future
= allQuery.thenApply((result) -> map).exceptionally((e) -> {
log.error(e.getMessage(), e);