diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/controller/CockPitController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/controller/CockPitController.java index 7e00099..86852d4 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/controller/CockPitController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/controller/CockPitController.java @@ -32,6 +32,7 @@ public class CockPitController { } @PostMapping("/v2/press") @Log("压制看板") + @SaIgnore public ResponseEntity PressedMonitorV2() { return new ResponseEntity<>(cockpitService.PressedMonitorV2(), HttpStatus.OK); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java index 1379e7a..1e97649 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java @@ -132,18 +132,21 @@ public class CockpitServiceImpl implements CockpitService { .stream() .map(p -> DeviceInfoDto.buildDevice(p.getPoint_code())) .collect(Collectors.toList()); -// AcsResponse statusByCode = wmsToAcsService.getDeviceStatusByCode(deviceCodes); + AcsResponse statusByCode = wmsToAcsService.getDeviceStatusByCode(deviceCodes); List allPressInfo = cockPitMapper.getAllPressInfo(dayShift); // 便利allPressInfo 赋值 -// if (HttpStatus.HTTP_OK == statusByCode.getCode()) { -// JSONArray datas = statusByCode.getData(); -// JSONObject data = datas.getJSONObject(0); -// // 赋值 -// allPressInfo.forEach(pi -> { -// pi.setPoint_status(data.getString("status")); -// pi.setBlj_weight(data.getString("remainingweight")); -// }); -// } + if (HttpStatus.HTTP_OK == statusByCode.getCode()) { + JSONArray datas = statusByCode.getData(); + // 赋值 + allPressInfo.forEach(pi -> { + // 根据code从datas获取数据 + JSONObject data = (JSONObject) datas.stream() + .filter(o -> ((JSONObject) o).getString("device_code").equals(pi.getPoint_code())) + .findFirst().orElse(new JSONObject()); + pi.setPoint_status(data.getString("status")); + pi.setBlj_weight(data.getString("remainingweight")); + }); + } return allPressInfo; }, pool); pressDeviceInfoVoListFuture.thenAccept(result -> { @@ -194,7 +197,7 @@ public class CockpitServiceImpl implements CockpitService { // 泥料数据 List loamInfoVos = cockPitMapper.getAllDayLoamsInfo(); // 泥料种类 - long count = loamInfoVos.stream().distinct().count(); + long count = loamInfoVos.stream().map(LoamInfoVo::getRedundance_material_code).distinct().count(); // 重量之和 double sum = loamInfoVos.stream().mapToDouble(p -> Double.parseDouble(p.getMaterial_weight())).sum(); res.put("dataInfo", loamInfoVos); diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml b/lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml index 2ce2f11..295ac12 100644 --- a/lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml +++ b/lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml @@ -227,22 +227,87 @@ https://juejin.cn/post/6844903775631572999 - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +