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 | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 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 b3f749a..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
@@ -81,13 +81,12 @@
//杩涚珯淇濆瓨鏁版嵁
// 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");
//璇锋眰宸ュ崟
-
@@ -98,7 +97,13 @@
//璁板綍鏁版嵁瀹屾垚
String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(recordDataDoneValue).build());
- }else if("3".equals(tabVlaue)){
+ }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";
@@ -112,14 +117,7 @@
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("^");
-
}
-
-
-
-
}
}
} catch (Exception e) {
--
Gitblit v1.9.3