From 40e67b0b7d4a4c4c4a8eb754a70372a4f6464e80 Mon Sep 17 00:00:00 2001
From: gongbaoxiong <751575283@qq.com>
Date: Mon, 4 Nov 2024 14:37:32 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E4=BC=98=E5=8C=96=E6=8A=A5=E8=AD=A6?=
 =?UTF-8?q?=E5=89=8D=E5=8D=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tianneng/guhuashi/GuhuashiSiteDeviceDriver.java  | 12 ++++++------
 .../wms/cockpit/service/impl/CockpitServiceImpl.java |  8 +++++---
 2 files changed, 11 insertions(+), 9 deletions(-)

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<List<Map<String, Object>>> task12 = CompletableFuture.supplyAsync(() -> cockpitMapper.ghStatistics(), pool);
-        task12.thenAccept((result) -> {
+        CompletableFuture<JSONArray> task12 = CompletableFuture.supplyAsync(() ->  {
+            List<Map<String, Object>> 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;