From 17fe0e6447e8ef8c1d656965de26dbcecf909785 Mon Sep 17 00:00:00 2001
From: "USER-20220102CG\\noblelift" <546428999@qq.com>
Date: Wed, 16 Aug 2023 10:55:06 +0800
Subject: [PATCH] =?UTF-8?q?rev=20=E6=9B=B4=E6=96=B0=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E8=AF=BB=E3=80=81=E5=86=99=E6=9C=AA=E5=85=B3=E9=97=AD=E9=93=BE?=
 =?UTF-8?q?=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/acs/device/service/impl/DeviceServiceImpl.java    | 2 ++
 .../main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java   | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java
index 8a8d5fd0..f237db71 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java
@@ -1099,6 +1099,7 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial
             result.add(json);
 
         }
+        server.dispose();
         return result;
     }
 
@@ -1116,6 +1117,7 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial
         }
         Server server = ReadUtil.getServer(opc_id);
         ReadUtil.write(itemMap, server);
+        server.dispose();
     }
 
     /**
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java b/wcs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java
index a4b1bc31..df82237c 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java
@@ -188,6 +188,7 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC
             Object his = accessor_value.getValue(itemId);
             if (!ObjectUtl.isEquals(itemState.getQuality(), QualityTypeValue.OPC_QUALITY_GOOD) && his != null) {
               log.warn("opc 值不健康 item: {}, 状态: {}", itemId, itemState.getQuality());
+              valueAllNotNull = false;
             }
 
             if (!UnifiedDataAppService.isEquals(value, his)) {
@@ -227,8 +228,8 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC
                 log.warn(tag + "重新创建server");
                 log.warn("{} 所有内容都为空, all_null:{} ,暂定{}s", tag, all_null,30000 + random);
               }
-//                            ThreadUtl.sleep((long) (30000 + random));
-              ThreadUtl.sleep((long) ((new Random()).nextInt(3) +1) * 1000);
+//              ThreadUtl.sleep((long) (30000 + random));
+              ThreadUtl.sleep((long) ((new Random()).nextInt(3) +1) * 10000);
               break start;
             } else if (this.all_null < 12) {
               if (log.isWarnEnabled()) {