From f8a42c402e35065628775f9102886ca2a7b9116e Mon Sep 17 00:00:00 2001 From: yanps Date: Tue, 28 Nov 2023 14:01:52 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E9=A9=B1=E5=8A=A8=E9=87=8D=E5=A4=8D=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DeviceServiceImpl.java | 4 +- .../StandardStackerDeviceDriver.java | 38 +++++++++---------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java index 18b85f9..a939780 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java @@ -2267,6 +2267,7 @@ public class DeviceServiceImpl extends CommonServiceImpl i DeviceDto device = this.findByCode(device_code); String device_type = device.getDevice_type(); List dictList = iSysDictService.getDictByName("device_type"); + Set uniqueDriverSet = new HashSet<>(); dictList.forEach(dict ->{ if(StrUtil.equals(dict.getValue(),device_type)){ List driverList = deviceDriverDefinationAppService.getDeviceDriverDefinations(DeviceType.getName(dict.getLabel())); @@ -2275,11 +2276,12 @@ public class DeviceServiceImpl extends CommonServiceImpl i JSONObject jo = new JSONObject(); jo.put("code",deviceDriverDefination.getDriverCode()); jo.put("name",deviceDriverDefination.getDriverName()); - ja.add(jo); + uniqueDriverSet.add(jo); } ); } }); + ja = JSONArray.parseArray(JSON.toJSONString(uniqueDriverSet)); return ja; } } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_stacker/StandardStackerDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_stacker/StandardStackerDeviceDriver.java index 8794721..82cd672 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_stacker/StandardStackerDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_stacker/StandardStackerDeviceDriver.java @@ -235,81 +235,81 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme if (!command.equals(last_command)) { requireSucess = false; logServer.deviceItemValue(this.device_code, "mode", String.valueOf(command)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_command + "->" + command); + logServer.deviceExecuteLog(this.device_code, "", "", "信号command：" + last_command + "->" + command); } if (!task.equals(last_task)) { logServer.deviceItemValue(this.device_code, "mode", String.valueOf(mode)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_task + "->" + task); + logServer.deviceExecuteLog(this.device_code, "", "", "信号task：" + last_task + "->" + task); } if (!error.equals(last_error)) { if (0 != error) { } logServer.deviceItemValue(this.device_code, "mode", String.valueOf(error)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_error + "->" + error); + logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error); } if (!z.equals(last_z)) { logServer.deviceItemValue(this.device_code, "mode", String.valueOf(z)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_z + "->" + z); + logServer.deviceExecuteLog(this.device_code, "", "", "信号z：" + last_z + "->" + z); } if (!x.equals(last_x)) { logServer.deviceItemValue(this.device_code, "mode", String.valueOf(x)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_x + "->" + x); + logServer.deviceExecuteLog(this.device_code, "", "", "信号z：" + last_x + "->" + x); } if (!y.equals(last_y)) { logServer.deviceItemValue(this.device_code, "mode", String.valueOf(y)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_y + "->" + y); + logServer.deviceExecuteLog(this.device_code, "", "", "信号y：" + last_y + "->" + y); } if (!move.equals(last_move)) { logServer.deviceItemValue(this.device_code, "mode", String.valueOf(move)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_move + "->" + move); + logServer.deviceExecuteLog(this.device_code, "", "", "信号move：" + last_move + "->" + move); } if (!cargoMove.equals(last_cargoMove)) { logServer.deviceItemValue(this.device_code, "mode", String.valueOf(cargoMove)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_cargoMove + "->" + cargoMove); + logServer.deviceExecuteLog(this.device_code, "", "", "信号cargoMove：" + last_cargoMove + "->" + cargoMove); } if (!action.equals(last_action)) { logServer.deviceItemValue(this.device_code, "mode", String.valueOf(action)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_action + "->" + action); + logServer.deviceExecuteLog(this.device_code, "", "", "信号action：" + last_action + "->" + action); } if (!distancex.equals(last_distancex)) { logServer.deviceItemValue(this.device_code, "mode", String.valueOf(distancex)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_distancex + "->" + distancex); + logServer.deviceExecuteLog(this.device_code, "", "", "信号distancex：" + last_distancex + "->" + distancex); } if (!distancey.equals(last_distancey)) { logServer.deviceItemValue(this.device_code, "mode", String.valueOf(distancey)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_distancey + "->" + distancey); + logServer.deviceExecuteLog(this.device_code, "", "", "信号distancey：" + last_distancey + "->" + distancey); } if (!cargoError.equals(last_cargoError)) { logServer.deviceItemValue(this.device_code, "mode", String.valueOf(cargoError)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_cargoError + "->" + cargoError); + logServer.deviceExecuteLog(this.device_code, "", "", "信号cargoError：" + last_cargoError + "->" + cargoError); } if (!forkCargo.equals(last_forkCargo)) { logServer.deviceItemValue(this.device_code, "mode", String.valueOf(forkCargo)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_forkCargo + "->" + forkCargo); + logServer.deviceExecuteLog(this.device_code, "", "", "信号forkCargo：" + last_forkCargo + "->" + forkCargo); } if (!forkLocation.equals(last_forkLocation)) { logServer.deviceItemValue(this.device_code, "mode", String.valueOf(forkLocation)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_forkLocation + "->" + forkLocation); + logServer.deviceExecuteLog(this.device_code, "", "", "信号forkLocation：" + last_forkLocation + "->" + forkLocation); } if (!forkAction.equals(last_forkAction)) { logServer.deviceItemValue(this.device_code, "mode", String.valueOf(forkAction)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_forkAction + "->" + forkAction); + logServer.deviceExecuteLog(this.device_code, "", "", "信号forkAction：" + last_forkAction + "->" + forkAction); } if (!special1.equals(last_special1)) { logServer.deviceItemValue(this.device_code, "mode", String.valueOf(special1)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_special1 + "->" + special1); + logServer.deviceExecuteLog(this.device_code, "", "", "信号special1：" + last_special1 + "->" + special1); } if (!special2.equals(last_special2)) { logServer.deviceItemValue(this.device_code, "mode", String.valueOf(special2)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_special2 + "->" + special2); + logServer.deviceExecuteLog(this.device_code, "", "", "信号special2：" + last_special2 + "->" + special2); } if (!Arrays.equals(trayCode, last_trayCode)) { logServer.deviceItemValue(this.device_code, "mode", Arrays.toString(trayCode)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + Arrays.toString(last_trayCode) + "->" + Arrays.toString(trayCode)); + logServer.deviceExecuteLog(this.device_code, "", "", "信号trayCode：" + Arrays.toString(last_trayCode) + "->" + Arrays.toString(trayCode)); } if (!storage_cache.equals(last_storage_cache)) { logServer.deviceItemValue(this.device_code, "mode", String.valueOf(storage_cache)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_storage_cache + "->" + storage_cache); + logServer.deviceExecuteLog(this.device_code, "", "", "信号storage_cache：" + last_storage_cache + "->" + storage_cache); } /*if (!stacker_rpm.equals(last_stacker_rpm)) { logServer.deviceItemValue(this.device_code, "mode", String.valueOf(stacker_rpm));