From 7f1806c6a01318f3b1eff38da7c7c41ae82ff8c0 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 11 十二月 2023 13:19:52 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSetting.java | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSetting.java b/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSetting.java
index 376c834..15e3552 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSetting.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSetting.java
@@ -92,15 +92,19 @@
jsonObject.append("dache1", dache1);
jsonObject.append("xiaoche", xiaoche1);
jsonObject.append("fanzhuan", fanzhuan1);
-
- WebSocketServer sendwServer = WebSocketServer.sessionMap.get("AutomaticParameterSetting");
+//
+// WebSocketServer sendwServer = WebSocketServer.sessionMap.get("AutomaticParameterSetting");
+// if (sendwServer != null) {
+// sendwServer.sendMessage(jsonObject.toString());
+// }
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("AutomaticParameterSetting");
if (sendwServer != null) {
- sendwServer.sendMessage(jsonObject.toString());
- }
+ for (WebSocketServer webserver : sendwServer) {
+ webserver.sendMessage(jsonObject.toString());
- WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("AutomaticParameterSetting");
- if (webSocketServer != null) {
- List<String> messages = webSocketServer.getMessages();
+// WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("AutomaticParameterSetting");
+ if (webserver != null) {
+ List<String> messages = webserver.getMessages();
String addressList1 = "DB100.120";
String addressList2 = "DB100.18";
String addressList3 = "DB100.22";
@@ -140,7 +144,7 @@
short sValue = Short.parseShort(cleanedValue.trim());
S7control.getinstance().WriteWord(addressList2, Arrays.asList(sValue));
System.out
- .println("messageValue锛�" + Arrays.asList(sValue) + " written to PLC at address " + addressList2);
+ .println("messageValue锛�" + Arrays.asList(sValue) + " written to PLC at address " + addressList2);
} catch (NumberFormatException e) {
// 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
System.err.println("Could not parse value: " + value);
@@ -157,7 +161,7 @@
short sValue = Short.parseShort(cleanedValue.trim());
S7control.getinstance().WriteWord(addressList3, Arrays.asList(sValue));
System.out
- .println("messageValue锛�" + Arrays.asList(sValue) + " written to PLC at address " + addressList3);
+ .println("messageValue锛�" + Arrays.asList(sValue) + " written to PLC at address " + addressList3);
} catch (NumberFormatException e) {
// 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
System.err.println("Could not parse value: " + value);
@@ -174,7 +178,7 @@
short sValue = Short.parseShort(cleanedValue.trim());
S7control.getinstance().WriteWord(addressList4, Arrays.asList(sValue));
System.out
- .println("messageValue锛�" + Arrays.asList(sValue) + " written to PLC at address " + addressList4);
+ .println("messageValue锛�" + Arrays.asList(sValue) + " written to PLC at address " + addressList4);
} catch (NumberFormatException e) {
// 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
System.err.println("Could not parse value: " + value);
@@ -189,8 +193,9 @@
}
// 娓呯┖娑堟伅鍒楄〃
- webSocketServer.clearMessages();
+ webserver.clearMessages();
}
+ }}
}
--
Gitblit v1.8.0