From 5cfe00a806928c88d633593bf423332ccc7c7254 Mon Sep 17 00:00:00 2001
From: "USER-20220102CG\\noblelift" <546428999@qq.com>
Date: Mon, 10 Jul 2023 09:09:24 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E8=87=AA=E5=8A=A8=E9=97=A8=E3=80=81ndc?=
 =?UTF-8?q?=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../run/OneNDCSocketConnectionAutoRun.java     | 18 +++++++++++++-----
 .../StandardAutodoorDeviceDriver.java          |  4 +++-
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java b/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java
index 2bcec2bd0..47f392bfd 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java
@@ -23,6 +23,7 @@ import org.springframework.stereotype.Component;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
+import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.util.Date;
 import java.util.List;
@@ -78,11 +79,17 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
         DeviceExecuteLogService logServer = SpringContextHolder.getBean(DeviceExecuteLogService.class);
         ip = paramService.findByCode(AcsConfig.AGVURL).getValue();
         port = Integer.parseInt(paramService.findByCode(AcsConfig.AGVPORT).getValue());
+        byte[] data = null;
 
 
         try {
+            InetSocketAddress socketAddress = new InetSocketAddress(ip, port);
+
             byte[] b = new byte[1024];
-            s = new Socket(ip, port);
+            s = new Socket();
+            s.connect(socketAddress,2*1000);
+            s.setKeepAlive(true);//长链接
+//            s.setSoTimeout(1000* 60 * 10);//读取超时时间
             dos = new DataOutputStream(s.getOutputStream());
             dis = new DataInputStream(s.getInputStream());
             System.out.println("1楼NDCAgv链接成功");
@@ -113,7 +120,6 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
                 //System.out.println("收到请求参数：" + bs);
                 boolean flag = false;
                 if (arr[8] * 256 + arr[9] == 0x73) {
-                    byte[] data = null;
                     System.out.println("接收agv上报信息：" + bs);
                     //执行阶段
                     int phase = arr[16] * 256 + arr[17];
@@ -221,15 +227,17 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
                         }
 
                     }
-                    if (!ObjectUtil.isEmpty(data)) {
-                        write(data);
-                    }
 
                 } else {
                     System.out.println("agv上报不是0073类型动作，不处理");
                 }
             }
 
+            if (!ObjectUtil.isEmpty(data)) {
+                write(data);
+                data = null;
+            }
+
         } catch (Exception e) {
             System.out.println("OneAgv链接异常");
             log.info("OneAgv链接异常");
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/StandardAutodoorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/StandardAutodoorDeviceDriver.java
index 2fa039186..1bbde0ba3 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/StandardAutodoorDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/StandardAutodoorDeviceDriver.java
@@ -58,7 +58,9 @@ public class StandardAutodoorDeviceDriver extends AbstractOpcDeviceDriver implem
         }
         if (close != last_close) {
             logServer.deviceExecuteLog(this.device_code, "", "", "信号close：" + last_close + "->" + close);
-
+            if(close ==1 ){
+                this.writing("to_close","0");
+            }
         }
         if (toClose != last_toClose) {
             logServer.deviceExecuteLog(this.device_code, "", "", "信号toClose：" + last_toClose + "->" + toClose);