From e0a6548d6922ff1f7096dbff619dfed9d696a7c6 Mon Sep 17 00:00:00 2001
From: gengby <858962040@qq.com>
Date: Tue, 16 Sep 2025 13:10:46 +0800
Subject: [PATCH] =?UTF-8?q?add:NDC=E7=83=98=E7=AE=B1=E5=AF=B9=E6=8E=A5?=
 =?UTF-8?q?=E4=BD=8D=E6=94=BE=E8=B4=A7=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HongXiangConveyorDeviceDriver.java        |  4 ++--
 .../agv/ndctwo/AgvNdcTwoDeviceDriver.java     | 24 ++++++++++++++++++-
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hongxiang_device/HongXiangConveyorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hongxiang_device/HongXiangConveyorDeviceDriver.java
index 9e0081c25..8e0febbc8 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hongxiang_device/HongXiangConveyorDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hongxiang_device/HongXiangConveyorDeviceDriver.java
@@ -182,7 +182,7 @@ public class HongXiangConveyorDeviceDriver extends AbstractOpcDeviceDriver imple
             if (move == 0) {
                 thingToNothing();
             }
-            logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + mode + "->" + last_mode);
+            logServer.deviceExecuteLog(this.device_code, "", "", "信号move：" + mode + "->" + last_mode);
         }
         if (error != last_error) {
             if (error != 0) {
@@ -203,7 +203,7 @@ public class HongXiangConveyorDeviceDriver extends AbstractOpcDeviceDriver imple
                 requireSucess = false;
                 logServer.deviceExecuteLog(device_code, "", "", "请求标记复位成功`此时请求标记值为requireSucess:" + requireSucess);
             }
-            logServer.deviceExecuteLog(this.device_code, "", "", "信号move：" + last_finish + "->" + finish);
+            logServer.deviceExecuteLog(this.device_code, "", "", "信号finish：" + last_finish + "->" + finish);
         }
         if (mode == 0) {
             this.setIsonline(false);
diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java
index 4b0803651..5ac24525c 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java
@@ -1965,6 +1965,28 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
                     logDto.setLog_level(4);
                     luceneExecuteLogService.deviceExecuteLog(logDto);
                 }
+            } else if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) {
+                standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) device.getDeviceDriver();
+                standardInspectSiteDeviceDriver.writing(1);
+                if ((standardInspectSiteDeviceDriver.getMove() == 0 && standardInspectSiteDeviceDriver.getAction() == 1 && standardInspectSiteDeviceDriver.getError() == 0)) {
+                    data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
+                    LuceneLogDto logDto = LuceneLogDto.builder()
+                            .device_code(this.getDeviceCode())
+                            .content("agvphase:" + phase + "反馈:" + data)
+                            .build();
+                    logDto.setLog_level(4);
+                    luceneExecuteLogService.deviceExecuteLog(logDto);
+                } else {
+                    message = "设备号:" + device_code + "光电信号:" + standardInspectSiteDeviceDriver.getMove() + ",动作信号:" + standardInspectSiteDeviceDriver.getAction() + "报警信号:" + standardInspectSiteDeviceDriver.getError() + ",指令号:" + ikey + "不满足放货条件";
+                    log.info("设备{}当前光电信号{}，动作信号{} ,报警信号{}，不满足放货条件,指令号{}", device_code, standardInspectSiteDeviceDriver.getMove(), standardInspectSiteDeviceDriver.getAction()
+                            , standardInspectSiteDeviceDriver.getError(), ikey);
+                    LuceneLogDto logDto = LuceneLogDto.builder()
+                            .device_code(this.getDeviceCode())
+                            .content(message)
+                            .build();
+                    logDto.setLog_level(4);
+                    luceneExecuteLogService.deviceExecuteLog(logDto);
+                }
             }/* else if (device.getDeviceDriver() instanceof RangingStationsDeviceDriver) {
                     rangingStationsDeviceDriver = (RangingStationsDeviceDriver) device.getDeviceDriver();
                     ISysParamService paramService = SpringContextHolder.getBean(ISysParamService.class);
@@ -2203,7 +2225,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
             logDto.setLog_level(4);
             luceneExecuteLogService.deviceExecuteLog(logDto);
         } else if (phase == 0x72) {
-            //车辆角度
+            //车辆角
             angle = ikey;
             LuceneLogDto logDto = LuceneLogDto.builder()
                     .device_code(this.getDeviceCode())