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

rev:优化测试出现的问题

Browse Source
This commit is contained in:
tuqiang
2024-07-04 18:39:47 +08:00
parent 54b9140e64
commit c95dc50c49
9 changed files with 573 additions and 627 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -252,10 +252,10 @@ public class TwoNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
e.printStackTrace(); e.printStackTrace();
} }
if (standardAutodoorDeviceDriver.getOpen() == 1 && standardAutodoorDeviceDriver.getToOpen() == 1) { if (standardAutodoorDeviceDriver.getOpen() == 1 && standardAutodoorDeviceDriver.getToOpen() == 1) {
log.info("下发开门信号值为:{},下发关门信号值为:{}", standardAutodoorDeviceDriver.getToOpen(), standardAutodoorDeviceDriver.getToClose()); log.info("下发开门信号值为:{},读取开门信号值为:{}", standardAutodoorDeviceDriver.getToOpen(), standardAutodoorDeviceDriver.getOpen());
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
} else { } else {
log.info("未下发NDC信号原因: 下发开门信号值为:{},下发关门信号值为:{}", standardAutodoorDeviceDriver.getToOpen(), standardAutodoorDeviceDriver.getToClose()); log.info("未下发NDC信号原因: 下发开门信号值为:{},读取开门信号值为:{}", standardAutodoorDeviceDriver.getToOpen(), standardAutodoorDeviceDriver.getToClose());
} }
} }
// } // }

247
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java
View File

