From 49c784e6ac7d71c5eaf7352e0a215842b4ca5456 Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期五, 15 三月 2024 08:26:26 +0800
Subject: [PATCH] 操作看板

---
 jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 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 2434042..b3f749a 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
@@ -1,6 +1,7 @@
 package com.jcdm.main.plcserver.sub;
 
 
+import com.jcdm.framework.websocket.WebSocketUsers;
 import com.jcdm.main.da.collectionParamConf.domain.DaCollectionParamConf;
 import com.jcdm.main.da.collectionParamConf.service.IDaCollectionParamConfService;
 import com.jcdm.main.da.paramCollection.domain.DaParamCollection;
@@ -14,9 +15,11 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import javax.websocket.Session;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 
@@ -24,6 +27,8 @@
 public class OPCUaSubscription implements SubscriptionCallback {
 
     public static MiloService miloService;
+
+    Map<String, Session> map = WebSocketUsers.getUsers();
 
     public IDaPassingStationCollectionService daPassingStationCollectionService;
 
@@ -93,8 +98,23 @@
                         //璁板綍鏁版嵁瀹屾垚
                         String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
                         miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(recordDataDoneValue).build());
-                    }else{
+                    }else if("3".equals(tabVlaue)){
+                        String Torque = thoroughfare + "." + device + ".Torque";
+                        String Angle = thoroughfare + "." + device + ".Angle";
+                        String Result = thoroughfare + "." + device + ".Result";
+                        String Result1 = thoroughfare + "." + device + ".Result1";
+                        List<String> list = new ArrayList();
+                        list.add(Torque);
+                        list.add(Angle);
+                        list.add(Result);
+                        list.add(Result1);
+                        List<ReadWriteEntity> list1 = miloService.readFromOpcUa(list);
+                        List<Object> collect = list1.stream().map(ReadWriteEntity::getValue).collect(Collectors.toList());
+                        String joinedString = String.join(",", collect.toString());
+                        WebSocketUsers.sendMessageToUserByText(map.get(device), joinedString);
+                    }else {
                         System.out.println("^");
+
                     }
 
 

--
Gitblit v1.9.3