From f82cdee8fbe12aa22c230aafbaf10a5e8130917d Mon Sep 17 00:00:00 2001 From: pangshenghao Date: Wed, 7 Jun 2023 17:35:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E5=8D=87=E6=9C=BA=E7=BC=BA=E5=B0=91fl?= =?UTF-8?q?oor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basedriver/device_status/DeviceStatusDeviceDriver.java | 2 ++ .../java/org/nl/acs/ext/wms/liKuData/DeviceStatusData.java | 3 +++ .../java/org/nl/modules/quartz/task/QueryLKDeviceStatus.java | 1 + acs/nladmin-ui/src/views/system/monitor/device/index.vue | 3 +++ 4 files changed, 9 insertions(+) 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 d949b9a23..0623f635b 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 floor =""; Boolean iserror = false; Boolean hasGoods = false; @@ -110,6 +111,7 @@ public class DeviceStatusDeviceDriver extends AbstractOpcDeviceDriver implements jo.put("load", load); jo.put("alarm", alarm); jo.put("task_id", task_id); + jo.put("floor",floor); jo.put("isOnline", this.getIsonline()); jo.put("isError",this.getIserror()); jo.put("hasGoods", this.getHasGoods()); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/liKuData/DeviceStatusData.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/liKuData/DeviceStatusData.java index a2b5c3471..4f8f125a3 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/liKuData/DeviceStatusData.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/liKuData/DeviceStatusData.java @@ -29,4 +29,7 @@ public class DeviceStatusData { //任务号 String taskId; + //楼层 + String floor; + } diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryLKDeviceStatus.java b/acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryLKDeviceStatus.java index 7bc6e200d..e323b34e4 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryLKDeviceStatus.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryLKDeviceStatus.java @@ -70,6 +70,7 @@ public class QueryLKDeviceStatus { deviceStatusDeviceDriver.setLoad(deviceStatusData.getLoad()); deviceStatusDeviceDriver.setAlarm(deviceStatusData.getAlarm()); deviceStatusDeviceDriver.setTask_id(deviceStatusData.getTaskId()); + deviceStatusDeviceDriver.setFloor(deviceStatusData.getFloor()); deviceStatusDeviceDriver.setIsonline(true); if(!"0".equals(deviceStatusData.getAlarm())) { deviceStatusDeviceDriver.setIserror(true); diff --git a/acs/nladmin-ui/src/views/system/monitor/device/index.vue b/acs/nladmin-ui/src/views/system/monitor/device/index.vue index d74a42600..1d62cbcbb 100644 --- a/acs/nladmin-ui/src/views/system/monitor/device/index.vue +++ b/acs/nladmin-ui/src/views/system/monitor/device/index.vue @@ -608,6 +608,9 @@ export default { } else if (val === 'task_id') { const obj = { name: '任务号', value: data[val] } this.arr.push(obj) + } else if (val === 'floor') { + const obj = { name: '楼层', value: data[val] } + this.arr.push(obj) } } }