From 33c8cf54661fcc8777e58e320af1a677b5b630bb Mon Sep 17 00:00:00 2001
From: tuqiang <437016993@qq.com>
Date: Tue, 22 Jul 2025 15:23:25 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E4=BC=98=E5=8C=96=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E9=97=A8=E9=A9=B1=E5=8A=A8=E6=97=A5=E5=BF=97=E7=BA=A7=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java | 2 +-
 .../java/org/nl/acs/auto/run/TwoNDCSocketConnectionAutoRun.java | 2 +-
 .../standard_autodoor/StandardAutodoorDeviceDriver.java         | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java
index f2e209cac..941d33ba1 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java
@@ -492,7 +492,7 @@ public class NDCAgvServiceImpl implements NDCAgvService {
             log.info("下发AGV充电任务--{}", str1);
 
             try{
-                OneNDCSocketConnectionAutoRun.write(b);
+                TwoNDCSocketConnectionAutoRun.write(b);
             } catch (Exception e){
                 log.error("下发充电任务失败{}{}",e,e.getMessage());
             }
diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/TwoNDCSocketConnectionAutoRun.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/TwoNDCSocketConnectionAutoRun.java
index c817f17ab..fca8510a6 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/TwoNDCSocketConnectionAutoRun.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/TwoNDCSocketConnectionAutoRun.java
@@ -270,7 +270,7 @@ public class TwoNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
                                         log.info("下发开门信号值为:{},读取开门信号值为:{}", standardAutodoorDeviceDriver.getToOpen(), standardAutodoorDeviceDriver.getOpen());
                                         data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
                                     } else {
-                                        log.info("未下发NDC信号原因: 下发开门信号值为:{},读取开门信号值为:{}", standardAutodoorDeviceDriver.getToOpen(), standardAutodoorDeviceDriver.getToClose());
+                                        log.info("未下发NDC信号原因: 下发开门信号值为:{},读取开门信号值为:{}", standardAutodoorDeviceDriver.getToOpen(), standardAutodoorDeviceDriver.getOpen());
                                     }
                                 }
                                 else if (device.getDeviceDriver() instanceof RasterDeviceDriver){
diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/StandardAutodoorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/StandardAutodoorDeviceDriver.java
index a8d84782f..6480c3f30 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/StandardAutodoorDeviceDriver.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/StandardAutodoorDeviceDriver.java
@@ -87,6 +87,7 @@ public class StandardAutodoorDeviceDriver extends AbstractOpcDeviceDriver implem
                 .device_code(device_code)
                 .content("下发多个电气信号" + itemMap)
                 .build();
+        logDto.setLog_level(4);
         luceneExecuteLogService.deviceExecuteLog(logDto);
         try {
             this.toDoorCommandControl.control(param,value);