From e9acc99e4475fe31e3d8493a3db7369c5c6d96bf Mon Sep 17 00:00:00 2001
From: gengby <858962040@qq.com>
Date: Sat, 6 May 2023 13:57:25 +0800
Subject: [PATCH] =?UTF-8?q?rev=20ndc=E4=B8=8B=E5=8F=91=E4=BF=A1=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../run/TwoNDCSocketConnectionAutoRun.java    |  1 +
 .../StandardAutodoorDeviceDriver.java         | 24 +++++++++++++++----
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/TwoNDCSocketConnectionAutoRun.java b/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/TwoNDCSocketConnectionAutoRun.java
index a0b0a34a4..eee214ae0 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/TwoNDCSocketConnectionAutoRun.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/TwoNDCSocketConnectionAutoRun.java
@@ -216,6 +216,7 @@ public class TwoNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
                                 e.printStackTrace();
                             }
                             if (standardAutodoorDeviceDriver.getOpen() == 1) {
+                                log.info("下发开门信号值为:{},下发关门信号值为:{}", standardAutodoorDeviceDriver.getToOpen(), standardAutodoorDeviceDriver.getToClose());
                                 data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
                             }
                         }
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 d314b68ef..2fa039186 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
@@ -31,7 +31,13 @@ public class StandardAutodoorDeviceDriver extends AbstractOpcDeviceDriver implem
 
     int last_open = 0;
     int last_close = 0;
+
+    int toOpen = 0;
+    int last_toOpen = 0;
+    int toClose = 0;
+    int last_toClose = 0;
     String device_code = null;
+
     @Override
     public Device getDevice() {
         return this.device;
@@ -45,6 +51,8 @@ public class StandardAutodoorDeviceDriver extends AbstractOpcDeviceDriver implem
         device_code = this.getDevice().getDevice_code();
         open = this.itemProtocol.getOpen();
         close = this.itemProtocol.getClose();
+        toOpen = this.itemProtocol.getToOpen();
+        toClose = this.itemProtocol.getToClose();
         if (open != last_open) {
             logServer.deviceExecuteLog(this.device_code, "", "", "信号open：" + last_open + "->" + open);
         }
@@ -52,9 +60,17 @@ public class StandardAutodoorDeviceDriver extends AbstractOpcDeviceDriver implem
             logServer.deviceExecuteLog(this.device_code, "", "", "信号close：" + last_close + "->" + close);
 
         }
+        if (toClose != last_toClose) {
+            logServer.deviceExecuteLog(this.device_code, "", "", "信号toClose：" + last_toClose + "->" + toClose);
 
+        }
+        if (toOpen != last_toOpen) {
+            logServer.deviceExecuteLog(this.device_code, "", "", "信号toOpen：" + last_toOpen + "->" + toOpen);
+        }
         last_open = open;
         last_close = close;
+        last_toClose = toClose;
+        last_toOpen = toOpen;
     }
 
 
@@ -74,14 +90,14 @@ public class StandardAutodoorDeviceDriver extends AbstractOpcDeviceDriver implem
         JSONObject jo = new JSONObject();
         String open = "";
         String close = "";
-        if(this.getOpen() == 0){
+        if (this.getOpen() == 0) {
             open = "未知";
-        } else if(this.getOpen() == 1){
+        } else if (this.getOpen() == 1) {
             open = "开到位";
         }
-        if(this.getClose() == 0){
+        if (this.getClose() == 0) {
             open = "未知";
-        } else if(this.getClose() == 1){
+        } else if (this.getClose() == 1) {
             open = "关到位";
         }
         jo.put("device_name", this.getDevice().getDevice_name());