From 5af1f5cf615811334009eaf39dc7eb9e30ad96e0 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 21 十二月 2023 11:50:43 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java | 38 +++++++++++++++++++++-----------------
1 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java
index f601cbb..8e82383 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java
@@ -66,16 +66,16 @@
}
// 璋冪敤鏂规硶锛岃繘琛岃祴鍊�
- this.readValue();
- String PlcAddress = this.name;
- Integer Plccount = this.count;
+// this.readValue();
+// String PlcAddress = this.name;
+// Integer Plccount = this.count;
// System.out.println(PlcAddress);
- // List<Boolean> paramlist = S7control.getinstance().ReadBits("DB2.0.0", 26);
- Boolean[] values = { false, true, true, true, true, true, true, true, true,
- true, true, true, true, true, true, true, true, true, true, true, true, true, true,
- true, false, true };
- List<Boolean> paramlist = new ArrayList<>(Arrays.asList(values));
+ List<Boolean> paramlist = S7control.getinstance().ReadBits("DB102.0.0", 10);
+// Boolean[] values = { false, true, true, true, true, true, true, true, true,
+// true, true, true, true, true, true, true, true, true, true, true, true, true, true,
+// true, false, true };
+// List<Boolean> paramlist = new ArrayList<>(Arrays.asList(values));
if (paramlist != null) {
@@ -88,16 +88,18 @@
JSONObject jsonObject = new JSONObject();
jsonObject.append("params", params);
- WebSocketServer sendwServer = WebSocketServer.sessionMap.get("action");
- if (sendwServer != null) {
- sendwServer.sendMessage(jsonObject.toString());
- }
- }
- WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("action");
- if (webSocketServer != null) {
- List<String> messages = webSocketServer.getMessages();
+
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("action");
+ if (sendwServer != null) {
+ for (WebSocketServer webserver : sendwServer) {
+ webserver.sendMessage(jsonObject.toString());
+
+
+
+
+ List<String> messages = webserver.getMessages();
String addressList = "DB2.0.0";
@@ -130,8 +132,10 @@
System.out.println("messageValues锛�" + messageBooleans);
System.out.println("addressList锛�" + addressList);
// 娓呯┖娑堟伅鍒楄〃
- webSocketServer.clearMessages();
+ webserver.clearMessages();
}
+ }
+ }
}
}
}
--
Gitblit v1.8.0