From 68fb54daf131f983412e201e40735488b7098ffc Mon Sep 17 00:00:00 2001 From: songxiaopeng <1393756821@qq.com> Date: Tue, 27 Feb 2024 16:17:07 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=8A=A5=E9=94=99=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../acs/device_driver/driver/ItemValue.java | 36 +++++++++++++++++++ .../java/org/nl/acs/opc/OpcServerService.java | 2 +- .../org/nl/acs/opc/OpcServerServiceImpl.java | 1 + .../src/main/java/org/nl/acs/opc/OpcUtl.java | 2 +- 4 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 acs/nladmin-system/src/main/java/org/nl/acs/device_driver/driver/ItemValue.java diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/driver/ItemValue.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/driver/ItemValue.java new file mode 100644 index 0000000..824c769 --- /dev/null +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/driver/ItemValue.java @@ -0,0 +1,36 @@ +package org.nl.acs.device_driver.driver; + +/** + * @author ldjun + * @version 1.0 + * @date 2023年02月01日 11:21 + * @desc desc + */ +public class ItemValue { + private String item_code; + private Object item_value; + + public ItemValue() { + } + + public ItemValue(String item_code, Object item_value) { + this.item_code = item_code; + this.item_value = item_value; + } + + public String getItem_code() { + return this.item_code; + } + + public void setItem_code(String item_code) { + this.item_code = item_code; + } + + public Object getItem_value() { + return this.item_value; + } + + public void setItem_value(Object item_value) { + this.item_value = item_value; + } +} diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/opc/OpcServerService.java b/acs/nladmin-system/src/main/java/org/nl/acs/opc/OpcServerService.java index 649343f..5beeb36 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/opc/OpcServerService.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/opc/OpcServerService.java @@ -1,5 +1,5 @@ package org.nl.acs.opc; - +import org.nl.acs.device_driver.driver.ItemValue; import org.openscada.opc.lib.da.Group; /** diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/opc/OpcServerServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/opc/OpcServerServiceImpl.java index 12ae69b..32e926a 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/opc/OpcServerServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/opc/OpcServerServiceImpl.java @@ -5,6 +5,7 @@ import org.jinterop.dcom.common.JIException; import org.nl.acs.auto.initial.ApplicationAutoInitial; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.exception.WDKException; +import org.nl.acs.device_driver.driver.ItemValue; import org.openscada.opc.lib.common.NotConnectedException; import org.openscada.opc.lib.da.Group; import org.openscada.opc.lib.da.Server; diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/opc/OpcUtl.java b/acs/nladmin-system/src/main/java/org/nl/acs/opc/OpcUtl.java index a358d18..7d70b33 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/opc/OpcUtl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/opc/OpcUtl.java @@ -8,7 +8,7 @@ import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.exception.WDKException; import org.openscada.opc.lib.common.ConnectionInformation; import org.openscada.opc.lib.da.*; - +import org.nl.acs.device_driver.driver.ItemValue; import java.util.ArrayList; import java.util.Iterator; import java.util.List;