diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/guhuashi/GuhuashiSiteDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/guhuashi/GuhuashiSiteDeviceDriver.java index ade2c1c..c3afa89 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/guhuashi/GuhuashiSiteDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/guhuashi/GuhuashiSiteDeviceDriver.java @@ -151,12 +151,12 @@ public class GuhuashiSiteDeviceDriver extends AbstractOpcDeviceDriver implements }else { log.info("检查:固化室{}反馈工艺运行中,开始通知lms开始固化", devicecode); this.instruction_require_time = date; - //todo 临时注释 - // FeedBackTaskStatusRequest request = new FeedBackTaskStatusRequest(); - // request.setDevice_code(this.devicecode); - // request.setType("1"); - // request.setState("4"); - // acsToWmsService.notify(request); + //todo 按现场要求暂时注释 + //FeedBackTaskStatusRequest request = new FeedBackTaskStatusRequest(); + //request.setDevice_code(this.devicecode); + //request.setType("1"); + //request.setState("4"); + //acsToWmsService.notify(request); } } //现场要测水分,手动更改 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 cc0e0b6..d758713 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 @@ -228,10 +228,12 @@ public class CockpitServiceImpl implements CockpitService { return null; }); //设备报警前十 - CompletableFuture>> task12 = CompletableFuture.supplyAsync(() -> cockpitMapper.ghStatistics(), pool); - task12.thenAccept((result) -> { + CompletableFuture task12 = CompletableFuture.supplyAsync(() -> { + List> result=cockpitMapper.ghStatistics(); getHomeInfo.put("gh_statistics", result); - }).exceptionally((e) -> { + return null; + }, pool); + task11.exceptionally((e) -> { log.error("设备报警前十: {}", e.getMessage(), e); getHomeInfo.put("gh_statistics", null); return null;