@@ -131,12 +131,6 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
// message = "该指令号未找到对应指令:" + ikey; // message = "该指令号未找到对应指令:" + ikey;
// logServer.deviceExecuteLog(this.device_code, "", "", "该指令号未找到对应指令:" + ikey); // logServer.deviceExecuteLog(this.device_code, "", "", "该指令号未找到对应指令:" + ikey);
// return; // return;
LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code)
.content("当前指令号为：" + inst.getInstruction_code())
.build();
logDto.setLog_level(4);
luceneExecuteLogService.deviceExecuteLog(logDto);
task = taskService.findByTaskCode(inst.getTask_code()); task = taskService.findByTaskCode(inst.getTask_code());
} else { } else {
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
@@ -194,12 +188,6 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
} }
inst.setCarno(String.valueOf(carno)); inst.setCarno(String.valueOf(carno));
instructionService.update(inst); instructionService.update(inst);
LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code)
.content("agvphase：" + "反馈:" + data)
.build();
logDto.setLog_level(4);
luceneExecuteLogService.deviceExecuteLog(logDto);
} }
//到达取货点 //到达取货点
//(Itype=1/2/3,需要WCS反馈Phase) //(Itype=1/2/3,需要WCS反馈Phase)
@@ -257,7 +245,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
log.info("当前任务号{},创建任务号{}", task.getTask_code(), task_code); log.info("当前任务号{},创建任务号{}", task.getTask_code(), task_code);
if (StrUtil.isEmpty(task_code) || !task_code.equals(task.getTask_code())) { if (StrUtil.isEmpty(task_code) || !task_code.equals(task.getTask_code())) {
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("任务号为空") .content("任务号为空")
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -265,7 +253,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
} else { } else {
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -276,7 +264,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
message = "等待LMS系统进行确认允许取货,设备号:" + device_code + ",指令号:" + ikey; message = "等待LMS系统进行确认允许取货,设备号:" + device_code + ",指令号:" + ikey;
logServer.deviceExecuteLog(this.device_code, "", "", "等待LMS系统进行确认允许取货,设备号" + device.getDevice_code() + ",指令号" + ikey); logServer.deviceExecuteLog(this.device_code, "", "", "等待LMS系统进行确认允许取货,设备号" + device.getDevice_code() + ",指令号" + ikey);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("等待LMS系统进行确认允许取货,设备号" + device.getDevice_code() + ",指令号" + ikey) .content("等待LMS系统进行确认允许取货,设备号" + device.getDevice_code() + ",指令号" + ikey)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -285,7 +273,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
} else { } else {
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -293,7 +281,6 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
} }
} else if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { } else if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) {
standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) device.getDeviceDriver(); standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) device.getDeviceDriver();
try { try {
standardInspectSiteDeviceDriver.writing(1); standardInspectSiteDeviceDriver.writing(1);
} catch (Exception e) { } catch (Exception e) {
@@ -303,17 +290,15 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
&& standardInspectSiteDeviceDriver.getError() == 0)) { && standardInspectSiteDeviceDriver.getError() == 0)) {
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
luceneExecuteLogService.deviceExecuteLog(logDto); luceneExecuteLogService.deviceExecuteLog(logDto);
} else { } else {
message = "设备号:" + device_code + "光电信号:" + standardInspectSiteDeviceDriver.getMove() + ",动作信号:" + standardInspectSiteDeviceDriver.getAction() + "报警信号:" + standardInspectSiteDeviceDriver.getError() + ",指令号:" + ikey + "不满足取货条件"; 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() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content(message) .content(message)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -330,16 +315,16 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
if ((manipulatorAgvStationDeviceDriver.getAction() == 1)) { if ((manipulatorAgvStationDeviceDriver.getAction() == 1)) {
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
luceneExecuteLogService.deviceExecuteLog(logDto); luceneExecuteLogService.deviceExecuteLog(logDto);
} else { } else {
message = "设备号:" + device_code + ",动作信号:" + manipulatorAgvStationDeviceDriver.getAction() + "报警信号:" + ",指令号:" + ikey + "不满足取货条件"; message = "设备号:" + device_code + ",动作信号:" + manipulatorAgvStationDeviceDriver.getAction() + "行架不允许取货条件";
log.info("设备{}，动作信号{} ,不满足取货条件,指令号{}", device_code, manipulatorAgvStationDeviceDriver.getAction(), ikey); log.info("设备{}，动作信号{} ,不满足取货条件,指令号{}", device_code, manipulatorAgvStationDeviceDriver.getAction(), ikey);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content(message) .content(message)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -355,17 +340,15 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
if (hongXiangStationDeviceDriver.getMove() > 0) { if (hongXiangStationDeviceDriver.getMove() > 0) {
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
luceneExecuteLogService.deviceExecuteLog(logDto); luceneExecuteLogService.deviceExecuteLog(logDto);
} else { } else {
message = "设备号:" + device_code + "光电信号:" + hongXiangStationDeviceDriver.getMove() + ",动作信号:" + hongXiangStationDeviceDriver.getAction() + "报警信号:" + hongXiangStationDeviceDriver.getError() + ",指令号:" + ikey + "不满足取货条件"; message = "设备号:" + device_code + "光电信号:" + hongXiangStationDeviceDriver.getMove() + "无货不满足取货条件";
log.info("设备{}当前光电信号{}，动作信号{} ,错误信号{}，不满足取货条件,指令号{}", device_code, hongXiangStationDeviceDriver.getMove(), hongXiangStationDeviceDriver.getAction()
, hongXiangStationDeviceDriver.getError(), ikey);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content(message) .content(message)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -382,17 +365,15 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
&& paperTubePickSiteDeviceDriver.getError() == 0 && paperTubePickSiteDeviceDriver.getMode() == 2) { && paperTubePickSiteDeviceDriver.getError() == 0 && paperTubePickSiteDeviceDriver.getMode() == 2) {
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
luceneExecuteLogService.deviceExecuteLog(logDto); luceneExecuteLogService.deviceExecuteLog(logDto);
} else { } else {
message = "设备号:" + device_code + ",动作信号:" + paperTubePickSiteDeviceDriver.getAction() + "报警信号:" + paperTubePickSiteDeviceDriver.getError() + ",指令号:" + ikey + "不满足取货条件"; message = "设备号:" + device_code + ",动作信号:" + paperTubePickSiteDeviceDriver.getAction() + "报警信号:" + paperTubePickSiteDeviceDriver.getError() + ",指令号:" + ikey + "不满足取货条件";
log.info("设备{}当前光电信号{}，动作信号{} ,错误信号{},设备状态{}，不满足取货条件,指令号{}", device_code, paperTubePickSiteDeviceDriver.getMove(), paperTubePickSiteDeviceDriver.getAction()
, paperTubePickSiteDeviceDriver.getError(), paperTubePickSiteDeviceDriver.getMode(), ikey);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content(message) .content(message)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -465,7 +446,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
wasteFoilWeighingStationDriver.writing(map); wasteFoilWeighingStationDriver.writing(map);
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -475,10 +456,8 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
} }
} else { } else {
message = "设备号:" + device_code + "光电信号:" + wasteFoilWeighingStationDriver.getMove() + ",动作信号:" + wasteFoilWeighingStationDriver.getAction() + "报警信号:" + wasteFoilWeighingStationDriver.getError() + ",指令号:" + ikey + "不满足取货条件"; message = "设备号:" + device_code + "光电信号:" + wasteFoilWeighingStationDriver.getMove() + ",动作信号:" + wasteFoilWeighingStationDriver.getAction() + "报警信号:" + wasteFoilWeighingStationDriver.getError() + ",指令号:" + ikey + "不满足取货条件";
log.info("设备{}当前光电信号{}，动作信号{} ,错误信号{},设备状态{}，不满足取货条件,指令号{}", device_code, wasteFoilWeighingStationDriver.getMove(), wasteFoilWeighingStationDriver.getAction()
, wasteFoilWeighingStationDriver.getError(), wasteFoilWeighingStationDriver.getMode(), ikey);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content(message) .content(message)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -487,7 +466,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
} else { } else {
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -503,7 +482,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
} }
if (agvaddr < 1) { if (agvaddr < 1) {
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agv地址参数有误,phase:" + phase) .content("agv地址参数有误,phase:" + phase)
.build(); .build();
logDto.setLog_level(2); logDto.setLog_level(2);
@@ -529,7 +508,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
if (ObjectUtil.isEmpty(device_code)) { if (ObjectUtil.isEmpty(device_code)) {
log.info(agvaddr + "对应设备号为空!"); log.info(agvaddr + "对应设备号为空!");
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("对应设备号为空" + device_code) .content("对应设备号为空" + device_code)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -553,7 +532,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
standardOrdinarySiteDeviceDriver.setOption(0); standardOrdinarySiteDeviceDriver.setOption(0);
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -561,7 +540,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
} else { } else {
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -573,12 +552,12 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
&& StrUtil.equals("true", standardOrdinarySiteDeviceDriver.getDevice().getExtraValue().get("feedbackToLms").toString())) { && StrUtil.equals("true", standardOrdinarySiteDeviceDriver.getDevice().getExtraValue().get("feedbackToLms").toString())) {
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
jsonObject.put("task_code", task_code); jsonObject.put("task_code", task_code);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto1 = LuceneLogDto.builder()
.device_code(standardOrdinarySiteDeviceDriver.getDevice_code()) .device_code(standardOrdinarySiteDeviceDriver.getDevice_code())
.content("取货完成反馈:" + jsonObject.toJSONString() + ";设备:" + standardOrdinarySiteDeviceDriver.getDeviceCode()) .content("取货完成反馈:" + jsonObject.toJSONString() + ";设备:" + standardOrdinarySiteDeviceDriver.getDeviceCode())
.build(); .build();
logDto.setLog_level(4); logDto1.setLog_level(4);
luceneExecuteLogService.deviceExecuteLog(logDto); luceneExecuteLogService.deviceExecuteLog(logDto1);
acsToWmsService.actionFinishRequest2(jsonObject); acsToWmsService.actionFinishRequest2(jsonObject);
} }
}); });
@@ -592,7 +571,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
} }
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -622,17 +601,15 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
if (hongXiangStationDeviceDriver.getMove() > 0) { if (hongXiangStationDeviceDriver.getMove() > 0) {
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
luceneExecuteLogService.deviceExecuteLog(logDto); luceneExecuteLogService.deviceExecuteLog(logDto);
} else { } else {
message = "设备号:" + device_code + "光电信号:" + hongXiangStationDeviceDriver.getMove() + ",动作信号:" + hongXiangStationDeviceDriver.getAction() + "报警信号:" + hongXiangStationDeviceDriver.getError() + ",指令号:" + ikey + "不满足取货条件"; message = "设备号:" + device_code + "光电信号:" + hongXiangStationDeviceDriver.getMove() + ",指令号:" + ikey + "不满足取货条件";
log.info("设备{}当前光电信号{}，动作信号{} ,错误信号{}，不满足取货条件,指令号{}", device_code, hongXiangStationDeviceDriver.getMove(), hongXiangStationDeviceDriver.getAction()
, hongXiangStationDeviceDriver.getError(), ikey);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content(message) .content(message)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -649,17 +626,15 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
&& paperTubePickSiteDeviceDriver.getError() == 0 && paperTubePickSiteDeviceDriver.getMode() == 2) { && paperTubePickSiteDeviceDriver.getError() == 0 && paperTubePickSiteDeviceDriver.getMode() == 2) {
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
luceneExecuteLogService.deviceExecuteLog(logDto); luceneExecuteLogService.deviceExecuteLog(logDto);
} else { } else {
message = "设备号:" + device_code + ",动作信号:" + paperTubePickSiteDeviceDriver.getAction() + "报警信号:" + paperTubePickSiteDeviceDriver.getError() + ",指令号:" + ikey + "不满足取货条件"; message = "设备号:" + device_code + ",动作信号:" + paperTubePickSiteDeviceDriver.getAction() + "报警信号:" + paperTubePickSiteDeviceDriver.getError() + ",指令号:" + ikey + "不满足取货条件";
log.info("设备{}当前光电信号{}，动作信号{} ,错误信号{},设备状态{}，不满足取货完成反馈,指令号{}", device_code, paperTubePickSiteDeviceDriver.getMove(), paperTubePickSiteDeviceDriver.getAction()
, paperTubePickSiteDeviceDriver.getError(), paperTubePickSiteDeviceDriver.getMode(), ikey);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content(message) .content(message)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -676,17 +651,15 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
if ((standardInspectSiteDeviceDriver.getMove() != 1 && standardInspectSiteDeviceDriver.getAction() == 1 && standardInspectSiteDeviceDriver.getError() == 0)) { if ((standardInspectSiteDeviceDriver.getMove() != 1 && standardInspectSiteDeviceDriver.getAction() == 1 && standardInspectSiteDeviceDriver.getError() == 0)) {
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
luceneExecuteLogService.deviceExecuteLog(logDto); luceneExecuteLogService.deviceExecuteLog(logDto);
} else { } else {
message = "设备号:" + device_code + "光电信号:" + standardInspectSiteDeviceDriver.getMove() + ",动作信号:" + standardInspectSiteDeviceDriver.getAction() + "报警信号:" + standardInspectSiteDeviceDriver.getError() + ",指令号:" + ikey + "不满足取货条件"; 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() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content(message) .content(message)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -702,7 +675,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
wasteFoilWeighingStationDriver.writing(map); wasteFoilWeighingStationDriver.writing(map);
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -712,10 +685,8 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
} }
} else { } else {
message = "设备号:" + device_code + "光电信号:" + wasteFoilWeighingStationDriver.getMove() + ",动作信号:" + wasteFoilWeighingStationDriver.getAction() + "报警信号:" + wasteFoilWeighingStationDriver.getError() + ",指令号:" + ikey + "不满足取货条件"; message = "设备号:" + device_code + "光电信号:" + wasteFoilWeighingStationDriver.getMove() + ",动作信号:" + wasteFoilWeighingStationDriver.getAction() + "报警信号:" + wasteFoilWeighingStationDriver.getError() + ",指令号:" + ikey + "不满足取货条件";
log.info("设备{}当前光电信号{}，动作信号{} ,错误信号{},设备状态{}，不满足取货条件,指令号{}", device_code, wasteFoilWeighingStationDriver.getMove(), wasteFoilWeighingStationDriver.getAction()
, wasteFoilWeighingStationDriver.getError(), wasteFoilWeighingStationDriver.getMode(), ikey);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content(message) .content(message)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -724,7 +695,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
} else { } else {
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -774,7 +745,6 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
} }
String agv_inst_type = inst.getAgv_inst_type(); String agv_inst_type = inst.getAgv_inst_type();
if (StrUtil.equals(agv_inst_type, CommonFinalParam.ONE) || StrUtil.equals(agv_inst_type, "3")) {
if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) {
standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) device.getDeviceDriver(); standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) device.getDeviceDriver();
standardOrdinarySiteDeviceDriver.setAgvphase(phase); standardOrdinarySiteDeviceDriver.setAgvphase(phase);
@@ -786,7 +756,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
log.info("当前任务号{},创建任务号{}", task.getTask_code(), task_code); log.info("当前任务号{},创建任务号{}", task.getTask_code(), task_code);
if (StrUtil.isEmpty(task_code) || !task_code.equals(task.getTask_code())) { if (StrUtil.isEmpty(task_code) || !task_code.equals(task.getTask_code())) {
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("任务号为空!") .content("任务号为空!")
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -794,7 +764,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
} else { } else {
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -805,7 +775,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
message = "等待LMS系统进行确认允许取货,设备号:" + device_code + ",指令号:" + ikey; message = "等待LMS系统进行确认允许取货,设备号:" + device_code + ",指令号:" + ikey;
logServer.deviceExecuteLog(this.device_code, "", "", "等待LMS系统进行确认允许取货,设备号" + device.getDevice_code()); logServer.deviceExecuteLog(this.device_code, "", "", "等待LMS系统进行确认允许取货,设备号" + device.getDevice_code());
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content(message) .content(message)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -814,7 +784,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
} else { } else {
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -831,16 +801,15 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
if ((manipulatorAgvStationDeviceDriver.getAction() == 1)) { if ((manipulatorAgvStationDeviceDriver.getAction() == 1)) {
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
luceneExecuteLogService.deviceExecuteLog(logDto); luceneExecuteLogService.deviceExecuteLog(logDto);
} else { } else {
message = "设备号:" + device_code + ",动作信号:" + manipulatorAgvStationDeviceDriver.getAction() + "报警信号:" + ",指令号:" + ikey + "不满足取货条件"; message = "设备号:" + device_code + ",动作信号:" + manipulatorAgvStationDeviceDriver.getAction() + "报警信号:" + ",指令号:" + ikey + "不满足取货条件";
log.info("设备{}，动作信号{} ,不满足取货条件,指令号{}", device_code, manipulatorAgvStationDeviceDriver.getAction(), ikey);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content(manipulatorAgvStationDeviceDriver.getDevice_code() + "动作信号不为1") .content(manipulatorAgvStationDeviceDriver.getDevice_code() + "动作信号不为1")
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -857,17 +826,15 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
&& paperTubePickSiteDeviceDriver.getError() == 0 && paperTubePickSiteDeviceDriver.getMode() == 2) { && paperTubePickSiteDeviceDriver.getError() == 0 && paperTubePickSiteDeviceDriver.getMode() == 2) {
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
luceneExecuteLogService.deviceExecuteLog(logDto); luceneExecuteLogService.deviceExecuteLog(logDto);
} else { } else {
message = "设备号:" + device_code + ",动作信号:" + paperTubePickSiteDeviceDriver.getAction() + "报警信号:" + paperTubePickSiteDeviceDriver.getError() + ",指令号:" + ikey + "不满足取货条件"; message = "设备号:" + device_code + ",动作信号:" + paperTubePickSiteDeviceDriver.getAction() + "报警信号:" + paperTubePickSiteDeviceDriver.getError() + ",指令号:" + ikey + "不满足取货条件";
log.info("设备{}当前光电信号{}，动作信号{} ,错误信号{},设备状态{}，不满足取货条件,指令号{}", device_code, paperTubePickSiteDeviceDriver.getMove(), paperTubePickSiteDeviceDriver.getAction()
, paperTubePickSiteDeviceDriver.getError(), paperTubePickSiteDeviceDriver.getMode(), ikey);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content(message) .content(message)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -883,17 +850,15 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
if (hongXiangStationDeviceDriver.getMove() > 0) { if (hongXiangStationDeviceDriver.getMove() > 0) {
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
luceneExecuteLogService.deviceExecuteLog(logDto); luceneExecuteLogService.deviceExecuteLog(logDto);
} else { } else {
message = "设备号:" + device_code + "光电信号:" + hongXiangStationDeviceDriver.getMove() + ",动作信号:" + hongXiangStationDeviceDriver.getAction() + "报警信号:" + hongXiangStationDeviceDriver.getError() + ",指令号:" + ikey + "不满足取货条件"; message = "设备号:" + device_code + "光电信号:" + hongXiangStationDeviceDriver.getMove() + ",指令号:" + ikey + "不满足取货条件";
log.info("设备{}当前光电信号{}，动作信号{} ,错误信号{}，不满足取货条件,指令号{}", device_code, hongXiangStationDeviceDriver.getMove(), hongXiangStationDeviceDriver.getAction()
, hongXiangStationDeviceDriver.getError(), ikey);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content(message) .content(message)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -910,17 +875,15 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
if ((standardInspectSiteDeviceDriver.getMove() == 1 && standardInspectSiteDeviceDriver.getAction() == 1 && standardInspectSiteDeviceDriver.getError() == 0)) { if ((standardInspectSiteDeviceDriver.getMove() == 1 && standardInspectSiteDeviceDriver.getAction() == 1 && standardInspectSiteDeviceDriver.getError() == 0)) {
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
luceneExecuteLogService.deviceExecuteLog(logDto); luceneExecuteLogService.deviceExecuteLog(logDto);
} else { } else {
message = "设备号:" + device_code + "光电信号:" + standardInspectSiteDeviceDriver.getMove() + ",动作信号:" + standardInspectSiteDeviceDriver.getAction() + "报警信号:" + standardInspectSiteDeviceDriver.getError() + ",指令号:" + ikey + "不满足取货条件"; 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() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content(message) .content(message)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -986,7 +949,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
logDto.setLog_level(4); logDto.setLog_level(4);
luceneExecuteLogService.deviceExecuteLog(logDto); luceneExecuteLogService.deviceExecuteLog(logDto);
} }
}
} }
// 取货完毕 // 取货完毕
//(Itype=1、3,需要WCS反馈) //(Itype=1、3,需要WCS反馈)
@@ -1028,7 +991,6 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
return; return;
} }
String agv_inst_type = inst.getAgv_inst_type(); String agv_inst_type = inst.getAgv_inst_type();
if (StrUtil.equals(agv_inst_type, CommonFinalParam.ONE) || StrUtil.equals(agv_inst_type, "3")) {
if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) {
standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) device.getDeviceDriver(); standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) device.getDeviceDriver();
if (ObjectUtil.isNotEmpty(standardOrdinarySiteDeviceDriver.getDevice().getExtraValue().get("wait")) if (ObjectUtil.isNotEmpty(standardOrdinarySiteDeviceDriver.getDevice().getExtraValue().get("wait"))
@@ -1037,7 +999,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
} else { } else {
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -1048,12 +1010,11 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
standardOrdinarySiteDeviceDriver.setIndex(index); standardOrdinarySiteDeviceDriver.setIndex(index);
standardOrdinarySiteDeviceDriver.setInst(inst); standardOrdinarySiteDeviceDriver.setInst(inst);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
luceneExecuteLogService.deviceExecuteLog(logDto); luceneExecuteLogService.deviceExecuteLog(logDto);
} else if (device.getDeviceDriver() instanceof HongXiangStationDeviceDriver) { } else if (device.getDeviceDriver() instanceof HongXiangStationDeviceDriver) {
hongXiangStationDeviceDriver = (HongXiangStationDeviceDriver) device.getDeviceDriver(); hongXiangStationDeviceDriver = (HongXiangStationDeviceDriver) device.getDeviceDriver();
try { try {
@@ -1064,17 +1025,15 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
if (hongXiangStationDeviceDriver.getMove() == 0) { if (hongXiangStationDeviceDriver.getMove() == 0) {
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
luceneExecuteLogService.deviceExecuteLog(logDto); luceneExecuteLogService.deviceExecuteLog(logDto);
} else { } else {
message = "设备号:" + device_code + "光电信号:" + hongXiangStationDeviceDriver.getMove() + ",动作信号:" + hongXiangStationDeviceDriver.getAction() + "报警信号:" + hongXiangStationDeviceDriver.getError() + ",指令号:" + ikey + "不满足取货条件"; message = "设备号:" + device_code + "光电信号:" + hongXiangStationDeviceDriver.getMove() + ",指令号:" + ikey + "不满足取货条件";
log.info("设备{}当前光电信号{}，动作信号{} ,错误信号{}，不满足取货条件,指令号{}", device_code, hongXiangStationDeviceDriver.getMove(), hongXiangStationDeviceDriver.getAction()
, hongXiangStationDeviceDriver.getError(), ikey);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content(message) .content(message)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -1082,7 +1041,6 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
} }
} else if (device.getDeviceDriver() instanceof ManipulatorAgvStationDeviceDriver) { } else if (device.getDeviceDriver() instanceof ManipulatorAgvStationDeviceDriver) {
manipulatorAgvStationDeviceDriver = (ManipulatorAgvStationDeviceDriver) device.getDeviceDriver(); manipulatorAgvStationDeviceDriver = (ManipulatorAgvStationDeviceDriver) device.getDeviceDriver();
try { try {
manipulatorAgvStationDeviceDriver.writing(3); manipulatorAgvStationDeviceDriver.writing(3);
} catch (Exception e) { } catch (Exception e) {
@@ -1090,7 +1048,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
} }
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -1106,17 +1064,15 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
&& paperTubePickSiteDeviceDriver.getError() == 0 && paperTubePickSiteDeviceDriver.getMode() == 2) { && paperTubePickSiteDeviceDriver.getError() == 0 && paperTubePickSiteDeviceDriver.getMode() == 2) {
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
luceneExecuteLogService.deviceExecuteLog(logDto); luceneExecuteLogService.deviceExecuteLog(logDto);
} else { } else {
message = "设备号:" + device_code + ",动作信号:" + paperTubePickSiteDeviceDriver.getAction() + "报警信号:" + paperTubePickSiteDeviceDriver.getError() + ",指令号:" + ikey + "不满足取货条件"; message = "设备号:" + device_code + ",动作信号:" + paperTubePickSiteDeviceDriver.getAction() + "报警信号:" + paperTubePickSiteDeviceDriver.getError() + ",指令号:" + ikey + "不满足取货条件";
log.info("设备{}当前光电信号{}，动作信号{} ,错误信号{}，不满足取货条件,指令号{}", device_code, paperTubePickSiteDeviceDriver.getMove(), paperTubePickSiteDeviceDriver.getAction()
, paperTubePickSiteDeviceDriver.getError(), ikey);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content(message) .content(message)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -1133,17 +1089,15 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
if ((standardInspectSiteDeviceDriver.getMove() == 1 && standardInspectSiteDeviceDriver.getAction() == 1 && standardInspectSiteDeviceDriver.getError() == 0)) { if ((standardInspectSiteDeviceDriver.getMove() == 1 && standardInspectSiteDeviceDriver.getAction() == 1 && standardInspectSiteDeviceDriver.getError() == 0)) {
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
luceneExecuteLogService.deviceExecuteLog(logDto); luceneExecuteLogService.deviceExecuteLog(logDto);
} else { } else {
message = "设备号:" + device_code + "光电信号:" + standardInspectSiteDeviceDriver.getMove() + ",动作信号:" + standardInspectSiteDeviceDriver.getAction() + "报警信号:" + standardInspectSiteDeviceDriver.getError() + ",指令号:" + ikey + "不满足取货条件"; 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() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content(message) .content(message)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -1152,13 +1106,13 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
} else { } else {
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
luceneExecuteLogService.deviceExecuteLog(logDto); luceneExecuteLogService.deviceExecuteLog(logDto);
} }
}
} }
//（Itype=1,上传称重数据） //（Itype=1,上传称重数据）
else if (phase == 0x64) { else if (phase == 0x64) {
@@ -1239,7 +1193,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -1259,7 +1213,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
&& paperTubePickSiteDeviceDriver.getError() == 0 && paperTubePickSiteDeviceDriver.getMode() == 2) { && paperTubePickSiteDeviceDriver.getError() == 0 && paperTubePickSiteDeviceDriver.getMode() == 2) {
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -1269,7 +1223,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
log.info("设备{}当前光电信号{}，动作信号{} ,错误信号{},设备状态{}，不满足放货条件,指令号{}", device_code, paperTubePickSiteDeviceDriver.getMove(), paperTubePickSiteDeviceDriver.getAction() log.info("设备{}当前光电信号{}，动作信号{} ,错误信号{},设备状态{}，不满足放货条件,指令号{}", device_code, paperTubePickSiteDeviceDriver.getMove(), paperTubePickSiteDeviceDriver.getAction()
, paperTubePickSiteDeviceDriver.getError(), paperTubePickSiteDeviceDriver.getMode(), ikey); , paperTubePickSiteDeviceDriver.getError(), paperTubePickSiteDeviceDriver.getMode(), ikey);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content(message) .content(message)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -1286,7 +1240,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
if ((manipulatorAgvStationDeviceDriver.getAction() == 1)) { if ((manipulatorAgvStationDeviceDriver.getAction() == 1)) {
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -1295,7 +1249,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
message = "设备号:" + device_code + ",动作信号:" + manipulatorAgvStationDeviceDriver.getAction() + "报警信号:" + ",指令号:" + ikey + "不满足取货条件"; message = "设备号:" + device_code + ",动作信号:" + manipulatorAgvStationDeviceDriver.getAction() + "报警信号:" + ",指令号:" + ikey + "不满足取货条件";
log.info("设备{}，动作信号{} ,不满足取货条件,指令号{}", device_code, manipulatorAgvStationDeviceDriver.getAction(), ikey); log.info("设备{}，动作信号{} ,不满足取货条件,指令号{}", device_code, manipulatorAgvStationDeviceDriver.getAction(), ikey);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content(message) .content(message)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -1311,7 +1265,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
if (hongXiangStationDeviceDriver.getMove() == 0) { if (hongXiangStationDeviceDriver.getMove() == 0) {
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -1321,7 +1275,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
log.info("设备{}当前光电信号{}，动作信号{} ,错误信号{}，不满足取货条件,指令号{}", device_code, hongXiangStationDeviceDriver.getMove(), hongXiangStationDeviceDriver.getAction() log.info("设备{}当前光电信号{}，动作信号{} ,错误信号{}，不满足取货条件,指令号{}", device_code, hongXiangStationDeviceDriver.getMove(), hongXiangStationDeviceDriver.getAction()
, hongXiangStationDeviceDriver.getError(), ikey); , hongXiangStationDeviceDriver.getError(), ikey);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content(message) .content(message)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -1333,7 +1287,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
if ((standardInspectSiteDeviceDriver.getMove() == 0 && standardInspectSiteDeviceDriver.getAction() == 1 && standardInspectSiteDeviceDriver.getError() == 0)) { if ((standardInspectSiteDeviceDriver.getMove() == 0 && standardInspectSiteDeviceDriver.getAction() == 1 && standardInspectSiteDeviceDriver.getError() == 0)) {
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -1343,7 +1297,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
log.info("设备{}当前光电信号{}，动作信号{} ,报警信号{}，不满足放货条件,指令号{}", device_code, standardInspectSiteDeviceDriver.getMove(), standardInspectSiteDeviceDriver.getAction() log.info("设备{}当前光电信号{}，动作信号{} ,报警信号{}，不满足放货条件,指令号{}", device_code, standardInspectSiteDeviceDriver.getMove(), standardInspectSiteDeviceDriver.getAction()
, standardInspectSiteDeviceDriver.getError(), ikey); , standardInspectSiteDeviceDriver.getError(), ikey);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content(message) .content(message)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -1410,7 +1364,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
wasteFoilWeighingStationDriver.writing(map); wasteFoilWeighingStationDriver.writing(map);
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -1423,7 +1377,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
log.info("设备{}当前光电信号{}，动作信号{} ,错误信号{},设备状态{}，不满足取货条件,指令号{}", device_code, wasteFoilWeighingStationDriver.getMove(), wasteFoilWeighingStationDriver.getAction() log.info("设备{}当前光电信号{}，动作信号{} ,错误信号{},设备状态{}，不满足取货条件,指令号{}", device_code, wasteFoilWeighingStationDriver.getMove(), wasteFoilWeighingStationDriver.getAction()
, wasteFoilWeighingStationDriver.getError(), wasteFoilWeighingStationDriver.getMode(), ikey); , wasteFoilWeighingStationDriver.getError(), wasteFoilWeighingStationDriver.getMode(), ikey);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content(message) .content(message)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -1432,7 +1386,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
} else { } else {
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -1496,7 +1450,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
// } // }
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -1512,7 +1466,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
} }
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -1527,7 +1481,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
if (hongXiangStationDeviceDriver.getMove() > 0) { if (hongXiangStationDeviceDriver.getMove() > 0) {
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -1537,7 +1491,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
log.info("设备{}当前光电信号{}，动作信号{} ,错误信号{}，不满足放货完成反馈,指令号{}", device_code, hongXiangStationDeviceDriver.getMove(), hongXiangStationDeviceDriver.getAction() log.info("设备{}当前光电信号{}，动作信号{} ,错误信号{}，不满足放货完成反馈,指令号{}", device_code, hongXiangStationDeviceDriver.getMove(), hongXiangStationDeviceDriver.getAction()
, hongXiangStationDeviceDriver.getError(), ikey); , hongXiangStationDeviceDriver.getError(), ikey);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content(message) .content(message)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -1570,7 +1524,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
&& paperTubePickSiteDeviceDriver.getError() == 0 && paperTubePickSiteDeviceDriver.getMode() == 2) { && paperTubePickSiteDeviceDriver.getError() == 0 && paperTubePickSiteDeviceDriver.getMode() == 2) {
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -1581,7 +1535,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
log.info("设备{}当前光电信号{}，动作信号{} ,错误信号{},设备状态{}，不满足取货条件,指令号{}", device_code, paperTubePickSiteDeviceDriver.getMove(), paperTubePickSiteDeviceDriver.getAction() log.info("设备{}当前光电信号{}，动作信号{} ,错误信号{},设备状态{}，不满足取货条件,指令号{}", device_code, paperTubePickSiteDeviceDriver.getMove(), paperTubePickSiteDeviceDriver.getAction()
, paperTubePickSiteDeviceDriver.getError(), paperTubePickSiteDeviceDriver.getMode(), ikey); , paperTubePickSiteDeviceDriver.getError(), paperTubePickSiteDeviceDriver.getMode(), ikey);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content(message) .content(message)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -1593,7 +1547,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
if ((standardInspectSiteDeviceDriver.getMove() == 1)) { if ((standardInspectSiteDeviceDriver.getMove() == 1)) {
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -1609,7 +1563,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
wasteFoilWeighingStationDriver.writing(map); wasteFoilWeighingStationDriver.writing(map);
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -1622,7 +1576,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
log.info("设备{}当前光电信号{}，动作信号{} ,错误信号{},设备状态{}，不满足取货条件,指令号{}", device_code, wasteFoilWeighingStationDriver.getMove(), wasteFoilWeighingStationDriver.getAction() log.info("设备{}当前光电信号{}，动作信号{} ,错误信号{},设备状态{}，不满足取货条件,指令号{}", device_code, wasteFoilWeighingStationDriver.getMove(), wasteFoilWeighingStationDriver.getAction()
, wasteFoilWeighingStationDriver.getError(), wasteFoilWeighingStationDriver.getMode(), ikey); , wasteFoilWeighingStationDriver.getError(), wasteFoilWeighingStationDriver.getMode(), ikey);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content(message) .content(message)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -1631,7 +1585,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
} else { } else {
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -1678,7 +1632,6 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
return; return;
} }
String agv_inst_type = inst.getAgv_inst_type(); String agv_inst_type = inst.getAgv_inst_type();
if (StrUtil.equals(agv_inst_type, CommonFinalParam.ONE) || StrUtil.equals(agv_inst_type, "3")) {
if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) {
// standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) device.getDeviceDriver(); // standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) device.getDeviceDriver();
// if (ObjectUtil.isNotEmpty(standardOrdinarySiteDeviceDriver.getDevice().getExtraValue().get("wait")) // if (ObjectUtil.isNotEmpty(standardOrdinarySiteDeviceDriver.getDevice().getExtraValue().get("wait"))
@@ -1697,7 +1650,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
// } // }
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -1715,7 +1668,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
if ((manipulatorAgvStationDeviceDriver.getAction() == 1)) { if ((manipulatorAgvStationDeviceDriver.getAction() == 1)) {
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -1724,7 +1677,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
message = "设备号:" + device_code + ",动作信号:" + manipulatorAgvStationDeviceDriver.getAction() + "报警信号:" + ",指令号:" + ikey + "不满足取货条件"; message = "设备号:" + device_code + ",动作信号:" + manipulatorAgvStationDeviceDriver.getAction() + "报警信号:" + ",指令号:" + ikey + "不满足取货条件";
log.info("设备{}，动作信号{} ,不满足取货条件,指令号{}", device_code, manipulatorAgvStationDeviceDriver.getAction(), ikey); log.info("设备{}，动作信号{} ,不满足取货条件,指令号{}", device_code, manipulatorAgvStationDeviceDriver.getAction(), ikey);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content(message) .content(message)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -1740,7 +1693,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
if (hongXiangStationDeviceDriver.getMove() == 0) { if (hongXiangStationDeviceDriver.getMove() == 0) {
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -1750,7 +1703,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
log.info("设备{}当前光电信号{}，动作信号{} ,错误信号{}，不满足取货条件,指令号{}", device_code, hongXiangStationDeviceDriver.getMove(), hongXiangStationDeviceDriver.getAction() log.info("设备{}当前光电信号{}，动作信号{} ,错误信号{}，不满足取货条件,指令号{}", device_code, hongXiangStationDeviceDriver.getMove(), hongXiangStationDeviceDriver.getAction()
, hongXiangStationDeviceDriver.getError(), ikey); , hongXiangStationDeviceDriver.getError(), ikey);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content(message) .content(message)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -1767,7 +1720,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
&& paperTubePickSiteDeviceDriver.getError() == 0 && paperTubePickSiteDeviceDriver.getMode() == 2) { && paperTubePickSiteDeviceDriver.getError() == 0 && paperTubePickSiteDeviceDriver.getMode() == 2) {
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -1777,7 +1730,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
log.info("设备{}当前光电信号{}，动作信号{} ,错误信号{}，不满足取货条件,指令号{}", device_code, paperTubePickSiteDeviceDriver.getMove(), paperTubePickSiteDeviceDriver.getAction() log.info("设备{}当前光电信号{}，动作信号{} ,错误信号{}，不满足取货条件,指令号{}", device_code, paperTubePickSiteDeviceDriver.getMove(), paperTubePickSiteDeviceDriver.getAction()
, paperTubePickSiteDeviceDriver.getError(), ikey); , paperTubePickSiteDeviceDriver.getError(), ikey);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content(message) .content(message)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -1843,14 +1796,13 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
}*/ else { }*/ else {
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
luceneExecuteLogService.deviceExecuteLog(logDto); luceneExecuteLogService.deviceExecuteLog(logDto);
} }
} }
}
//放货完成 //放货完成
//（Itype=1、3,需要WCS反馈） //（Itype=1、3,需要WCS反馈）
else if (phase == 0x12) { else if (phase == 0x12) {
@@ -1891,7 +1843,6 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
return; return;
} }
String agv_inst_type = inst.getAgv_inst_type(); String agv_inst_type = inst.getAgv_inst_type();
if (StrUtil.equals(agv_inst_type, CommonFinalParam.ONE) || StrUtil.equals(agv_inst_type, "3")) {
if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) {
// standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) device.getDeviceDriver(); // standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) device.getDeviceDriver();
// if (ObjectUtil.isNotEmpty(standardOrdinarySiteDeviceDriver.getDevice().getExtraValue().get("wait")) // if (ObjectUtil.isNotEmpty(standardOrdinarySiteDeviceDriver.getDevice().getExtraValue().get("wait"))
@@ -1910,7 +1861,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
// } // }
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -1926,7 +1877,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
} }
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -1942,7 +1893,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
&& paperTubePickSiteDeviceDriver.getError() == 0 && paperTubePickSiteDeviceDriver.getMode() == 2) { && paperTubePickSiteDeviceDriver.getError() == 0 && paperTubePickSiteDeviceDriver.getMode() == 2) {
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -1952,7 +1903,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
log.info("设备{}当前光电信号{}，动作信号{} ,错误信号{}，不满足取货条件,指令号{}", device_code, paperTubePickSiteDeviceDriver.getMove(), paperTubePickSiteDeviceDriver.getAction() log.info("设备{}当前光电信号{}，动作信号{} ,错误信号{}，不满足取货条件,指令号{}", device_code, paperTubePickSiteDeviceDriver.getMove(), paperTubePickSiteDeviceDriver.getAction()
, paperTubePickSiteDeviceDriver.getError(), ikey); , paperTubePickSiteDeviceDriver.getError(), ikey);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content(message) .content(message)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -1968,7 +1919,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
if (hongXiangStationDeviceDriver.getMove() > 0) { if (hongXiangStationDeviceDriver.getMove() > 0) {
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -1978,7 +1929,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
log.info("设备{}当前光电信号{}，动作信号{} ,错误信号{}，不满足取货条件,指令号{}", device_code, hongXiangStationDeviceDriver.getMove(), hongXiangStationDeviceDriver.getAction() log.info("设备{}当前光电信号{}，动作信号{} ,错误信号{}，不满足取货条件,指令号{}", device_code, hongXiangStationDeviceDriver.getMove(), hongXiangStationDeviceDriver.getAction()
, hongXiangStationDeviceDriver.getError(), ikey); , hongXiangStationDeviceDriver.getError(), ikey);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content(message) .content(message)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
@@ -1987,14 +1938,13 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
} else { } else {
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(this.getDeviceCode())
.content("agvphase:" + phase + "反馈:" + data) .content("agvphase:" + phase + "反馈:" + data)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
luceneExecuteLogService.deviceExecuteLog(logDto); luceneExecuteLogService.deviceExecuteLog(logDto);
} }
} }
}
//上传AGV电量 //上传AGV电量
else if (phase == 0x70) { else if (phase == 0x70) {
//x坐标 //x坐标
@@ -2136,6 +2086,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
TwoNDCSocketConnectionAutoRun.write(data); TwoNDCSocketConnectionAutoRun.write(data);
} }
} }
} }
@Override @Override

6
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java
View File

@@ -236,11 +236,11 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple
String move = ""; String move = "";
String option = ""; String option = "";
if (this.getOption() == 0) { if (this.getOption() == 0) {
action = LangProcess.msg("universal_actionMessage1"); option = LangProcess.msg("universal_actionMessage1");
} else if (this.getOption() == 1) { } else if (this.getOption() == 1) {
action = LangProcess.msg("universal_actionMessage2"); option = LangProcess.msg("universal_actionMessage2");
} else if (this.getOption() == 2) { } else if (this.getOption() == 2) {
action = LangProcess.msg("universal_actionMessage3"); option = LangProcess.msg("universal_actionMessage3");
} }
if (this.getMode() == 0) { if (this.getMode() == 0) {
mode = LangProcess.msg("universal_off-line"); mode = LangProcess.msg("universal_off-line");

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/rgv/ItemProtocol.java
View File

@@ -128,7 +128,7 @@ ItemProtocol {
list.add(new ItemDto(item_walk_y, "行走列", "DB1.B4")); list.add(new ItemDto(item_walk_y, "行走列", "DB1.B4"));
list.add(new ItemDto(item_error, "报警信号", "DB1.B5")); list.add(new ItemDto(item_error, "报警信号", "DB1.B5"));
list.add(new ItemDto(item_task, "任务号", "DB1.D6")); list.add(new ItemDto(item_task, "任务号", "DB1.D6"));
list.add(new ItemDto(item_barcode, "任务号", "DB1.B7")); list.add(new ItemDto(item_barcode, "气胀轴编号", "DB1.B7"));
return list; return list;
} }

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java
View File

@@ -151,7 +151,7 @@ public interface AcsToWmsService {
HttpResponse applyBlankButtonTask(JSONObject param); HttpResponse applyBlankButtonTask(JSONObject param);
/** /**
* 向lms申请反馈 * RGV工位上有货申请行架任务
* @param param * @param param
* @return * @return
*/ */

37
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java
View File

@@ -347,6 +347,9 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
.header("Authorization", token).body(String.valueOf(data)) .header("Authorization", token).body(String.valueOf(data))
.execute(); .execute();
// //System.out.println(result2); // //System.out.println(result2);
LuceneLogDto luceneLogDto = new LuceneLogDto(4,"feedbackTaskStatusToWms", String.valueOf(result2.getStatus()),
String.valueOf(data), String.valueOf(result2.body()), "ACS向WMS反馈任务状态");
luceneLogService.interfaceExecuteLog(luceneLogDto);
} catch (Exception e) { } catch (Exception e) {
String msg = e.getMessage(); String msg = e.getMessage();
//网络不通 //网络不通
@@ -364,6 +367,9 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
type = "info"; type = "info";
JSONObject jo = JSONObject.parseObject(result2.body()); JSONObject jo = JSONObject.parseObject(result2.body());
log.info("feedbackTaskStatusToWms-----输出参数{}", jo.toString()); log.info("feedbackTaskStatusToWms-----输出参数{}", jo.toString());
LuceneLogDto luceneLogDto = new LuceneLogDto(4,"feedbackTaskStatusToWms", String.valueOf(result2.getStatus()),
String.valueOf(data), String.valueOf(result2.body()), "ACS向WMS反馈任务状态");
luceneLogService.interfaceExecuteLog(luceneLogDto);
return result2; return result2;
} else { } else {
type = "error"; type = "error";
@@ -445,7 +451,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
@Override @Override
public ApplyPlugPullSitResponse applyPlugPullSiteRequest(ApplyPlugPullSiteRequest param) { public ApplyPlugPullSitResponse applyPlugPullSiteRequest(ApplyPlugPullSiteRequest param) {
log.info("向LMS申请反馈,请求参数{}",param); log.info("向lms申请套管工位请求,请求参数{}",param);
String result = ""; String result = "";
try { try {
MDC.put(log_file_type, log_type); MDC.put(log_file_type, log_type);
@@ -455,14 +461,15 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
AddressDto addressDto = addressService.findByCode("applyPlugPullSiteRequest"); AddressDto addressDto = addressService.findByCode("applyPlugPullSiteRequest");
String methods_url = addressDto.getMethods_url(); String methods_url = addressDto.getMethods_url();
String url = wmsUrl + methods_url; String url = wmsUrl + methods_url;
log.info("ApplyPlugPullSiteRequest----请求参数:{}", JSONObject.toJSONString(param)); log.info("A向lms申请套管工位请求----请求参数:{}", JSONObject.toJSONString(param));
try { try {
// //
result = HttpRequest.post(url) result = HttpRequest.post(url)
.body(JSON.toJSONString(param)) .body(JSON.toJSONString(param))
.execute().body(); .execute().body();
JSONObject jsonObject = JSONObject.parseObject(result); JSONObject jsonObject = JSONObject.parseObject(result);
log.info("ApplyPlugPullSitResponse----返回参数{}", result); log.info("向lms申请套管工位请求----返回参数{}", ("1".equals(param.getType()) ? "套轴" : "2".equals(param.getType()) ? "套轴完成" : "3".equals(param.getType()) ? "拔轴完成" :
"4".equals(param.getType()) ? "拔轴" : "缓存线已满,生成行架任务"));
applyPlugPullSitResponse = JSONObject.toJavaObject(jsonObject, ApplyPlugPullSitResponse.class); applyPlugPullSitResponse = JSONObject.toJavaObject(jsonObject, ApplyPlugPullSitResponse.class);
LuceneLogDto luceneLogDto = new LuceneLogDto(4, "ApplyPlugPullSiteRequest", String.valueOf(applyPlugPullSitResponse.getstatus()), LuceneLogDto luceneLogDto = new LuceneLogDto(4, "ApplyPlugPullSiteRequest", String.valueOf(applyPlugPullSitResponse.getstatus()),
JSON.toJSONString(param), String.valueOf(result), "ACS向LMS申请" JSON.toJSONString(param), String.valueOf(result), "ACS向LMS申请"
@@ -471,7 +478,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
luceneLogService.interfaceExecuteLog(luceneLogDto); luceneLogService.interfaceExecuteLog(luceneLogDto);
} catch (Exception e) { } catch (Exception e) {
JSONObject jsonObject = JSONObject.parseObject(result); JSONObject jsonObject = JSONObject.parseObject(result);
log.info("ApplyPlugPullSitResponse----返回参数{}", result); log.info("向lms申请套管工位请求----返回参数{}", result);
applyPlugPullSitResponse = JSONObject.toJavaObject(jsonObject, ApplyPlugPullSitResponse.class); applyPlugPullSitResponse = JSONObject.toJavaObject(jsonObject, ApplyPlugPullSitResponse.class);
LuceneLogDto luceneLogDto = new LuceneLogDto(4, "ApplyPlugPullSiteRequest", String.valueOf(applyPlugPullSitResponse.getstatus()), LuceneLogDto luceneLogDto = new LuceneLogDto(4, "ApplyPlugPullSiteRequest", String.valueOf(applyPlugPullSitResponse.getstatus()),
JSON.toJSONString(param), String.valueOf(result), "ACS向LMS申请失败"); JSON.toJSONString(param), String.valueOf(result), "ACS向LMS申请失败");
@@ -491,7 +498,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
@Override @Override
public ApplyfeedbackSubVolumeWeightResponse applyfeedbackSubVolumeWeight(ApplyfeedbackSubVolumeWeightRequest param) { public ApplyfeedbackSubVolumeWeightResponse applyfeedbackSubVolumeWeight(ApplyfeedbackSubVolumeWeightRequest param) {
log.info("向LMS申请反馈,请求参数{}", param); log.info("向LMS反馈子卷重量,请求参数{}", param);
String result = ""; String result = "";
ApplyfeedbackSubVolumeWeightResponse applyfeedbackSubVolumeWeightResponse = new ApplyfeedbackSubVolumeWeightResponse(); ApplyfeedbackSubVolumeWeightResponse applyfeedbackSubVolumeWeightResponse = new ApplyfeedbackSubVolumeWeightResponse();
if (StrUtil.equals(paramService.findByCode(AcsConfig.HASWMS).getValue(), "1")) { if (StrUtil.equals(paramService.findByCode(AcsConfig.HASWMS).getValue(), "1")) {
@@ -499,18 +506,18 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
AddressDto addressDto = addressService.findByCode("applyfeedbackSubVolumeWeightRequest"); AddressDto addressDto = addressService.findByCode("applyfeedbackSubVolumeWeightRequest");
String methods_url = addressDto.getMethods_url(); String methods_url = addressDto.getMethods_url();
String url = wmsUrl + methods_url; String url = wmsUrl + methods_url;
log.info("applyfeedbackSubVolumeWeightRequest----请求参数:{}", JSONObject.toJSONString(param)); log.info("向LMS反馈子卷重量----请求参数:{}", JSONObject.toJSONString(param));
try { try {
// //
result = HttpRequest.post(url) result = HttpRequest.post(url)
.body(JSON.toJSONString(param)) .body(JSON.toJSONString(param))
.execute().body(); .execute().body();
JSONObject jsonObject = JSONObject.parseObject(result); JSONObject jsonObject = JSONObject.parseObject(result);
log.info("applyfeedbackSubVolumeWeightRequest----返回参数{}", result); log.info("向LMS反馈子卷重量----返回参数{}", result);
applyfeedbackSubVolumeWeightResponse = JSONObject.toJavaObject(jsonObject, ApplyfeedbackSubVolumeWeightResponse.class); applyfeedbackSubVolumeWeightResponse = JSONObject.toJavaObject(jsonObject, ApplyfeedbackSubVolumeWeightResponse.class);
} catch (Exception e) { } catch (Exception e) {
JSONObject jsonObject = JSONObject.parseObject(result); JSONObject jsonObject = JSONObject.parseObject(result);
log.info("applyfeedbackSubVolumeWeightRequest----返回参数{}", result); log.info("向LMS反馈子卷重量----返回参数{}", result);
JSONObject map = new JSONObject(); JSONObject map = new JSONObject();
map.put("status", 400); map.put("status", 400);
map.put("message", e.getMessage()); map.put("message", e.getMessage());
@@ -525,7 +532,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
@Override @Override
public ApplyManipulatorActionResponse applyManipulatorActionRequest(ApplyManipulatorActionRequest param) { public ApplyManipulatorActionResponse applyManipulatorActionRequest(ApplyManipulatorActionRequest param) {
log.info("向LMS申请反馈,请求参数{}", param); log.info("RGV工位上有货申请行架任务,请求参数{}", param);
String result = ""; String result = "";
ApplyManipulatorActionResponse applyManipulatorActionResponse = new ApplyManipulatorActionResponse(); ApplyManipulatorActionResponse applyManipulatorActionResponse = new ApplyManipulatorActionResponse();
if (StrUtil.equals(paramService.findByCode(AcsConfig.HASWMS).getValue(), "1")) { if (StrUtil.equals(paramService.findByCode(AcsConfig.HASWMS).getValue(), "1")) {
@@ -533,17 +540,17 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
AddressDto addressDto = addressService.findByCode("applyManipulatorAction"); AddressDto addressDto = addressService.findByCode("applyManipulatorAction");
String methods_url = addressDto.getMethods_url(); String methods_url = addressDto.getMethods_url();
String url = wmsUrl + methods_url; String url = wmsUrl + methods_url;
log.info("ApplyManipulatorActionRequest----请求参数:{}", JSONObject.toJSONString(param)); log.info("RGV工位上有货申请行架任务----请求参数:{}", JSONObject.toJSONString(param));
try { try {
result = HttpRequest.post(url) result = HttpRequest.post(url)
.body(JSON.toJSONString(param)) .body(JSON.toJSONString(param))
.execute().body(); .execute().body();
JSONObject jsonObject = JSONObject.parseObject(result); JSONObject jsonObject = JSONObject.parseObject(result);
log.info("ApplyManipulatorActionResponse----返回参数{}", result); log.info("RGV工位上有货申请行架任务----返回参数{}", result);
applyManipulatorActionResponse = JSONObject.toJavaObject(jsonObject, ApplyManipulatorActionResponse.class); applyManipulatorActionResponse = JSONObject.toJavaObject(jsonObject, ApplyManipulatorActionResponse.class);
} catch (Exception e) { } catch (Exception e) {
JSONObject jsonObject = JSONObject.parseObject(result); JSONObject jsonObject = JSONObject.parseObject(result);
log.info("ApplyManipulatorActionResponse----返回参数{}", result); log.info("RGV工位上有货申请行架任务----返回参数{}", result);
applyManipulatorActionResponse = JSONObject.toJavaObject(jsonObject, ApplyManipulatorActionResponse.class); applyManipulatorActionResponse = JSONObject.toJavaObject(jsonObject, ApplyManipulatorActionResponse.class);
LuceneLogDto luceneLogDto = new LuceneLogDto(4, "ApplyManipulatorActionRequest", String.valueOf(applyManipulatorActionResponse.getCode()), LuceneLogDto luceneLogDto = new LuceneLogDto(4, "ApplyManipulatorActionRequest", String.valueOf(applyManipulatorActionResponse.getCode()),
JSON.toJSONString(param), String.valueOf(applyManipulatorActionResponse), "ACS向LMS申请反馈子卷重量失败"); JSON.toJSONString(param), String.valueOf(applyManipulatorActionResponse), "ACS向LMS申请反馈子卷重量失败");
@@ -554,7 +561,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
return JSONObject.toJavaObject(map, ApplyManipulatorActionResponse.class); return JSONObject.toJavaObject(map, ApplyManipulatorActionResponse.class);
} }
LuceneLogDto luceneLogDto = new LuceneLogDto(4, "ApplyManipulatorActionRequest", String.valueOf(applyManipulatorActionResponse.getCode()), LuceneLogDto luceneLogDto = new LuceneLogDto(4, "ApplyManipulatorActionRequest", String.valueOf(applyManipulatorActionResponse.getCode()),
JSON.toJSONString(param), String.valueOf(applyManipulatorActionResponse), "ACS向LMS申请反馈子卷重量成功"); JSON.toJSONString(param), String.valueOf(applyManipulatorActionResponse), "RGV工位上有货申请行架任务");
luceneLogService.interfaceExecuteLog(luceneLogDto); luceneLogService.interfaceExecuteLog(luceneLogDto);
} }
return applyManipulatorActionResponse; return applyManipulatorActionResponse;
@@ -783,6 +790,10 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
.body(param.toString()) .body(param.toString())
.execute(); .execute();
log.info("sendDeviceStatus - 返回参数 {}", response.body()); log.info("sendDeviceStatus - 返回参数 {}", response.body());
LuceneLogDto luceneLogDto = new LuceneLogDto(4,"feedbackDie", String.valueOf(response.getStatus()),
String.valueOf(param),
String.valueOf(response.body()), "向LMS发送设备状态");
luceneLogService.interfaceExecuteLog(luceneLogDto);
} }
} catch (Throwable ignored) { } catch (Throwable ignored) {

34
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
View File

@@ -626,46 +626,40 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
@Override @Override
public Map<String, Object> getTubeMes(String jsonObject) throws Exception { public Map<String, Object> getTubeMes(String jsonObject) throws Exception {
log.info("getTubeMes--------------:输入参数" + jsonObject); log.info("getTubeMes--------------:输入参数" + jsonObject);
String date = new Date().toString(); LuceneLogDto luceneLogDto = new LuceneLogDto(4, "getTubeMes", "",
LuceneLogDto luceneLogDto = new LuceneLogDto(4, jsonObject, date + "获取管芯信息"); String.valueOf(jsonObject),
"", "下发管芯信息");
luceneLogService.interfaceExecuteLog(luceneLogDto); luceneLogService.interfaceExecuteLog(luceneLogDto);
JSONArray datas = JSONArray.parseArray(jsonObject); JSONArray datas = JSONArray.parseArray(jsonObject);
JSONObject jo = new JSONObject(); Map map = new HashMap();
for (int i = 0; i < datas.size(); i++) { for (int i = 0; i < datas.size(); i++) {
JSONObject data = (JSONObject) datas.get(i); JSONObject data = (JSONObject) datas.get(i);
String device_code = data.getString("device_code"); String device_code = data.getString("device_code");
String to_material = data.getString("to_material"); String to_material = data.getString("to_material");
String to_spec = data.getString("to_spec"); String to_spec = data.getString("to_spec");
String to_qty = data.getString("to_qty"); String to_qty = data.getString("to_qty");
Device device = deviceAppService.findDeviceByCode(device_code); Device device = deviceAppService.findDeviceByCode(device_code);
if (ObjectUtil.isEmpty(device)) { if (ObjectUtil.isEmpty(device)) {
throw new Exception("未找到对应设备:" + device_code); throw new Exception("未找到对应设备:" + device_code);
} }
PaperTubePickSiteDeviceDriver paperTubePickSiteDeviceDriver; PaperTubePickSiteDeviceDriver paperTubePickSiteDeviceDriver;
if (device.getDeviceDriver() instanceof WasteFoilWeighingStationDriver) { if (device.getDeviceDriver() instanceof PaperTubePickSiteDeviceDriver) {
paperTubePickSiteDeviceDriver = (PaperTubePickSiteDeviceDriver) device.getDeviceDriver(); paperTubePickSiteDeviceDriver = (PaperTubePickSiteDeviceDriver) device.getDeviceDriver();
try { if (ObjectUtil.isEmpty(to_material)){
//反馈管芯信息 map.put("to_material", "0");
Thread.sleep(1000); //休眠1秒 map.put("to_spec", "0");
while (true) { map.put("to_qty", "0");
if (paperTubePickSiteDeviceDriver.getMode() == 2 && paperTubePickSiteDeviceDriver.getFlag() == 3) { }else {
jo.put("to_material", to_material);//当前重量 map.put("to_material", to_material);
jo.put("to_spec", to_spec);//上一次重量 map.put("to_spec", to_spec);
jo.put("to_qty", to_qty);//重量差 map.put("to_qty", to_qty);
break;
}
}
} catch (InterruptedException e) {
e.printStackTrace();
} }
paperTubePickSiteDeviceDriver.writing(map);
} }
} }
JSONObject resultJson = new JSONObject(); JSONObject resultJson = new JSONObject();
resultJson.put("status", HttpStatus.OK.value()); resultJson.put("status", HttpStatus.OK.value());
resultJson.put("message", "操作成功"); resultJson.put("message", "操作成功");
resultJson.put("data", jo);
log.info("putWeightAction--------------:输出参数" + resultJson.toString());
return resultJson; return resultJson;
} }

28
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/service/impl/LuceneServiceImpl.java
View File

@@ -2,6 +2,7 @@ package org.nl.config.lucene.service.impl;
import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@@ -162,31 +163,10 @@ public class LuceneServiceImpl implements LuceneService {
} }
TermRangeQuery termRangeQuery = new TermRangeQuery("logTime", new BytesRef(startDate), new BytesRef(endDate), true, true); TermRangeQuery termRangeQuery = new TermRangeQuery("logTime", new BytesRef(startDate), new BytesRef(endDate), true, true);
booleanQueryBuilder.add(termRangeQuery, BooleanClause.Occur.MUST); booleanQueryBuilder.add(termRangeQuery, BooleanClause.Occur.MUST);
if (whereJson.get("device_code") != null){
Query termQuery = new TermQuery(new Term("device_code", (String) whereJson.get("device_code")));
booleanQueryBuilder.add(termQuery,BooleanClause.Occur.MUST);
}
if (whereJson.get("method") != null){ if (whereJson.get("method") != null){
Query termQuery = new TermQuery(new Term("method", (String) whereJson.get("method"))); Query termQuery = new TermQuery(new Term("method", (String) whereJson.get("method")));
booleanQueryBuilder.add(termQuery,BooleanClause.Occur.MUST); booleanQueryBuilder.add(termQuery,BooleanClause.Occur.MUST);
} }
if (whereJson.get("status_code") != null){
Query termQuery = new TermQuery(new Term("status_code", (String) whereJson.get("status_code")));
booleanQueryBuilder.add(termQuery,BooleanClause.Occur.MUST);
}
if (whereJson.get("requestparam") != null){
WildcardQuery query = new WildcardQuery(new Term("requestparam", "*"+(String) whereJson.get("requestparam")+"*"));
booleanQueryBuilder.add(query,BooleanClause.Occur.MUST);
}
if (whereJson.get("responseparam") != null){
WildcardQuery query = new WildcardQuery(new Term("responseparam", "*"+(String) whereJson.get("responseparam")+"*"));
booleanQueryBuilder.add(query,BooleanClause.Occur.MUST);
}
if (whereJson.get("blurry") != null) {
WildcardQuery query = new WildcardQuery(new Term("fieldContent", "*"+(String) whereJson.get("blurry")+"*"));
booleanQueryBuilder.add(query, BooleanClause.Occur.MUST);
}
TopFieldCollector collector = TopFieldCollector.create(new Sort(new SortField("logTime", SortField.Type.LONG,true)), 20000, 0); TopFieldCollector collector = TopFieldCollector.create(new Sort(new SortField("logTime", SortField.Type.LONG,true)), 20000, 0);
searcher.search(booleanQueryBuilder.build(), collector); searcher.search(booleanQueryBuilder.build(), collector);
TopDocs topDocs = collector.topDocs(pageNum*pageSize, pageSize); TopDocs topDocs = collector.topDocs(pageNum*pageSize, pageSize);
@@ -197,16 +177,18 @@ public class LuceneServiceImpl implements LuceneService {
for (ScoreDoc scoreDoc : scoreDocs) { for (ScoreDoc scoreDoc : scoreDocs) {
Document doc = open.document(scoreDoc.doc); Document doc = open.document(scoreDoc.doc);
JSONObject object = new JSONObject(); JSONObject object = new JSONObject();
if (ObjectUtil.isNotEmpty(doc.get("method"))) {
object.put("content", doc.get("fieldContent")); object.put("content", doc.get("fieldContent"));
object.put("device_code",doc.get("device_code"));
object.put("logTime", doc.get("logTime") ); object.put("logTime", doc.get("logTime") );
object.put("method", doc.get("method")); object.put("method", doc.get("method"));
object.put("status_code",doc.get("status_code"));
object.put("requestparam", doc.get("requestparam")); object.put("requestparam", doc.get("requestparam"));
object.put("responseparam", doc.get("responseparam")); object.put("responseparam", doc.get("responseparam"));
if (doc.get("fieldContent") != null) { if (doc.get("fieldContent") != null) {
list.add(object); list.add(object);
} }
}
} }
open.close(); open.close();
directory.close(); directory.close();

8
acs2/nladmin-ui/src/views/acs/device/driver/standard_autodoor.vue
View File

@@ -155,6 +155,14 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="dbr_value2">
<template slot="header">
<el-link type="primary" :underline="false" @click.native="test_read1()">测试读</el-link>
</template>
<template slot-scope="scope">
<el-input v-model="data2[scope.$index].dbr_value" size="mini" class="edit-input" />
</template>
</el-table-column>
<el-table-column prop="dbw_value"> <el-table-column prop="dbw_value">
<template slot="header"> <template slot="header">
<el-link type="primary" :underline="false" @click.native="test_write1()">测试写</el-link> <el-link type="primary" :underline="false" @click.native="test_write1()">测试写</el-link>