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 ff5f680..54dfdcc 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 @@ -266,9 +266,21 @@ public class TwoNDCSocketConnectionAutoRun extends AbstractAutoRunnable { e.printStackTrace(); } if (standardAutodoorDeviceDriver.getOpen() == 1 && standardAutodoorDeviceDriver.getToOpen() == 1) { + LuceneLogDto logDto = LuceneLogDto.builder() + .device_code(standardAutodoorDeviceDriver.getDevice_code()) + .content("允许agv进入,当前下发开门信号值为:"+standardAutodoorDeviceDriver.getToOpen()+",读取开门信号值为:"+standardAutodoorDeviceDriver.getOpen()) + .build(); + logDto.setLog_level(4); + luceneExecuteLogService.deviceExecuteLog(logDto); log.info("下发开门信号值为:{},读取开门信号值为:{}", standardAutodoorDeviceDriver.getToOpen(), standardAutodoorDeviceDriver.getOpen()); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); } else { + LuceneLogDto logDto = LuceneLogDto.builder() + .device_code(standardAutodoorDeviceDriver.getDevice_code()) + .content("不允许agv进入,当前下发开门信号值为:"+standardAutodoorDeviceDriver.getToOpen()+",读取开门信号值为:"+standardAutodoorDeviceDriver.getOpen()) + .build(); + logDto.setLog_level(4); + luceneExecuteLogService.deviceExecuteLog(logDto); log.info("未下发NDC信号原因: 下发开门信号值为:{},读取开门信号值为:{}", standardAutodoorDeviceDriver.getToOpen(), standardAutodoorDeviceDriver.getToClose()); } } @@ -307,10 +319,22 @@ public class TwoNDCSocketConnectionAutoRun extends AbstractAutoRunnable { e.printStackTrace(); } if (standardAutodoorDeviceDriver.getClose() == 1) { + LuceneLogDto logDto = LuceneLogDto.builder() + .device_code(standardAutodoorDeviceDriver.getDevice_code()) + .content("允许agv离开,读取关门信号值为:"+standardAutodoorDeviceDriver.getClose()) + .build(); + logDto.setLog_level(4); + luceneExecuteLogService.deviceExecuteLog(logDto); log.info("读取关门信号值为:{}", standardAutodoorDeviceDriver.getClose()); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); standardAutodoorDeviceDriver.writing("to_close", "0"); } else { + LuceneLogDto logDto = LuceneLogDto.builder() + .device_code(standardAutodoorDeviceDriver.getDevice_code()) + .content("不允许agv离开,读取关门信号值为:"+standardAutodoorDeviceDriver.getClose()) + .build(); + logDto.setLog_level(4); + luceneExecuteLogService.deviceExecuteLog(logDto); log.info("未下发NDC信号原因: 读取关门信号值为:{}", standardAutodoorDeviceDriver.getClose()); } } 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 a8d8478..6480c3f 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);