From 72c971716964071d3fbd10615be98340b8003abc Mon Sep 17 00:00:00 2001
From: yanps <yps00312>
Date: Wed, 20 Mar 2024 10:54:46 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E4=BF=A1=E5=8F=B7=E5=8F=98=E5=8C=96=E4=B8=BAnull=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nl/acs/opc/DeviceOpcProtocolRunable.java  | 21 ++-----------------
 1 file changed, 2 insertions(+), 19 deletions(-)

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 a41cfd317..605b76565 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
@@ -100,8 +100,6 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC
                     server.disconnect();
                     log.trace("清理server...");
                 }
-
-//                group =opcServerService.getServer(this.getOpcServer().getOpc_code());
                 this.server = OpcServerUtl.getServerWithOutException(this.OpcServer.getOpc_host(), this.OpcServer.getCls_id(), this.OpcServer.getUser(), this.OpcServer.getPassword(), this.OpcServer.getDomain());
                 this.server.addStateListener(this);
                 group = this.server.addGroup();
@@ -391,20 +389,8 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC
             Object value = OpcUtl.getValue(item, itemState);
             UnifiedDataAccessor accessor_value = UnifiedDataAccessorFactory.getAccessor(OpcConfig.udw_opc_value_key);
             accessor_value.setValue(itemId, value);
-
-//            if (value != null) {
-//                if (log.isTraceEnabled()) {
-//                    log.trace("Item {} new value: {}, Timestamp: {}", new Object[]{itemId, itemState.getValue(), itemState.getTimestamp().getTime()});
-//                }
-//            } else if (log.isInfoEnabled()) {
-//                log.info("Item {} new value: {}, Timestamp: {}, Quality: {}", new Object[]{itemId, itemState.getValue(), itemState.getTimestamp().getTime(), itemState.getQuality()});
-//            }
             log.trace("Item {} new value: {}, Timestamp: {}", new Object[]{itemId, itemState.getValue(), itemState.getTimestamp().getTime()});
-
             OpcItemDto itemDto = this.getItem(itemId);
-//            if (Boolean.TRUE.equals(itemDto.getNeed_log())) {
-//                this.logItemChanged(itemId, accessor_value, value, itemDto);
-//            }
             this.logItemChanged(itemId, accessor_value, value, itemDto);
 
         } catch (Exception var7) {
@@ -425,15 +411,13 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC
                 Object obj = accessor_value.getValue(relate);
                 sb.append("key:" + relate + "value:" + obj + ";");
             }
-//            log.warn("设备：{}信号{}变更从{}->{};信号快照：{}", new Object[]{itemDto.getDevice_code(), itemId, his, value, sb});
             if (!itemDto.getItem_code().endsWith("heartbeat") && !itemDto.getItem_code().endsWith("time")) {
                 // 存在上次点位值为null情况 则不记录日志
                 LuceneLogDto luceneLogDto = new LuceneLogDto(itemDto.getOpc_server_code(), itemDto.getOpc_plc_code(), itemDto.getDevice_code(), itemDto.getItem_code().substring(itemDto.getItem_code().lastIndexOf(".") + 1),
-                        String.valueOf(itemDto.getHis_item_value()), String.valueOf(itemDto.getItem_value()));
+                        String.valueOf(itemDto.getHis_item_value()), String.valueOf(value));
                 luceneLogDto.setLogType(LogTypeEnum.DEVICE_LOG.getDesc());
                 log.info("{}", JSON.toJSONString(luceneLogDto));
             }
-//            this.businessLogger.setResource(itemDto.getDevice_code(), itemDto.getDevice_name()).log("信号{}变更从{}->{};信号快照：{}", new Object[]{itemId, his, value, sb});
         } else {
 //            if(his instanceof int[]){
 //                if(!Arrays.equals((long[]) his, (long[]) value)){
@@ -450,11 +434,10 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC
 //            log.warn("设备：{}信号{}变更从{}->{};信号快照：{}", new Object[]{itemDto.getDevice_code(), itemId, his, value});
             if (!itemDto.getItem_code().endsWith("heartbeat") && !itemDto.getItem_code().endsWith("time")) {
                 LuceneLogDto luceneLogDto = new LuceneLogDto(itemDto.getOpc_server_code(), itemDto.getOpc_plc_code(), itemDto.getDevice_code(), itemDto.getItem_code().substring(itemDto.getItem_code().lastIndexOf(".") + 1),
-                        String.valueOf(itemDto.getHis_item_value()), String.valueOf(itemDto.getItem_value()));
+                        String.valueOf(itemDto.getHis_item_value()), String.valueOf(value));
                 luceneLogDto.setLogType(LogTypeEnum.DEVICE_LOG.getDesc());
                 log.info("{}", JSON.toJSONString(luceneLogDto));
             }
-//            this.businessLogger.setResource(itemDto.getDevice_code(), itemDto.getDevice_name()).log("信号{}变更从{}->{}", new Object[]{itemId, his, value});
         }
     }