From 657e8e49584a6da022251606ff320bdf72196901 Mon Sep 17 00:00:00 2001 From: "USER-20220102CG\\noblelift" <546428999@qq.com> Date: Fri, 3 Feb 2023 13:50:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basedriver/hongxiang_device/ItemProtocol.java | 6 +++++- .../basedriver/oven_manipulator/ItemProtocol.java | 4 ++++ .../basedriver/plug_pull_device_site/ItemProtocol.java | 4 ++++ .../siemens_conveyor/SiemensConveyorDeviceDriver.java | 7 +++++++ .../org/nl/acs/device_driver/driver/OpcDeviceDriver.java | 9 ++++++++- .../java/org/nl/acs/opc/DeviceOpcProtocolRunable.java | 4 ++-- acs/nladmin-system/src/main/resources/logback-spring.xml | 1 + acs/nladmin-ui/src/views/system/monitor/device/index.vue | 6 ++++++ 8 files changed, 37 insertions(+), 4 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hongxiang_device/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hongxiang_device/ItemProtocol.java index dea3c7767..03e42ab96 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hongxiang_device/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hongxiang_device/ItemProtocol.java @@ -140,7 +140,7 @@ public class ItemProtocol { setIsonline(true); return value; } - return 0; + return 0L; } @@ -183,6 +183,10 @@ public class ItemProtocol { return list; } + @Override + public String toString() { + return ""; + } } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/ItemProtocol.java index bfde080d9..c963542a9 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/ItemProtocol.java @@ -118,5 +118,9 @@ public class ItemProtocol { return list; } + @Override + public String toString() { + return ""; + } } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/plug_pull_device_site/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/plug_pull_device_site/ItemProtocol.java index 99f7bedf8..68656c285 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/plug_pull_device_site/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/plug_pull_device_site/ItemProtocol.java @@ -152,6 +152,10 @@ public class ItemProtocol { return list; } + @Override + public String toString() { + return ""; + } } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java index 472a6df68..640343f56 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java @@ -92,6 +92,7 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme int task = 0; int last_task = 0; int agvphase = 0; + String task_code = null; int phase = 0; int index = 0; @@ -119,6 +120,7 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme int branchProtocol = 0; String inst_message; + String last_inst_message; //当前指令 @@ -165,6 +167,7 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme } if(move == 0 && last_move == 1 ){ last_vehicle_code = vehicle_code; + last_inst_message = inst_message; } if (move == 0 && last_move == 1 && "06".equals(this.device.getRegion())) { this.requiresShipDeviceUpdate = false; @@ -192,6 +195,7 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme if (inst != null) { inst_message = "当前指令号:" + inst.getInstruction_code() + " " + inst.getStart_point_code() + "->" + inst.getNext_point_code() + " 载具号：" + inst.getVehicle_code(); vehicle_code = inst.getVehicle_code(); + task_code = inst.getTask_code(); if (StrUtil.equals(inst.getInstruction_status(), "0") && StrUtil.equals(this.getDeviceCode(), inst.getStart_device_code())) { inst.setInstruction_status("1"); inst.setExecute_device_code(this.device_code); @@ -474,9 +478,12 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme jo.put("carrier_direction", carrier_direction); jo.put("task", task); jo.put("last_task", last_task); + jo.put("task_code", task_code); + // jo.put("barcode", barcode); // jo.put("last_task", last_task); jo.put("inst_message", this.inst_message); + jo.put("last_inst_message", this.last_inst_message); jo.put("isOnline", this.getIsonline()); jo.put("error", this.getError()); jo.put("isError", this.getIserror()); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/driver/OpcDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/driver/OpcDeviceDriver.java index 2dc367021..c17be0048 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/driver/OpcDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/driver/OpcDeviceDriver.java @@ -1,6 +1,7 @@ package org.nl.acs.device_driver.driver; +import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import org.nl.acs.device_driver.DeviceDriver; @@ -62,7 +63,13 @@ public interface OpcDeviceDriver extends DeviceDriver { } default Float getDoubleValue(String protocol) { - return (Float) this.getValue(protocol); + if(ObjectUtil.isEmpty(this.getValue(protocol))){ + return null; + } else { + return Float.valueOf(this.getValue(protocol).toString()); + } +// return Float.valueOf(this.getValue(protocol).toString()); +// return (Float) this.getValue(protocol); } default int[] getIntegeregerArrayValue(String protocol) { diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java b/acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java index 7080f56d7..2c06c54c7 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java @@ -117,7 +117,7 @@ public class DeviceOpcProtocolRunable implements Runnable { label97: while (true) { - System.out.println("label97"); +// System.out.println("label97"); long begin = System.currentTimeMillis(); Map itemStatus = group.read(true, (Item[]) itemsMap.values().toArray(new Item[0])); @@ -139,7 +139,7 @@ public class DeviceOpcProtocolRunable implements Runnable { Iterator var18 = items.iterator(); while (true) { - System.out.println("label98"); +// System.out.println("label98"); Item item; // 当前值 Object value; diff --git a/acs/nladmin-system/src/main/resources/logback-spring.xml b/acs/nladmin-system/src/main/resources/logback-spring.xml index b661855b1..86bdaa02c 100644 --- a/acs/nladmin-system/src/main/resources/logback-spring.xml +++ b/acs/nladmin-system/src/main/resources/logback-spring.xml @@ -102,6 +102,7 @@ https://juejin.cn/post/6844903775631572999 + 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 a2377ed6d..27daccefa 100644 --- a/acs/nladmin-ui/src/views/system/monitor/device/index.vue +++ b/acs/nladmin-ui/src/views/system/monitor/device/index.vue @@ -375,6 +375,9 @@ export default { const obj = { name: '备注信息', value: data[val] } this.arr.push(obj) } else if (val === 'inst_message') { + const obj = { name: '当前指令信息', value: data[val] } + this.arr.push(obj) + } else if (val === 'last_inst_message') { const obj = { name: '上次指令信息', value: data[val] } this.arr.push(obj) } else if (val === 'barcode') { @@ -389,6 +392,9 @@ export default { } else if (val === 'instruction_code') { const obj = { name: '指令号', value: data[val] } this.arr.push(obj) + } else if (val === 'task_code') { + const obj = { name: '任务号', value: data[val] } + this.arr.push(obj) } else if (val === 'last_instruction_code') { const obj = { name: '上次指令号', value: data[val] } this.arr.push(obj)