From 686e3d33ae0a7484b64ec21a8ff7c003bbf08de4 Mon Sep 17 00:00:00 2001
From: "USER-20220102CG\\noblelift" <546428999@qq.com>
Date: Wed, 24 Jan 2024 16:56:38 +0800
Subject: [PATCH] =?UTF-8?q?rev=20=E6=9B=B4=E6=96=B0=E9=A9=B1=E5=8A=A8?=
 =?UTF-8?q?=E5=AD=97=E7=AC=A6=E4=B8=B2=E8=AF=BB=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/acs/device_driver/driver/OpcDeviceDriver.java     | 2 +-
 .../one_conveyor/box_subvolumes_conveyor/ItemProtocol.java   | 2 +-
 .../main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java   | 5 +----
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/driver/OpcDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/driver/OpcDeviceDriver.java
index c1d27c02a..04fbae0a4 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/driver/OpcDeviceDriver.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/driver/OpcDeviceDriver.java
@@ -190,7 +190,7 @@ public interface OpcDeviceDriver extends DeviceDriver {
      * @return
      */
     default String getStringValue(String protocol) {
-        return this.getOpcValueAccessor().getValue(this.getItem(protocol)).toString();
+        return (String) this.getOpcValueAccessor().getValue(this.getItem(protocol));
     }
 
     /**
diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_subvolumes_conveyor/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_subvolumes_conveyor/ItemProtocol.java
index 56a2e5c48..8b81241be 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_subvolumes_conveyor/ItemProtocol.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_subvolumes_conveyor/ItemProtocol.java
@@ -153,7 +153,7 @@ public class ItemProtocol {
         } else {
             return value;
         }
-        return "0";
+        return "";
     }
 
     public static List<ItemDto> getReadableItemDtos() {
diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java
index 1f245e4c4..8e8f2f0ba 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java
@@ -207,10 +207,8 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC
 
                         if (!UnifiedDataAppService.isEquals(value, his)) {
                             OpcItemDto itemDto = this.getItem(itemId);
-                            if (true) {
-                                this.logItemChanged(itemId, accessor_value, value, itemDto);
-                            }
                             if (!ObjectUtil.isEmpty(value)) {
+                                this.logItemChanged(itemId, accessor_value, value, itemDto);
                                 accessor_value.setValue(itemId, value);
                             }
                         }
@@ -436,7 +434,6 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC
                         String.valueOf(itemDto.getHis_item_value()), String.valueOf(itemDto.getItem_value()));
                 luceneLogDto.setLogType(LogTypeEnum.DEVICE_LOG.getDesc());
                 log.info("{}", JSON.toJSONString(luceneLogDto));
-
             }
         } else {
             if(his instanceof int[]){