From a759f5fd41414651325494926583843568bac334 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期二, 04 六月 2024 20:42:47 +0800
Subject: [PATCH] -

---
 jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java b/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
index ba7bcee..18c3ed1 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
@@ -27,6 +27,9 @@
 import com.kangaroohy.milo.model.ReadWriteEntity;
 import com.kangaroohy.milo.runner.subscription.SubscriptionCallback;
 import com.kangaroohy.milo.service.MiloService;
+import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -35,9 +38,11 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
-
+@Slf4j
 @Component
 public class OPCUaSubscription implements SubscriptionCallback {
+
+    private static final Logger logger = LoggerFactory.getLogger("sys-user");
 
     public SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -98,6 +103,7 @@
     @Override
     public void onSubscribe(String identifier, Object value) {
 
+        logger.info("鍦板潃锛�"+identifier+"鍊硷細"+value);
         try {
             if(null != value && Integer.valueOf(value.toString())!= 0) {
                 String[] nodes = identifier.split("[.]");
@@ -198,6 +204,7 @@
 //                            }
                             if(testList.stream().anyMatch(s -> s.equals(device))){
                                 String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
+                                miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(21).build());
 //                                Object packCodeObject = miloService.readFromOpcUa(thoroughfare + "." + device + ".ModuleCode").getValue();
 //                                DaTestDeviceInterface deviceInterfaceOne = null;
 //
@@ -214,7 +221,6 @@
 //                                    writeToOpc(RecordDataDoneAddress, (short) 22);
 //                                }
 //                                writeToOpc(RecordDataDoneAddress, (short) 21);
-                                miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(21).build());
                             }
 
 
@@ -237,11 +243,15 @@
                         List<Object> collect = list1.stream().map(ReadWriteEntity::getValue).collect(Collectors.toList());
                         String joinedString = String.join(",", collect.toString());
                         WebSocketUsers.sendMessageToUserByText(map.get(device), TightenTheConversionOkNg(joinedString));
+                        if(device.contains("270") || device.contains("260")){
+                            logger.info("璇诲彇鍒板伐浣峽}鐨凷caner鏁版嵁锛歿}",device,TightenTheConversionOkNg(joinedString));
+                        }
                     }
                 }
             }
         } catch (Exception e) {
-
+            logger.info("璁㈤槄鏂规硶鎶ラ敊:{}"+e.getMessage());
+            e.printStackTrace();
         }
     }
 

--
Gitblit v1.9.3