From 6f02e3a418d161267c5e5b7630a590260ba153dd Mon Sep 17 00:00:00 2001
From: gengby <858962040@qq.com>
Date: Mon, 24 Apr 2023 10:41:41 +0800
Subject: [PATCH] =?UTF-8?q?rev=20=E8=BF=98=E5=8E=9F=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E7=BA=BF=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nl/acs/opc/DeviceOpcProtocolRunable.java  | 54 +++++++++----------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java b/acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java
index c020e6280..968ae2a12 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java
@@ -22,7 +22,7 @@ public class DeviceOpcProtocolRunable implements Runnable {
   int error_num;
   String message;
   private Server server;
-  boolean flag =false;
+  //boolean flag =false;
 
 
   public DeviceOpcProtocolRunable() {
@@ -176,30 +176,30 @@ public class DeviceOpcProtocolRunable implements Runnable {
               value = OpcUtl.getValue(item, itemState);
               his = accessor_value.getValue(item.getId());
               if (!ObjectUtl.isEquals(itemState.getQuality(), QualityTypeValue.OPC_QUALITY_GOOD) && his != null) {
-                flag = true;
+                //flag = true;
                 log.warn("opc 值不健康 item: {}, 状态: {},当前读取值：{}, 系统内存值{} ", item.getId(), itemState.getQuality(), value, his);
               }
-              if(flag){
-                if (this.server != null) {
-                  try {
-                    this.server.disconnect();
-                  } catch (Exception var25) {
-                    log.warn("{} : server  disconnect", var25);
-                  }
-                }
-                DeviceOpcProtocolRunable runable = new DeviceOpcProtocolRunable();
-                runable.setProtocols(protocols);
-                runable.setOpcServer(OpcServer);
-                ExecutorService executorService = Executors.newCachedThreadPool();
-                executorService.submit(runable);
-                log.warn("opc 值不健康 item: {}, 重新创建连接,当前线程名：{}", item.getId(),tag);
-                break;
-              }
+//              if(flag){
+//                if (this.server != null) {
+//                  try {
+//                    this.server.disconnect();
+//                  } catch (Exception var25) {
+//                    log.warn("{} : server  disconnect", var25);
+//                  }
+//                }
+//                DeviceOpcProtocolRunable runable = new DeviceOpcProtocolRunable();
+//                runable.setProtocols(protocols);
+//                runable.setOpcServer(OpcServer);
+//                ExecutorService executorService = Executors.newCachedThreadPool();
+//                executorService.submit(runable);
+//                log.warn("opc 值不健康 item: {}, 重新创建连接,当前线程名：{}", item.getId(),tag);
+//                break;
+//              }
             } while (ObjectUtil.equal(value, his));//如果两次的值相等，不走下面的代码
 
-            if(flag){
-              break;
-            }
+//            if(flag){
+//              break;
+//            }
             OpcItemDto itemDto = this.getItem(item.getId());
             //默认记录日志
             if (true) {
@@ -221,13 +221,13 @@ public class DeviceOpcProtocolRunable implements Runnable {
 //            accessor_value.getHistoryUnifiedData(item.getId());
             //设置值
             accessor_value.setValue(item.getId(), value);
-            if(flag){
-              break;
-            }
-          }
-          if(flag){
-            break;
+//            if(flag){
+//              break;
+//            }
           }
+//          if(flag){
+//            break;
+//          }
         }
       } catch (Exception var30) {
         if (this.server != null) {