From 7ae7bcc0245afa4d94516feddc2b8bd60e4253c6 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 11 十二月 2023 10:25:02 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java | 41 +++++++++++++++++++++++------------------
1 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java
index b12538f..1d685d8 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java
@@ -84,10 +84,10 @@
addresses4.add("DB103.40");
List<Short> arraylist4 = S7control.getinstance().readWords(addresses4);
- List<Short> arraylist5 = S7control.getinstance().ReadWord("DB103.40", 1);
- List<Short> arraylist6 = S7control.getinstance().ReadWord("DB103.44", 1);
- List<Short> arraylist7 = S7control.getinstance().ReadWord("DB103.48", 1);
- List<Short> arraylist8 = S7control.getinstance().ReadWord("DB103.50", 1);
+ List<Short> arraylist5 = S7control.getinstance().ReadWord("DB106.0", 1);
+ List<Short> arraylist6 = S7control.getinstance().ReadWord("DB106.12", 1);
+ List<Short> arraylist7 = S7control.getinstance().ReadWord("DB106.40", 1);
+ List<Short> arraylist8 = S7control.getinstance().ReadWord("DB106.50", 1);
List<String> addresses9 = new ArrayList<>();
addresses9.add("DB104.1.2");
addresses9.add("DB104.1.3");
@@ -116,7 +116,7 @@
List<Boolean> B01readstart = S7control.getinstance().readBits(B01start);
List<Boolean> B02readstart = S7control.getinstance().readBits(B02start);
- short[] combinedBinaryShortArray = PlcManualonePosition.PLCBooleanConverter.convertListsToBinaryShortArray(
+ short[] combinedBinaryShortArray = PLCBooleanConverter.convertListsToBinaryShortArray(
A01readstart, A02readstart,B01readstart, B02readstart
);
@@ -167,14 +167,19 @@
jsonObject.append("weihuiling", params3);
jsonObject.append("qidong", combinedBinaryShortArray);
- WebSocketServer sendwServer = WebSocketServer.sessionMap.get("ManualonePosition");
- if (sendwServer != null) {
- sendwServer.sendMessage(jsonObject.toString());
- }
+// WebSocketServer sendwServer = WebSocketServer.sessionMap.get("ManualonePosition");
+// if (sendwServer != null) {
+// sendwServer.sendMessage(jsonObject.toString());
+// }
- WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("ManualonePosition");
- if (webSocketServer != null) {
- List<String> messages = webSocketServer.getMessages();
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("ManualonePosition");
+ if (sendwServer != null) {
+ for (WebSocketServer webserver : sendwServer) {
+ webserver.sendMessage(jsonObject.toString());
+
+// WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("ManualonePosition");
+ if (webserver != null) {
+ List<String> messages = webserver.getMessages();
List<String> waddresses1 = new ArrayList<>();
waddresses1.add("DB100.108");
waddresses1.add("DB100.20");
@@ -183,12 +188,12 @@
List<String> waddresses2 = new ArrayList<>();
waddresses2.add("DB100.110");
waddresses2.add("DB100.176");
- waddresses2.add("DB103.34");
+ waddresses2.add("DB103.34");
List<String> waddresses3 = new ArrayList<>();
waddresses3.add("DB100.112");
waddresses3.add("DB100.24");
- waddresses3.add("DB103.36");
+ waddresses3.add("DB103.36");
List<String> waddresses4 = new ArrayList<>();
waddresses4.add("DB100.114");
@@ -252,8 +257,8 @@
}
// 鍐欏叆鏂扮殑浣嶅�煎垪琛�
S7control.getinstance().WriteBit(A01start, a01startval);
+ System.out.println("a01startval " + a01startval + " written to PLC at address " + A01start);
}
-
System.out.println("Values " + sValue + " written to PLC at address " + waddresses1);
@@ -262,7 +267,7 @@
// 鍐欏叆A02
- if ( messageArray.getJSONArray(1).size() > 0) {
+ if (messageArray.getJSONArray(1).size() > 0) {
JSONArray jsonArray = messageArray.getJSONArray(1);
List<Short> sValue2 = new ArrayList<>();
for (int i = 0; i < jsonArray.size(); i++) {
@@ -292,7 +297,6 @@
// 鍐欏叆鏂扮殑浣嶅�煎垪琛�
S7control.getinstance().WriteBit(A02start, a02startval);
}
-
System.out.println("Values " + sValue2 + " written to PLC at address " + waddresses2);
@@ -443,8 +447,9 @@
}
// 娓呯┖娑堟伅鍒楄〃
- webSocketServer.clearMessages();
+ webserver.clearMessages();
}
+ }}
}
}
}
--
Gitblit v1.8.0