diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/LnshLaminatingMachineDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/LnshLaminatingMachineDeviceDriver.java index 6466a8f..8588170 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/LnshLaminatingMachineDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/LnshLaminatingMachineDeviceDriver.java @@ -319,7 +319,7 @@ public class LnshLaminatingMachineDeviceDriver extends AbstractOpcDeviceDriver i if (ObjectUtil.isNotEmpty(result)) { JSONObject jsonObject = JSONObject.parseObject(result.body()); if (result.getStatus() == 200 && StrUtil.equals(jsonObject.get("status").toString(),"200")) { -// this.writing(mode); + this.writing(this.mode); this.setRequireSucess(true); this.setResult(true); } @@ -435,7 +435,7 @@ public class LnshLaminatingMachineDeviceDriver extends AbstractOpcDeviceDriver i Map itemMap = new HashMap(); itemMap.put(to_command, command); ReadUtil.write(itemMap, server); - + logServer.deviceExecuteLog(this.device_code, "", "", to_command + " 写入 " + command); } public void writing(int type, int command) { @@ -450,11 +450,13 @@ public class LnshLaminatingMachineDeviceDriver extends AbstractOpcDeviceDriver i Map itemMap = new HashMap(); if (type == 1) { itemMap.put(to_command, command); + logServer.deviceExecuteLog(this.device_code, "", "", to_command + " 写入 " + command); } else if (type == 2) { itemMap.put(to_target, command); - + logServer.deviceExecuteLog(this.device_code, "", "", to_target + " 写入 " + command); } else if (type == 3) { itemMap.put(to_task, command); + logServer.deviceExecuteLog(this.device_code, "", "", to_task + " 写入 " + command); } ReadUtil.write(itemMap, server); @@ -470,6 +472,7 @@ public class LnshLaminatingMachineDeviceDriver extends AbstractOpcDeviceDriver i itemMap.put(to_param,value); ReadUtil.write(itemMap, server); + logServer.deviceExecuteLog(this.device_code, "", "", to_param + " 写入 " + value); } public static Boolean isExistFieldName(String fieldName, Object obj) throws NoSuchFieldException { diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_lane/LnshKilnLaneDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_lane/LnshKilnLaneDeviceDriver.java index ac2e711..3ae5d52 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_lane/LnshKilnLaneDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_lane/LnshKilnLaneDeviceDriver.java @@ -337,6 +337,7 @@ public class LnshKilnLaneDeviceDriver extends AbstractOpcDeviceDriver implements itemMap.put(to_param, Integer.parseInt(value)); } ReadUtil.write(itemMap, server); + logServer.deviceExecuteLog(this.device_code, "", "", to_param + " 写入 " + value); } public void executing(Server server, Map itemMap) { @@ -352,6 +353,7 @@ public class LnshKilnLaneDeviceDriver extends AbstractOpcDeviceDriver implements Map itemMap = new HashMap(); itemMap.put(to_command, command); ReadUtil.write(itemMap, server); + logServer.deviceExecuteLog(this.device_code, "", "", to_command + " 写入 " + command); } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_labeling_machine/LnshLabelingMachineDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_labeling_machine/LnshLabelingMachineDeviceDriver.java index 0ff9b91..2c5568a 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_labeling_machine/LnshLabelingMachineDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_labeling_machine/LnshLabelingMachineDeviceDriver.java @@ -223,6 +223,7 @@ public class LnshLabelingMachineDeviceDriver extends AbstractOpcDeviceDriver imp itemMap.put(to_param, value); ReadUtil.write(itemMap, server); + logServer.deviceExecuteLog(this.device_code, "", "", to_param + " 写入 " + value); } @Override diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java index e46c098..46341c4 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java @@ -1313,7 +1313,7 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD Map itemMap = new HashMap(); itemMap.put(to_command, command); ReadUtil.write(itemMap, server); - + logServer.deviceExecuteLog(this.device_code, "", "", to_command + " 写入 " + command); } public String autoGenericCode(String vehicle_code) { @@ -1330,6 +1330,7 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD itemMap.put(to_param, value); ReadUtil.write(itemMap, server); + logServer.deviceExecuteLog(this.device_code, "", "", to_param + " 写入 " + value); } @Override diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/LnshPalletizingManipulatorDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/LnshPalletizingManipulatorDeviceDriver.java index 3c68a69..aa4fc4e 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/LnshPalletizingManipulatorDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/LnshPalletizingManipulatorDeviceDriver.java @@ -615,6 +615,7 @@ public class LnshPalletizingManipulatorDeviceDriver extends AbstractOpcDeviceDri itemMap.put(to_param, value); ReadUtil.write(itemMap, server); + logServer.deviceExecuteLog(this.device_code, "", "", to_param + " 写入 " + value); } public void writing(int command) { @@ -625,6 +626,7 @@ public class LnshPalletizingManipulatorDeviceDriver extends AbstractOpcDeviceDri Map itemMap = new HashMap(); itemMap.put(to_command, command); ReadUtil.write(itemMap, server); + logServer.deviceExecuteLog(this.device_code, "", "", to_command + " 写入 " + command); } public synchronized void OpenOrClose(String type) { diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java index 5048482..9809ec1 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java @@ -392,9 +392,9 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic json.put("device_code",this.device_code); json.put("type","4"); // json.put("vehicle_code",barcode); - logServer.deviceExecuteLog(device_code, String.valueOf(barcode), "", "申请空盘请求参数:" + json); + logServer.deviceExecuteLog(device_code, "", "", "申请空盘请求参数:" + json); HttpResponse result = acsToWmsService.lnshApplyTaskToWms(json); - logServer.deviceExecuteLog(device_code, String.valueOf(barcode), "", "申请空盘返回参数:" + result); + logServer.deviceExecuteLog(device_code, "", "", "申请空盘返回参数:" + result); if (ObjectUtil.isNotEmpty(result)) { JSONObject jsonObject = JSONObject.parseObject(result.body()); if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"),"200")) { @@ -418,9 +418,9 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic return false; } else { this.instruction_require_time = date; - logServer.deviceExecuteLog(device_code, String.valueOf(barcode), "", "排产单确认请求参数:" + json); + logServer.deviceExecuteLog(device_code, "", "", "排产单确认请求参数:" + json); HttpResponse result = acsToWmsService.enterOrder(json); - logServer.deviceExecuteLog(device_code, String.valueOf(barcode), "", "排产单确认返回参数:" + result); + logServer.deviceExecuteLog(device_code, "", "", "排产单确认返回参数:" + result); if (ObjectUtil.isNotEmpty(result)) { JSONObject jsonObject = JSONObject.parseObject(result.body()); if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"),"200")) { @@ -463,9 +463,9 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic json.put("producetask_code",order_No); json.put("unqualified_qty",unqualified_qty); json.put("is_full","1"); - logServer.deviceExecuteLog(device_code, String.valueOf(barcode), "", "码垛完成请求参数:" + json); + logServer.deviceExecuteLog(device_code, "", "", "码垛完成请求参数:" + json); HttpResponse result = acsToWmsService.applyTaskManipulatorToWms(json); - logServer.deviceExecuteLog(device_code, String.valueOf(barcode), "", "码垛完成返回参数:" + result); + logServer.deviceExecuteLog(device_code, "", "", "码垛完成返回参数:" + result); if (ObjectUtil.isNotEmpty(result)) { JSONObject jsonObject = JSONObject.parseObject(result.body()); if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"),"200")) { @@ -501,9 +501,9 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic json.put("batch",batch); json.put("producetask_code",order_No); json.put("is_full","0"); - logServer.deviceExecuteLog(device_code, String.valueOf(barcode), "", "码垛强制完成请求参数:" + json); + logServer.deviceExecuteLog(device_code, "", "", "码垛强制完成请求参数:" + json); HttpResponse result = acsToWmsService.applyTaskManipulatorToWms(json); - logServer.deviceExecuteLog(device_code, String.valueOf(barcode), "", "码垛强制完成返回参数:" + result); + logServer.deviceExecuteLog(device_code, "", "", "码垛强制完成返回参数:" + result); if (ObjectUtil.isNotEmpty(result)) { JSONObject jsonObject = JSONObject.parseObject(result.body()); if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"),"200")) { @@ -535,9 +535,9 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic json.put("qty",encoder_qty); json.put("unqualified_qty",unqualified_qty); json.put("is_full","1"); - logServer.deviceExecuteLog(device_code, String.valueOf(barcode), "", "申请入库请求参数:" + json); + logServer.deviceExecuteLog(device_code, "", "", "申请入库请求参数:" + json); HttpResponse result = acsToWmsService.lnshApplyTaskToWms(json); - logServer.deviceExecuteLog(device_code, String.valueOf(barcode), "", "申请入库返回参数:" + result); + logServer.deviceExecuteLog(device_code, "", "", "申请入库返回参数:" + result); if (ObjectUtil.isNotEmpty(result)) { JSONObject jsonObject = JSONObject.parseObject(result.body()); if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"),"200")) { @@ -607,13 +607,13 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic Map itemMap = new HashMap(); if (type == 1) { itemMap.put(to_command, command); - logServer.deviceExecuteLog(device_code, String.valueOf(barcode), "", to_command + "下发" + command); + logServer.deviceExecuteLog(this.device_code, "", "", to_command + " 写入 " + command); } else if (type == 2) { itemMap.put(to_target, command); - logServer.deviceExecuteLog(device_code, String.valueOf(barcode), "", to_target + "下发" + command); + logServer.deviceExecuteLog(this.device_code, "", "", to_target + " 写入 " + command); } else if (type == 3) { itemMap.put(to_task, command); - logServer.deviceExecuteLog(device_code, String.valueOf(barcode), "", to_task + "下发" + command); + logServer.deviceExecuteLog(this.device_code, "", "", to_task + " 写入 " + command); } ReadUtil.write(itemMap, server); @@ -627,8 +627,8 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic Server server = ReadUtil.getServer(opcservcerid); Map itemMap = new HashMap(); itemMap.put(to_param, value); - logServer.deviceExecuteLog(device_code, String.valueOf(barcode), "", to_param + "下发" + value); ReadUtil.write(itemMap, server); + logServer.deviceExecuteLog(this.device_code, "", "", to_param + " 写入 " + value); } public void writing(int command) { @@ -638,8 +638,8 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic Server server = ReadUtil.getServer(opcservcerid); Map itemMap = new HashMap(); itemMap.put(to_command, command); - logServer.deviceExecuteLog(device_code, String.valueOf(barcode), "", to_command + "下发" + command); ReadUtil.write(itemMap, server); + logServer.deviceExecuteLog(this.device_code, "", "", to_command + " 写入 " + command); } public synchronized void OpenOrClose(String type) { diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDeviceDriver.java index 4a81d16..254b416 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDeviceDriver.java @@ -608,9 +608,9 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi Server server = ReadUtil.getServer(opcservcerid); Map itemMap = new HashMap(); itemMap.put(to_param, value); - logServer.deviceExecuteLog(this.device_code, "", "", "下发电气信号:"+to_param +",值:"+value); ReadUtil.write(itemMap, server); + logServer.deviceExecuteLog(this.device_code, "", "", to_param + " 写入 " + value); } public boolean exe_business() { @@ -650,7 +650,7 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi Map itemMap = new HashMap(); itemMap.put(to_command1, command); ReadUtil.write(itemMap, server); - + logServer.deviceExecuteLog(this.device_code, "", "", to_command1 + " 写入 " + command); } public void writing2(int command) { @@ -662,7 +662,7 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi Map itemMap = new HashMap(); itemMap.put(to_command2, command); ReadUtil.write(itemMap, server); - + logServer.deviceExecuteLog(this.device_code, "", "", to_command2 + " 写入 " + command); } public void writing(int type, int command) { diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDeviceDriver.java index 3b0d3b9..bb759e6 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDeviceDriver.java @@ -1146,7 +1146,7 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im Map itemMap = new HashMap(); itemMap.put(to_feedback, feedback); ReadUtil.write(itemMap, server); - + logServer.deviceExecuteLog(this.device_code, "", "", to_feedback + " 写入 " + feedback); } public void writing(int type, int command) { @@ -1170,6 +1170,7 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im itemMap.put(to_param, value); ReadUtil.write(itemMap, server); + logServer.deviceExecuteLog(this.device_code, "", "", to_param + " 写入 " + value); } public static Boolean isExistFieldName(String fieldName, Object obj) throws NoSuchFieldException { diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java index f6946f0..7b8d4e7 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java @@ -591,11 +591,13 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements Map itemMap = new HashMap(); if (type == 1) { itemMap.put(to_command, command); + logServer.deviceExecuteLog(this.device_code, "", "", to_command + " 写入 " + command); } else if (type == 2) { itemMap.put(to_target, command); - + logServer.deviceExecuteLog(this.device_code, "", "", to_target + " 写入 " + command); } else if (type == 3) { itemMap.put(to_task, command); + logServer.deviceExecuteLog(this.device_code, "", "", to_task + " 写入 " + command); } ReadUtil.write(itemMap, server); @@ -608,8 +610,8 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements Server server = ReadUtil.getServer(opcservcerid); Map itemMap = new HashMap(); itemMap.put(to_command, command); - logServer.deviceExecuteLog(this.device_code,"","","下发电气信号:"+to_command+",value"+command); ReadUtil.write(itemMap, server); + logServer.deviceExecuteLog(this.device_code, "", "", to_command + " 写入 " + command); } public synchronized boolean finish_instruction() throws Exception { diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/RljnPackagePalletSplitManipulatorDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/RljnPackagePalletSplitManipulatorDeviceDriver.java index e298234..149d888 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/RljnPackagePalletSplitManipulatorDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/RljnPackagePalletSplitManipulatorDeviceDriver.java @@ -1579,7 +1579,7 @@ public class RljnPackagePalletSplitManipulatorDeviceDriver extends AbstractOpcDe Map itemMap = new HashMap(); itemMap.put(to_command, command); ReadUtil.write(itemMap, server); - logServer.deviceExecuteLog(this.device_code,"","","下发电气信号:to_command,value"+command); + logServer.deviceExecuteLog(this.device_code, "", "", to_command + " 写入 " + command); } public void writing(String param, String value) { @@ -1592,7 +1592,7 @@ public class RljnPackagePalletSplitManipulatorDeviceDriver extends AbstractOpcDe itemMap.put(to_param, value); ReadUtil.write(itemMap, server); - logServer.deviceExecuteLog(this.device_code,"","","下发电气信号:"+to_param+",value"+value); + logServer.deviceExecuteLog(this.device_code, "", "", to_param + " 写入 " + value); } @Override diff --git a/acs/hd/nladmin-system/src/main/resources/log/NDCSocketConnectionAutoRun.xml b/acs/hd/nladmin-system/src/main/resources/log/NDCSocketConnectionAutoRun.xml index 625ba86..e5c7742 100644 --- a/acs/hd/nladmin-system/src/main/resources/log/NDCSocketConnectionAutoRun.xml +++ b/acs/hd/nladmin-system/src/main/resources/log/NDCSocketConnectionAutoRun.xml @@ -1,29 +1,33 @@ - - - - - - 1000 - - ${LOKI_URL} - - - - - ${log.pattern} - - true - + + + + + + ${LOG_HOME}/NDC交互日志/%d{yyyy-MM-dd}.%i.log + + 15 + + 200MB + + 2GB + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + ${log.charset} + + + + - +