From 5218032b30db4a1e19ac6bb243b71900a600da28 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期二, 19 三月 2024 10:37:57 +0800
Subject: [PATCH] 设备保养计划修改
---
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 42 ++++++++++++++++++++++++++++++++++--------
1 files changed, 34 insertions(+), 8 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 f841abe..e8db617 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;
@@ -74,10 +79,17 @@
recordDataDoneValue = "11";
//杩涚珯淇濆瓨鏁版嵁
- //inSaveDate(thoroughfare,device)
+// inSaveDate(thoroughfare,device)
//璁板綍鏁版嵁瀹屾垚
- String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(recordDataDoneValue).build());
+// String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
+// miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(recordDataDoneValue).build());
+
+ //缁欏墠绔彂宸ヤ欢鍒颁綅淇″彿
+ WebSocketUsers.sendMessageToUserByText(map.get(device), "IN");
+ //璇锋眰宸ュ崟
+
+
+
}else if("2".equals(tabVlaue)){
//鍑虹珯淇濆瓨鏁版嵁
@@ -85,13 +97,27 @@
//璁板綍鏁版嵁瀹屾垚
String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(recordDataDoneValue).build());
- }else{
+ }else {
System.out.println("^");
}
-
-
-
-
+ }
+ //淇濆瓨鎷х揣鏁版嵁
+ else if (("AngleResult").equals(tab)) {
+ if("1".equals(tabVlaue)||"2".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);
+ }
}
}
} catch (Exception e) {
--
Gitblit v1.9.3