diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java index cf557d4ba..9e832859b 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java @@ -261,6 +261,7 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { .device_code("下发诺宝运单") .content("任务号:"+inst.getTask_code()+",指令号:"+inst.getInstruction_code()+",下发agv订单序列参数:"+jo) .build(); + logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); log.info("任务号：{},指令号{},下发agv订单序列参数:{}", inst.getTask_code(), inst.getInstruction_code(), jo); @@ -281,6 +282,7 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { .device_code("诺宝运单响应") .content("任务号:"+inst.getTask_code()+",指令号:"+inst.getInstruction_code()+",下发诺宝订单序列反馈参数:"+jo) .build(); + logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto1); log.info("任务号：{},指令号{},状态{},下发agv订单序列反馈:{}", inst.getTask_code(), inst.getInstruction_code(), result.getStatus(), result.body()); @@ -803,6 +805,7 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { .device_code("下发叉车运单") .content("任务号:"+inst.getTask_code()+",指令号:"+inst.getInstruction_code()+",下发叉车订单序列参数:"+jo) .build(); + logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); log.info("任务号：{},指令号{},下发agv订单序列参数:{}", inst.getTask_code(), inst.getInstruction_code(), jo); @@ -823,6 +826,7 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { .device_code("叉车运单响应") .content("任务号:"+inst.getTask_code()+",指令号:"+inst.getInstruction_code()+",下发叉车订单序列反馈参数:"+jo) .build(); + logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto1); log.info("任务号：{},指令号{},状态{},下发agv叉车订单序列反馈:{}", inst.getTask_code(), inst.getInstruction_code(), result.getStatus(), result.body()); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java index 1993d4627..bbbb8ea35 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java @@ -174,6 +174,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic .device_code(device_code) .content("agvphase：" + "反馈:" + data) .build(); + logDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(logDto); } //到达取货点 @@ -209,6 +210,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic .device_code(device_code) .content(agvaddr + "对应设备号为空") .build(); + logDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(logDto); return; } @@ -308,6 +310,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic .device_code(device_code) .content("agvphase:" + phase + "反馈:" + data) .build(); + logDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(logDto); } } @@ -323,6 +326,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic .device_code(device_code) .content("agv地址参数有误,phase:" + phase) .build(); + logDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(logDto); return; } @@ -348,6 +352,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic .device_code(device_code) .content("对应设备号为空" + device_code) .build(); + logDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(logDto); return; } @@ -434,6 +439,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic .device_code(device_code) .content("agvphase:" + phase + "反馈:" + data) .build(); + logDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(logDto); } } @@ -447,6 +453,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic .device_code(device_code) .content("agv地址参数有误,phase:" + phase) .build(); + logDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(logDto); return; } @@ -567,6 +574,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic .device_code(device_code) .content("agvphase:" + phase + "反馈:" + data) .build(); + logDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(logDto); } } @@ -582,6 +590,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic .device_code(device_code) .content("agv地址参数有误,phase:" + phase) .build(); + logDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(logDto); return; } @@ -686,6 +695,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic .device_code(device_code) .content("agvphase:" + phase + "反馈:" + data) .build(); + logDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(logDto); } } @@ -715,6 +725,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic .device_code(device_code) .content("agvphase:" + phase + "反馈:" + data) .build(); + logDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(logDto); } } @@ -729,6 +740,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic .device_code(device_code) .content("agv地址参数有误,phase:" + phase) .build(); + logDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(logDto); return; } @@ -832,6 +844,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic .device_code(device_code) .content("agv地址参数有误,phase:" + phase) .build(); + logDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(logDto); return; } @@ -940,6 +953,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic .device_code(device_code) .content("agv地址参数有误,phase:" + phase) .build(); + logDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(logDto); return; } @@ -1046,6 +1060,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic .device_code(device_code) .content("agv地址参数有误,phase:" + phase) .build(); + logDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(logDto); return; } @@ -1224,6 +1239,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic .device_code(device_code) .content("agvphase:" + phase + "反馈:" + data) .build(); + logDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(logDto); // if (StrUtil.equals(inst.getAgv_system_type(), "2")) { // TwoNDCSocketConnectionAutoRun.write(data); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/xg_agv/XgagvDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/xg_agv/XgagvDeviceDriver.java index 1785025b4..d92439f82 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/xg_agv/XgagvDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/xg_agv/XgagvDeviceDriver.java @@ -194,6 +194,7 @@ public class XgagvDeviceDriver extends AbstractOpcDeviceDriver implements Device .device_code(device_code) .content("信号" + this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.device_code + "." + ItemProtocol.stop + "变更从" + this.last_stop + "->" + this.stop) .build(); + logDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(logDto); } @@ -202,6 +203,7 @@ public class XgagvDeviceDriver extends AbstractOpcDeviceDriver implements Device .device_code(device_code) .content("信号" + this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.device_code + "." + ItemProtocol.address + this.last_address + "->" + this.address) .build(); + logDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(logDto); } @@ -210,6 +212,7 @@ public class XgagvDeviceDriver extends AbstractOpcDeviceDriver implements Device .device_code(device_code) .content("信号" + this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.device_code + "." + ItemProtocol.electricity + this.last_electricity + "->" + this.electricity) .build(); + logDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(logDto); } @@ -394,6 +397,7 @@ public class XgagvDeviceDriver extends AbstractOpcDeviceDriver implements Device .requestparam("请求参数:" + jo) .method("feedAgvTaskStatus") .build(); + reqlogDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(reqlogDto); HttpResponse resp = acsToWmsService.feedAgvTaskStatus(ja); LuceneLogDto resplogDto = LuceneLogDto.builder() @@ -403,6 +407,7 @@ public class XgagvDeviceDriver extends AbstractOpcDeviceDriver implements Device .method("feedAgvTaskStatus") .status_code(String.valueOf(resp.getStatus())) .build(); + resplogDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(resplogDto); if (resp.getStatus() == 200) { @@ -435,6 +440,7 @@ public class XgagvDeviceDriver extends AbstractOpcDeviceDriver implements Device .requestparam("请求参数:" + jo) .method("feedAgvTaskStatus") .build(); + reqlogDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(reqlogDto); HttpResponse resp = acsToWmsService.feedAgvTaskStatus(ja); LuceneLogDto resplogDto = LuceneLogDto.builder() @@ -444,6 +450,7 @@ public class XgagvDeviceDriver extends AbstractOpcDeviceDriver implements Device .method("feedAgvTaskStatus") .status_code(String.valueOf(resp.getStatus())) .build(); + reqlogDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(resplogDto); if (resp.getStatus() == 200) { @@ -472,6 +479,7 @@ public class XgagvDeviceDriver extends AbstractOpcDeviceDriver implements Device .requestparam("请求参数:" + jo) .method("feedAgvTaskStatus") .build(); + reqlogDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(reqlogDto); HttpResponse resp = acsToWmsService.feedAgvTaskStatus(ja); LuceneLogDto resplogDto = LuceneLogDto.builder() @@ -481,6 +489,7 @@ public class XgagvDeviceDriver extends AbstractOpcDeviceDriver implements Device .method("feedAgvTaskStatus") .status_code(String.valueOf(resp.getStatus())) .build(); + reqlogDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(resplogDto); if (resp.getStatus() == 200) { inst.setInstruction_status(InstructionStatusEnum.BUSY.getIndex()); @@ -507,6 +516,7 @@ public class XgagvDeviceDriver extends AbstractOpcDeviceDriver implements Device .requestparam("请求参数:" + jo) .method("feedAgvTaskStatus") .build(); + reqlogDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(reqlogDto); HttpResponse resp = acsToWmsService.feedAgvTaskStatus(ja); LuceneLogDto resplogDto = LuceneLogDto.builder() @@ -516,6 +526,7 @@ public class XgagvDeviceDriver extends AbstractOpcDeviceDriver implements Device .method("feedAgvTaskStatus") .status_code(String.valueOf(resp.getStatus())) .build(); + reqlogDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(resplogDto); if (resp.getStatus() == 200) { writing("to_line", 2); @@ -537,6 +548,7 @@ public class XgagvDeviceDriver extends AbstractOpcDeviceDriver implements Device .requestparam("请求参数:" + jo) .method("feedAgvTaskStatus") .build(); + reqlogDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(reqlogDto); HttpResponse resp = acsToWmsService.feedAgvTaskStatus(ja); LuceneLogDto resplogDto = LuceneLogDto.builder() @@ -546,6 +558,7 @@ public class XgagvDeviceDriver extends AbstractOpcDeviceDriver implements Device .method("feedAgvTaskStatus") .status_code(String.valueOf(resp.getStatus())) .build(); + reqlogDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(resplogDto); if (resp.getStatus() == 200) { writing("to_di_low", 0); @@ -601,6 +614,7 @@ public class XgagvDeviceDriver extends AbstractOpcDeviceDriver implements Device .requestparam("请求参数:" + jo) .method("feedAgvTaskStatus") .build(); + reqlogDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(reqlogDto); HttpResponse resp = acsToWmsService.feedAgvTaskStatus(ja); LuceneLogDto resplogDto = LuceneLogDto.builder() @@ -610,6 +624,7 @@ public class XgagvDeviceDriver extends AbstractOpcDeviceDriver implements Device .method("feedAgvTaskStatus") .status_code(String.valueOf(resp.getStatus())) .build(); + reqlogDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(resplogDto); if (resp.getStatus() == 200) { writing("to_di_low", 0); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java index dbf493d14..e6ef10bbd 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java @@ -380,6 +380,7 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); } @@ -426,6 +427,7 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements .device_code(device_code) .content("申请AGV任务,返回参数:" + jo.getString("body")) .build(); + logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); requireSucess = true; } else { @@ -766,6 +768,7 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); logServer.deviceExecuteLog(device_code, "", "", "下发电气信号:" + itemMap); try { @@ -797,6 +800,7 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor_ckk/SiemensConveyorCkkDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor_ckk/SiemensConveyorCkkDeviceDriver.java index f3973c62b..d3b67d2eb 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor_ckk/SiemensConveyorCkkDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor_ckk/SiemensConveyorCkkDeviceDriver.java @@ -570,6 +570,7 @@ public class SiemensConveyorCkkDeviceDriver extends AbstractOpcDeviceDriver impl .device_code(device_code) .content(device_code + inst.getInstruction_code() + "再次下发电气信号") .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); } message = "下发电气任务号成功"; @@ -681,6 +682,7 @@ public class SiemensConveyorCkkDeviceDriver extends AbstractOpcDeviceDriver impl .device_code(device_code) .content(device_code + inst.getInstruction_code() + "再次下发电气信号") .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); } } else { @@ -713,6 +715,7 @@ public class SiemensConveyorCkkDeviceDriver extends AbstractOpcDeviceDriver impl .device_code(device_code) .content(device_code + inst.getInstruction_code() + "再次下发电气信号") .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); } requireSucess = true; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor_labeling/SiemensConveyorLabelingDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor_labeling/SiemensConveyorLabelingDeviceDriver.java index 910efddda..b93e25813 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor_labeling/SiemensConveyorLabelingDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor_labeling/SiemensConveyorLabelingDeviceDriver.java @@ -698,6 +698,7 @@ public class SiemensConveyorLabelingDeviceDriver extends AbstractOpcDeviceDriver .device_code(device_code) .content(device_code + inst.getInstruction_code() + "再次下发电气信号") .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); } } else { @@ -733,6 +734,7 @@ public class SiemensConveyorLabelingDeviceDriver extends AbstractOpcDeviceDriver .device_code(device_code) .content(device_code + inst.getInstruction_code() + "再次下发电气信号") .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); } } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_storage_out_conveyor/BoxStorageOutConveyorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_storage_out_conveyor/BoxStorageOutConveyorDeviceDriver.java index 61c74d676..cbc742666 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_storage_out_conveyor/BoxStorageOutConveyorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_storage_out_conveyor/BoxStorageOutConveyorDeviceDriver.java @@ -369,6 +369,7 @@ public class BoxStorageOutConveyorDeviceDriver extends AbstractOpcDeviceDriver i .device_code(device_code) .content("二楼到一楼输送线申请行架任务,参数,接口返回:" + jo) .build(); + logDto2.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto2); this.requireSucess = true; } else { @@ -376,6 +377,7 @@ public class BoxStorageOutConveyorDeviceDriver extends AbstractOpcDeviceDriver i .device_code(device_code) .content("二楼到一楼输送线申请行架任务,返回参数:" + jo.getString("body")) .build(); + logDto2.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto2); } } @@ -527,6 +529,7 @@ public class BoxStorageOutConveyorDeviceDriver extends AbstractOpcDeviceDriver i .device_code(device_code) .content(device_code + inst.getInstruction_code() + "再次下发电气信号") .build(); + logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); try { Thread.sleep(1000); @@ -570,6 +573,7 @@ public class BoxStorageOutConveyorDeviceDriver extends AbstractOpcDeviceDriver i .device_code(device_code) .content(device_code + inst.getInstruction_code() + "再次下发电气信号") .build(); + logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); try { Thread.sleep(500); @@ -685,6 +689,7 @@ public class BoxStorageOutConveyorDeviceDriver extends AbstractOpcDeviceDriver i .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); logServer.deviceExecuteLog(device_code, "", "", "下发电气信号:" + itemMap); try { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableDeviceDriver.java index 7c8805928..eaaf07258 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableDeviceDriver.java @@ -339,7 +339,7 @@ public class FinishedProductOutBindLableDeviceDriver extends AbstractOpcDeviceDr .device_code(device_code) .content("申请捆扎,参数,接口返回:" + jo) .build(); - logDto2.setLog_level(3); + logDto2.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto2); // Map datas = applyLabelingAndBindingResponse.getData(); packagePLCData(jo.getString("data"), mode); @@ -349,6 +349,7 @@ public class FinishedProductOutBindLableDeviceDriver extends AbstractOpcDeviceDr .device_code(device_code) .content("申请捆扎失败,接口返回:" + jo.getString("body")) .build(); + logDto2.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto2); } @@ -382,6 +383,7 @@ public class FinishedProductOutBindLableDeviceDriver extends AbstractOpcDeviceDr .device_code(device_code) .content("申请贴标成功:" + jo) .build(); + logDto2.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto2); List list = new ArrayList(); Map map5 = new HashMap(); @@ -400,6 +402,7 @@ public class FinishedProductOutBindLableDeviceDriver extends AbstractOpcDeviceDr .device_code(device_code) .content("申请贴标失败,接口返回:" + jo.getString("body")) .build(); + logDto2.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto2); } @@ -707,6 +710,7 @@ public class FinishedProductOutBindLableDeviceDriver extends AbstractOpcDeviceDr .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); logServer.deviceExecuteLog(device_code, "", "", "下发电气信号:" + itemMap); try { @@ -757,6 +761,7 @@ public class FinishedProductOutBindLableDeviceDriver extends AbstractOpcDeviceDr .device_code(device_code) .content(device_code + inst.getInstruction_code() + "再次下发电气信号") .build(); + logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); try { Thread.sleep(500); @@ -873,6 +878,7 @@ public class FinishedProductOutBindLableDeviceDriver extends AbstractOpcDeviceDr .device_code(device_code) .content(device_code + inst.getInstruction_code() + "再次下发电气信号") .build(); + logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); try { Thread.sleep(1000); @@ -916,6 +922,7 @@ public class FinishedProductOutBindLableDeviceDriver extends AbstractOpcDeviceDr .device_code(device_code) .content(device_code + inst.getInstruction_code() + "再次下发电气信号") .build(); + logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); try { Thread.sleep(500); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/fold_disc_site/FoldDiscSiteDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/fold_disc_site/FoldDiscSiteDeviceDriver.java index f9bc73820..79e5a5c6d 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/fold_disc_site/FoldDiscSiteDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/fold_disc_site/FoldDiscSiteDeviceDriver.java @@ -450,6 +450,7 @@ public class FoldDiscSiteDeviceDriver extends AbstractOpcDeviceDriver implements .device_code(device_code) .content(device_code + inst.getInstruction_code() + "再次下发电气信号") .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); try { Thread.sleep(1000); @@ -493,6 +494,7 @@ public class FoldDiscSiteDeviceDriver extends AbstractOpcDeviceDriver implements .device_code(device_code) .content(device_code + inst.getInstruction_code() + "再次下发电气信号") .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); try { Thread.sleep(500); @@ -525,6 +527,7 @@ public class FoldDiscSiteDeviceDriver extends AbstractOpcDeviceDriver implements .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); logServer.deviceExecuteLog(device_code, "", "", "下发电气信号:" + itemMap); try { @@ -557,6 +560,7 @@ public class FoldDiscSiteDeviceDriver extends AbstractOpcDeviceDriver implements .device_code(device_code) .content("申请空托盘出入库,参数:" + param) .build(); + logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); String response = acsToWmsService.applyTwo(param); JSONObject jo = JSON.parseObject(response); @@ -565,6 +569,7 @@ public class FoldDiscSiteDeviceDriver extends AbstractOpcDeviceDriver implements .device_code(device_code) .content("申请空托盘出入库,参数,接口返回:" + jo) .build(); + logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto2); this.requireSucess = true; }else { @@ -572,6 +577,7 @@ public class FoldDiscSiteDeviceDriver extends AbstractOpcDeviceDriver implements .device_code(device_code) .content("申请空托盘出入库,返回参数:" + jo.getString("body")) .build(); + logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto2); } } catch (Exception e) { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/blank_manipulator/BlankManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/blank_manipulator/BlankManipulatorDeviceDriver.java index 8e76f6a72..ab4623e6c 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/blank_manipulator/BlankManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/blank_manipulator/BlankManipulatorDeviceDriver.java @@ -264,6 +264,7 @@ public class BlankManipulatorDeviceDriver extends AbstractOpcDeviceDriver implem .device_code(device_code) .content("反馈请求成功,响应参数:" + JSON.toJSONString(body)) .build(); + logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); Map map = new LinkedHashMap<>(); map.put("to_command", "5"); @@ -275,6 +276,7 @@ public class BlankManipulatorDeviceDriver extends AbstractOpcDeviceDriver implem .device_code(device_code) .content("反馈重量以及收卷轴LMS失败...") .build(); + logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); } } else { @@ -282,6 +284,7 @@ public class BlankManipulatorDeviceDriver extends AbstractOpcDeviceDriver implem .device_code(device_code) .content("当前指令号为空") .build(); + logDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(logDto); } } else { @@ -329,6 +332,7 @@ public class BlankManipulatorDeviceDriver extends AbstractOpcDeviceDriver implem .device_code(device_code) .content("读取信号值时出现异常:" + var17.getMessage() + ",this.itemProtocol is null:" + ObjectUtil.isEmpty(this.itemProtocol)) .build(); + logDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(logDto); } @@ -515,6 +519,7 @@ public class BlankManipulatorDeviceDriver extends AbstractOpcDeviceDriver implem .device_code(device_code) .content(startDevice.getDevice_code() + LangProcess.msg("universal_notCreateInstMessage1")) .build(); + logDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(logDto); throw new BadRequestException(LangProcess.msg("device_checkAdd", startDevice.getDevice_code())); } @@ -524,6 +529,7 @@ public class BlankManipulatorDeviceDriver extends AbstractOpcDeviceDriver implem .device_code(device_code) .content(nextDevice.getDevice_code() + LangProcess.msg("universal_notCreateInstMessage1")) .build(); + logDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(logDto); throw new BadRequestException(LangProcess.msg("device_checkAdd", nextDevice.getDevice_code())); @@ -562,6 +568,7 @@ public class BlankManipulatorDeviceDriver extends AbstractOpcDeviceDriver implem .device_code(device_code) .content(LangProcess.msg("universal_message9") + e.getMessage()) .build(); + logDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(logDto); return false; } @@ -614,6 +621,7 @@ public class BlankManipulatorDeviceDriver extends AbstractOpcDeviceDriver implem .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); } } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/hongxiang_device/HongXiangConveyorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/hongxiang_device/HongXiangConveyorDeviceDriver.java index 1a560176f..8830c9a19 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/hongxiang_device/HongXiangConveyorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/hongxiang_device/HongXiangConveyorDeviceDriver.java @@ -251,6 +251,7 @@ public class HongXiangConveyorDeviceDriver extends AbstractOpcDeviceDriver imple .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); } @@ -278,6 +279,7 @@ public class HongXiangConveyorDeviceDriver extends AbstractOpcDeviceDriver imple .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); } } @@ -298,6 +300,7 @@ public class HongXiangConveyorDeviceDriver extends AbstractOpcDeviceDriver imple .device_code(device_code) .content("下发电气信号:" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); logServer.deviceExecuteLog(device_code, "", "", "下发电气信号:" + itemMap); try { @@ -348,6 +351,7 @@ public class HongXiangConveyorDeviceDriver extends AbstractOpcDeviceDriver imple .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/lamp_three_color/LampThreecolorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/lamp_three_color/LampThreecolorDeviceDriver.java index 875b9e3aa..a3e601359 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/lamp_three_color/LampThreecolorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/lamp_three_color/LampThreecolorDeviceDriver.java @@ -110,6 +110,7 @@ public class LampThreecolorDeviceDriver extends AbstractOpcDeviceDriver implemen .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java index 492c3e487..34283cd88 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java @@ -807,6 +807,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); } } @@ -1035,6 +1036,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i .device_code(lampDevice.getDeviceDriver().getDeviceCode()) .content("下发报警灯" + lamp + "报警信号") .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); lampThreecolorDeviceDriver.writing("to_command", "1"); } @@ -1176,6 +1178,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); } @@ -1194,6 +1197,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i .device_code(device_code) .content("下发电气信号:" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); logServer.deviceExecuteLog(device_code, "", "", "下发电气信号:" + itemMap); try { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/PullHeadManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/PullHeadManipulatorDeviceDriver.java index 4adedc04a..3dc846cc0 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/PullHeadManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/PullHeadManipulatorDeviceDriver.java @@ -593,6 +593,7 @@ public class PullHeadManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); } } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_tail_manipulator/PullTailManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_tail_manipulator/PullTailManipulatorDeviceDriver.java index 0d54d700f..88bdcd7fa 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_tail_manipulator/PullTailManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_tail_manipulator/PullTailManipulatorDeviceDriver.java @@ -231,6 +231,7 @@ public class PullTailManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp .device_code(device_code) .content("反馈LMS子卷重量失败:"+ applyPlugPullSitResponse.getMessage()) .build(); + logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); } } else { @@ -468,6 +469,7 @@ public class PullTailManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp .device_code(device_code) .content(device_code+"创建指令时出现异常:" + e.getMessage()) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); return false; } //创建指令后修改任务状态 @@ -547,6 +549,7 @@ public class PullTailManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); } } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java index 96b1626a1..18560b69c 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java @@ -559,6 +559,7 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); } @@ -603,6 +604,7 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); } @@ -633,6 +635,7 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); this.control(itemMap); } @@ -827,6 +830,7 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); } } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/sub_roll_conveyor_site/SubRollConveyorSiteDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/sub_roll_conveyor_site/SubRollConveyorSiteDeviceDriver.java index a80366db9..e4bf53339 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/sub_roll_conveyor_site/SubRollConveyorSiteDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/sub_roll_conveyor_site/SubRollConveyorSiteDeviceDriver.java @@ -219,6 +219,7 @@ public class SubRollConveyorSiteDeviceDriver extends AbstractOpcDeviceDriver imp .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); } } @@ -306,6 +307,7 @@ public class SubRollConveyorSiteDeviceDriver extends AbstractOpcDeviceDriver imp .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); } } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/waste_foil_weighing_station/WasteFoilWeighingStationDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/waste_foil_weighing_station/WasteFoilWeighingStationDriver.java index 996c3d79e..eb7893aa0 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/waste_foil_weighing_station/WasteFoilWeighingStationDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/waste_foil_weighing_station/WasteFoilWeighingStationDriver.java @@ -276,6 +276,7 @@ public class WasteFoilWeighingStationDriver extends AbstractOpcDeviceDriver impl .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); } @@ -303,6 +304,7 @@ public class WasteFoilWeighingStationDriver extends AbstractOpcDeviceDriver impl .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); } } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/service/impl/LuceneExecuteLogServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/service/impl/LuceneExecuteLogServiceImpl.java index f98c1ed62..49b25f2ca 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/service/impl/LuceneExecuteLogServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/service/impl/LuceneExecuteLogServiceImpl.java @@ -1,6 +1,7 @@ package org.nl.config.lucene.service.impl; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import lombok.RequiredArgsConstructor; @@ -38,7 +39,8 @@ public class LuceneExecuteLogServiceImpl implements LuceneExecuteLogService { ISysParamService paramService = SpringContextHolder.getBean(ISysParamService.class); luceneLogDto.setLogType(LogTypeEnum.DEVICE_LOG.getDesc()); String logLevel = paramService.findByCode(AcsConfig.LOGLEVEL).getValue(); - if(StrUtil.isNotEmpty(logLevel) && isNumeric(logLevel) && (luceneLogDto.getLog_level() >= Integer.parseInt(logLevel))){ + if(StrUtil.isNotEmpty(logLevel) && isNumeric(logLevel) && + ObjectUtil.isNotEmpty(luceneLogDto.getLog_level()) && (luceneLogDto.getLog_level() >= Integer.parseInt(logLevel))){ log.info("{}", JSON.toJSONString(luceneLogDto)); } } @@ -52,7 +54,8 @@ public class LuceneExecuteLogServiceImpl implements LuceneExecuteLogService { ISysParamService paramService = SpringContextHolder.getBean(ISysParamService.class); luceneLogDto.setLogType(LogTypeEnum.INTERFACE_LOG.getDesc()); String logLevel = paramService.findByCode(AcsConfig.LOGLEVEL).getValue(); - if(StrUtil.isNotEmpty(logLevel) && isNumeric(logLevel) && (luceneLogDto.getLog_level() >= Integer.parseInt(logLevel))){ + if(StrUtil.isNotEmpty(logLevel) && isNumeric(logLevel) && + ObjectUtil.isNotEmpty(luceneLogDto.getLog_level()) && (luceneLogDto.getLog_level() >= Integer.parseInt(logLevel))){ log.info("{}", JSON.toJSONString(luceneLogDto)); } }