From 2a6d8a858ca7e41436548b35db147b5cdad4e4be Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 14 十二月 2023 14:08:17 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/Plcstate.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plcstate.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plcstate.java
index f644903..cf362da 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plcstate.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plcstate.java
@@ -70,6 +70,7 @@
// Integer Plccount = this.count;
// System.out.println(PlcAddress);
+ //璇诲彇鐘舵�佹暟鎹�
List<Short> plclist = S7control.getinstance().ReadWord("DB103.0", 44);
// Short[] values = { 0, 1, 1, 0, 1, 0, 1, 0,
// 1, 0, };
@@ -78,14 +79,20 @@
List<String> Intlist = new ArrayList<>();
for (Short value : plclist) {
- Intlist.add(value == 1 ? "鑷姩" : "鎵嬪姩");
+ Intlist.add(value == 1 ? "AUTO" : "Manual");
}
JSONObject jsonObject = new JSONObject();
jsonObject.append("sta", Intlist);
- WebSocketServer sendwServer = WebSocketServer.sessionMap.get("State");
+// WebSocketServer sendwServer = WebSocketServer.sessionMap.get("State");
+// if (sendwServer != null) {
+// sendwServer.sendMessage(jsonObject.toString());
+// }
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("State");
if (sendwServer != null) {
- sendwServer.sendMessage(jsonObject.toString());
+ for (WebSocketServer webserver : sendwServer) {
+ webserver.sendMessage(jsonObject.toString());
+ }
}
}
--
Gitblit v1.8.0