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

opt:优化报警前十

Browse Source
This commit is contained in:
gongbaoxiong
2024-11-04 14:37:32 +08:00
parent 12feb75580
commit 40e67b0b7d
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/guhuashi/GuhuashiSiteDeviceDriver.java
View File

@@ -151,7 +151,7 @@ public class GuhuashiSiteDeviceDriver extends AbstractOpcDeviceDriver implements
}else { }else {
log.info("检查：固化室{}反馈工艺运行中，开始通知lms开始固化", devicecode); log.info("检查：固化室{}反馈工艺运行中，开始通知lms开始固化", devicecode);
this.instruction_require_time = date; this.instruction_require_time = date;
//todo 临时注释 //todo 按现场要求暂时注释
//FeedBackTaskStatusRequest request = new FeedBackTaskStatusRequest(); //FeedBackTaskStatusRequest request = new FeedBackTaskStatusRequest();
//request.setDevice_code(this.devicecode); //request.setDevice_code(this.devicecode);
//request.setType("1"); //request.setType("1");

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

@@ -228,10 +228,12 @@ public class CockpitServiceImpl implements CockpitService {
return null; return null;
}); });
//设备报警前十 //设备报警前十
CompletableFuture<List<Map<String, Object>>> task12 = CompletableFuture.supplyAsync(() -> cockpitMapper.ghStatistics(), pool); CompletableFuture<JSONArray> task12 = CompletableFuture.supplyAsync(() -> {
task12.thenAccept((result) -> { List<Map<String, Object>> result=cockpitMapper.ghStatistics();
getHomeInfo.put("gh_statistics", result); getHomeInfo.put("gh_statistics", result);
}).exceptionally((e) -> { return null;
}, pool);
task11.exceptionally((e) -> {
log.error("设备报警前十: {}", e.getMessage(), e); log.error("设备报警前十: {}", e.getMessage(), e);
getHomeInfo.put("gh_statistics", null); getHomeInfo.put("gh_statistics", null);
return null; return null;