From 2a83b23108673dedc4ac47d6af709859c5a8c66f Mon Sep 17 00:00:00 2001 From: zhengxuming Date: Wed, 27 Aug 2025 14:39:35 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BA=A7=E7=BA=BF=E6=8E=A5=E9=A9=B3?= =?UTF-8?q?=E5=8F=B0=E3=80=81=E6=8B=86=E5=B0=81=E7=9B=96=E5=AF=B9=E6=8E=A5?= =?UTF-8?q?=E4=BD=8D=E9=A9=B1=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ItemProtocol.java | 14 +++++++------- .../ProductionLineDockingStationDeviceDriver.java | 2 -- .../remove_seal_cover_position/ItemProtocol.java | 14 +++++++------- .../RemoveSealCoverPositionDriver.java | 2 -- 4 files changed, 14 insertions(+), 18 deletions(-) diff --git a/acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/zz_driver/production_line_docking_station/ItemProtocol.java b/acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/zz_driver/production_line_docking_station/ItemProtocol.java index b01a57e..e9064cd 100644 --- a/acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/zz_driver/production_line_docking_station/ItemProtocol.java +++ b/acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/zz_driver/production_line_docking_station/ItemProtocol.java @@ -98,18 +98,18 @@ ItemProtocol { public static List getReadableItemDtos() { ArrayList list = new ArrayList<>(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB1.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB1.B2")); - list.add(new ItemDto(item_move, "光电信号", "DB1.B3")); - list.add(new ItemDto(item_action, "取放信号", "DB1.B4")); - list.add(new ItemDto(item_error, "报警信号", "DB1.B5")); + list.add(new ItemDto(item_heartbeat, "心跳", "DB600.B0")); + list.add(new ItemDto(item_mode, "工作模式", "DB600.B2")); + list.add(new ItemDto(item_move, "光电信号", "DB600.B3")); + list.add(new ItemDto(item_action, "取放信号", "DB600.B4")); + list.add(new ItemDto(item_error, "报警信号", "DB600.B5")); return list; } public static List getWriteableItemDtos() { ArrayList list = new ArrayList<>(); - list.add(new ItemDto(item_to_command, "下发命令", "DB2.W0")); - list.add(new ItemDto(item_to_error, "下发故障代码", "DB2.W2")); + list.add(new ItemDto(item_to_command, "下发命令", "DB601.W0")); + list.add(new ItemDto(item_to_error, "下发故障代码", "DB601.W2")); return list; } } diff --git a/acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/zz_driver/production_line_docking_station/ProductionLineDockingStationDeviceDriver.java b/acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/zz_driver/production_line_docking_station/ProductionLineDockingStationDeviceDriver.java index 94f079b..1692449 100644 --- a/acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/zz_driver/production_line_docking_station/ProductionLineDockingStationDeviceDriver.java +++ b/acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/zz_driver/production_line_docking_station/ProductionLineDockingStationDeviceDriver.java @@ -238,8 +238,6 @@ public class ProductionLineDockingStationDeviceDriver extends AbstractOpcDeviceD jo.put("move", move); jo.put("action", action); jo.put("isOnline", true); -// jo.put("error", ErrorUtil.getDictDetail("gxhj_error_type", String.valueOf(this.getError()))); -// jo.put("isError", this.getIserror()); return jo; } diff --git a/acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/zz_driver/remove_seal_cover_position/ItemProtocol.java b/acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/zz_driver/remove_seal_cover_position/ItemProtocol.java index 2c95456..a0d3e3a 100644 --- a/acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/zz_driver/remove_seal_cover_position/ItemProtocol.java +++ b/acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/zz_driver/remove_seal_cover_position/ItemProtocol.java @@ -97,18 +97,18 @@ ItemProtocol { public static List getReadableItemDtos() { ArrayList list = new ArrayList<>(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB1.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB1.B2")); - list.add(new ItemDto(item_action, "取放信号", "DB1.B4")); - list.add(new ItemDto(item_error, "报警信号", "DB1.B5")); - list.add(new ItemDto(item_task, "任务号", "DB1.B6")); + list.add(new ItemDto(item_heartbeat, "心跳", "DB600.B0")); + list.add(new ItemDto(item_mode, "工作模式", "DB600.B2")); + list.add(new ItemDto(item_action, "取放信号", "DB600.B4")); + list.add(new ItemDto(item_error, "报警信号", "DB600.B5")); + list.add(new ItemDto(item_task, "任务号", "DB600.D6")); return list; } public static List getWriteableItemDtos() { ArrayList list = new ArrayList<>(); - list.add(new ItemDto(item_to_command, "下发命令", "DB2.W2")); - list.add(new ItemDto(item_to_task, "下发故障代码", "DB2.W8")); + list.add(new ItemDto(item_to_command, "下发命令", "DB601.W2")); + list.add(new ItemDto(item_to_task, "下发故障代码", "DB601.D8")); return list; } } diff --git a/acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/zz_driver/remove_seal_cover_position/RemoveSealCoverPositionDriver.java b/acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/zz_driver/remove_seal_cover_position/RemoveSealCoverPositionDriver.java index 732906e..fea4ab5 100644 --- a/acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/zz_driver/remove_seal_cover_position/RemoveSealCoverPositionDriver.java +++ b/acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/zz_driver/remove_seal_cover_position/RemoveSealCoverPositionDriver.java @@ -231,8 +231,6 @@ public class RemoveSealCoverPositionDriver extends AbstractOpcDeviceDriver imple jo.put("task", task); jo.put("action", action); jo.put("isOnline", true); -// jo.put("error", ErrorUtil.getDictDetail("gxhj_error_type", String.valueOf(this.getError()))); -// jo.put("isError", this.getIserror()); return jo; }