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/PlcParameter2.java | 36 ++++++++++++++++++++----------------
1 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java
index 6a4a0e7..eb37fda 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java
@@ -10,6 +10,7 @@
import java.util.Collections;
import java.util.List;
+
public class PlcParameter2 extends Thread {
String name = "";
Integer count = 0;
@@ -68,7 +69,7 @@
e.printStackTrace();
}
- // 鎵嬪姩鐘舵�佸湴鍧�
+ // 鎵嬪姩鐘舵�佸湴鍧�
List<String> addressList1 = new ArrayList<>();
addressList1.add("DB103.44");//D01
@@ -136,10 +137,10 @@
List<String> data3 = S7control.getinstance().readStrings(addressList3);
// A01 A02 B01 B02
List<String> addresses4 = new ArrayList<>();
- addresses4.add("DB103.52");
- addresses4.add("DB103.54");
- addresses4.add("DB103.56");
- addresses4.add("DB103.60");
+ addresses4.add("DB103.32");
+ addresses4.add("DB103.34");
+ addresses4.add("DB103.36");
+ addresses4.add("DB103.40");
List<Short> data4 = S7control.getinstance().readWords(addresses4);
@@ -186,15 +187,16 @@
jsonObject.append("jiting", anniuparams);
- WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Parameter2");
- if (sendwServer != null) {
- sendwServer.sendMessage(jsonObject.toString());
- }
- WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("Parameter2");
- if (webSocketServer != null) {
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("Parameter2");
+ if (sendwServer != null) {
+ for (WebSocketServer webserver : sendwServer) {
+ webserver.sendMessage(jsonObject.toString());
- List<String> messages = webSocketServer.getMessages();
+
+
+
+ List<String> messages = webserver.getMessages();
List<String> addressList = new ArrayList<>();
addressList.add("DB101.9.2");
@@ -234,7 +236,7 @@
}
}
if (!sValue3.isEmpty()) {
- S7control.getinstance().WriteBit(addressList, sValue3);
+ S7control.getinstance().WriteBit(addressList, sValue3);
System.out.println("Values " + sValue3 + " written to PLC at address " + sValue3);
}
}
@@ -257,7 +259,7 @@
}
}
if (!sValue3.isEmpty()) {
- S7control.getinstance().WriteBit(niuanaddressList3, sValue3);
+ S7control.getinstance().WriteBit(niuanaddressList3, sValue3);
System.out.println("Values " + sValue3 + " written to PLC at address " + sValue3);
}
@@ -265,9 +267,11 @@
// 娓呯┖娑堟伅鍒楄〃
- webSocketServer.clearMessages();
+ webserver.clearMessages();
}
}
+ }
+ }
}
}
-}
+
--
Gitblit v1.8.0