root/jinbao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add:新增日志

Browse Source
This commit is contained in:
tuqiang
2025-08-19 16:23:27 +08:00
parent 00dc8a08f3
commit d3ccb0e398
2 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/TwoNDCSocketConnectionAutoRun.java
View File

@@ -266,9 +266,21 @@ public class TwoNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
e.printStackTrace(); e.printStackTrace();
} }
if (standardAutodoorDeviceDriver.getOpen() == 1 && standardAutodoorDeviceDriver.getToOpen() == 1) { 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()); log.info("下发开门信号值为:{},读取开门信号值为:{}", standardAutodoorDeviceDriver.getToOpen(), standardAutodoorDeviceDriver.getOpen());
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
} else { } 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()); log.info("未下发NDC信号原因: 下发开门信号值为:{},读取开门信号值为:{}", standardAutodoorDeviceDriver.getToOpen(), standardAutodoorDeviceDriver.getToClose());
} }
} }
@@ -307,10 +319,22 @@ public class TwoNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
e.printStackTrace(); e.printStackTrace();
} }
if (standardAutodoorDeviceDriver.getClose() == 1) { 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()); log.info("读取关门信号值为:{}", standardAutodoorDeviceDriver.getClose());
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
standardAutodoorDeviceDriver.writing("to_close", "0"); standardAutodoorDeviceDriver.writing("to_close", "0");
} else { } 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()); log.info("未下发NDC信号原因: 读取关门信号值为:{}", standardAutodoorDeviceDriver.getClose());
} }
} }

1
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/StandardAutodoorDeviceDriver.java
View File

@@ -87,6 +87,7 @@ public class StandardAutodoorDeviceDriver extends AbstractOpcDeviceDriver implem
.device_code(device_code) .device_code(device_code)
.content("下发多个电气信号" + itemMap) .content("下发多个电气信号" + itemMap)
.build(); .build();
logDto.setLog_level(4);
luceneExecuteLogService.deviceExecuteLog(logDto); luceneExecuteLogService.deviceExecuteLog(logDto);
try { try {
this.toDoorCommandControl.control(param,value); this.toDoorCommandControl.control(param,value);