From 8fe3e08a437c70a990455cfdc546055a07cd1057 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B1=9F=E7=8E=AE?= Date: Tue, 22 Aug 2023 09:35:38 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E7=AB=8B=E5=BA=93=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=8F=8D=E9=A6=88=E8=AE=BE=E5=A4=87=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DeviceStatusDeviceDriver.java | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/device_status/DeviceStatusDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/device_status/DeviceStatusDeviceDriver.java index b7570bde9..94706abbf 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/device_status/DeviceStatusDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/device_status/DeviceStatusDeviceDriver.java @@ -74,6 +74,7 @@ public class DeviceStatusDeviceDriver extends AbstractOpcDeviceDriver implements String load = ""; String alarm = ""; String task_id = ""; + String last_task_id = ""; Boolean iserror = false; Boolean last_iserror = false; @@ -118,7 +119,7 @@ public class DeviceStatusDeviceDriver extends AbstractOpcDeviceDriver implements } public void setIserror(Boolean iserror) { this.iserror = iserror; - if (this.iserror != this.last_iserror && device_id.startsWith("RGV")) { + if (this.iserror != this.last_iserror) { JSONObject param = new JSONObject(); param.put("device_code", this.device_id); param.put("error", alarm); @@ -128,6 +129,20 @@ public class DeviceStatusDeviceDriver extends AbstractOpcDeviceDriver implements param.put("product_area", paramService.findByCode("productArea").getValue()); acsToWmsService.sendDeviceStatus(param); } - this.last_iserror = iserror; + this.last_iserror = this.iserror; + } + + public void setTask_id(String task_id) { + this.task_id = task_id; + if (!StrUtil.equals(this.task_id, this.last_task_id)) { + JSONObject param = new JSONObject(); + param.put("device_code", this.device_id); + param.put("mode", StrUtil.isBlank(this.task_id) ? 2 : 3); + param.put("device_name", this.getDevice().getDevice_name()); + param.put("device_type", "1"); + param.put("product_area", paramService.findByCode("productArea").getValue()); + acsToWmsService.sendDeviceStatus(param); + } + this.last_task_id = this.task_id; } }