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/PLCManualJog.java | 189 ++++++++++++++++++++++++----------------------
1 files changed, 98 insertions(+), 91 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PLCManualJog.java b/springboot-vue3/src/main/java/com/example/springboot/component/PLCManualJog.java
index 1711970..a7d9579 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PLCManualJog.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PLCManualJog.java
@@ -125,109 +125,116 @@
jsonObject.append("params", params);
// System.out.println("messageValue锛�" + arraylist +"messageValue2锛�" + arraylist2 );
- WebSocketServer sendwServer = WebSocketServer.sessionMap.get("ManualJog");
+// WebSocketServer sendwServer = WebSocketServer.sessionMap.get("ManualJog");
+// if (sendwServer != null) {
+// sendwServer.sendMessage(jsonObject.toString());
+// }
+
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("ManualJog");
if (sendwServer != null) {
- sendwServer.sendMessage(jsonObject.toString());
- }
+ for (WebSocketServer webserver : sendwServer) {
+ webserver.sendMessage(jsonObject.toString());
- WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("ManualJog");
+// WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("ManualJog");
- if (webSocketServer != null) {
- // String addressList1 = "DB101.0.0";
+ if (webserver != null) {
+ // String addressList1 = "DB101.0.0";
// String addressList2 = "DB101.2.6";
- String addressList3 = "DB101.5.2";
+ String addressList3 = "DB101.5.2";
- List<String> addressList2 = new ArrayList<>();
- addressList2.add("DB101.2.6");
- addressList2.add("DB101.2.7");
- addressList2.add("DB101.3.0");
- addressList2.add("DB101.3.1");
- addressList2.add("DB101.3.2");
- addressList2.add("DB101.3.3");
- addressList2.add("DB101.3.4");
- addressList2.add("DB101.3.5");
+ List<String> addressList2 = new ArrayList<>();
+ addressList2.add("DB101.2.6");
+ addressList2.add("DB101.2.7");
+ addressList2.add("DB101.3.0");
+ addressList2.add("DB101.3.1");
+ addressList2.add("DB101.3.2");
+ addressList2.add("DB101.3.3");
+ addressList2.add("DB101.3.4");
+ addressList2.add("DB101.3.5");
- List<String> addressList211 = new ArrayList<>();
- addressList211.add("DB101.0.0");
- addressList211.add("DB101.0.1");
- addressList211.add("DB101.0.2");
- addressList211.add("DB101.0.3");
- addressList211.add("DB101.0.4");
- addressList211.add("DB101.0.5");
- addressList211.add("DB101.0.6");
- addressList211.add("DB101.0.7");
- addressList211.add("DB101.1.0");
- addressList211.add("DB101.1.1");
- addressList211.add("DB101.1.2");
- addressList211.add("DB101.1.3");
- addressList211.add("DB101.1.4");
- addressList211.add("DB101.1.5");
- addressList211.add("DB101.1.6");
- addressList211.add("DB101.1.7");
+ List<String> addressList211 = new ArrayList<>();
+ addressList211.add("DB101.0.0");
+ addressList211.add("DB101.0.1");
+ addressList211.add("DB101.0.2");
+ addressList211.add("DB101.0.3");
+ addressList211.add("DB101.0.4");
+ addressList211.add("DB101.0.5");
+ addressList211.add("DB101.0.6");
+ addressList211.add("DB101.0.7");
+ addressList211.add("DB101.1.0");
+ addressList211.add("DB101.1.1");
+ addressList211.add("DB101.1.2");
+ addressList211.add("DB101.1.3");
+ addressList211.add("DB101.1.4");
+ addressList211.add("DB101.1.5");
+ addressList211.add("DB101.1.6");
+ addressList211.add("DB101.1.7");
- List<String> addressList311 = new ArrayList<>();
- addressList311.add("DB101.5.2");
- addressList311.add("DB101.5.3");
+ List<String> addressList311 = new ArrayList<>();
+ addressList311.add("DB101.5.2");
+ addressList311.add("DB101.5.3");
- List<String> messages = webSocketServer.getMessages();
- if (!messages.isEmpty()) {
- // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
- String lastMessage = messages.get(messages.size() - 1);
- // System.out.println("messages锛�" + messages);
- String[] parts = lastMessage.split(",");
- List<Integer> messageValues = new ArrayList<>();
- for (String part : parts) {
- try {
- // 浣跨敤姝ｅ垯琛ㄨ揪寮忔竻闄ら潪鏁板瓧瀛楃
- String cleanedPart = part.replaceAll("[^0-9-]", "");
- Integer value = Integer.parseInt(cleanedPart.trim());
- messageValues.add(value);
- } catch (NumberFormatException e) {
- // 濡傛灉鏃犳硶瑙ｆ瀽涓烘暣鏁扮被鍨嬶紝鍒欏拷鐣ヨ閮ㄥ垎
- // e.printStackTrace();
+ List<String> messages = webserver.getMessages();
+ if (!messages.isEmpty()) {
+ // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
+ String lastMessage = messages.get(messages.size() - 1);
+ // System.out.println("messages锛�" + messages);
+ String[] parts = lastMessage.split(",");
+ List<Integer> messageValues = new ArrayList<>();
+ for (String part : parts) {
+ try {
+ // 浣跨敤姝ｅ垯琛ㄨ揪寮忔竻闄ら潪鏁板瓧瀛楃
+ String cleanedPart = part.replaceAll("[^0-9-]", "");
+ Integer value = Integer.parseInt(cleanedPart.trim());
+ messageValues.add(value);
+ } catch (NumberFormatException e) {
+ // 濡傛灉鏃犳硶瑙ｆ瀽涓烘暣鏁扮被鍨嬶紝鍒欏拷鐣ヨ閮ㄥ垎
+ // e.printStackTrace();
+ }
+
+ }
+ // 灏嗘秷鎭�艰浆鎹负甯冨皵鍒楄〃
+ List<Boolean> messageBooleans = new ArrayList<>();
+ for (Integer value : messageValues) {
+ messageBooleans.add(value == 1 ? true : false);
+ }
+ // System.out.println(messageBooleans);
+ List<Boolean> bolList = new ArrayList<>();
+ List<Boolean> bolList2 = new ArrayList<>();
+ List<Boolean> bolList3 = new ArrayList<>();
+
+ for (int i = 0; i < 16 && i < messageBooleans.size(); i++) {
+ bolList.add(messageBooleans.get(i));
+ }
+
+ for (int i = 16; i < 24 && i < messageBooleans.size(); i++) {
+ bolList2.add(messageBooleans.get(i));
+ }
+
+ for (int i = 24; i < 26 && i < messageBooleans.size(); i++) {
+ bolList3.add(messageBooleans.get(i));
+ }
+
+ // System.out.println(bolList);
+ // System.out.println(bolList2);
+ // System.out.println(bolList3);
+ if (!bolList.isEmpty()) {
+ S7control.getinstance().WriteBit(addressList211, bolList);
+ System.out.println("messageValue锛�" + bolList + " written to PLC at address " + addressList211);
+ }
+ if (!bolList2.isEmpty()) {
+ S7control.getinstance().WriteBit(addressList2, bolList2);
+ System.out.println("messageValue锛�" + bolList2 + " written to PLC at address " + addressList2);
+ }
+ if (!bolList3.isEmpty()) {
+ S7control.getinstance().WriteBit(addressList311, bolList3);
+ System.out.println("messageValue锛�" + bolList3 + " written to PLC at address " + addressList311);
+ }
+ webserver.clearMessages();
}
-
}
- // 灏嗘秷鎭�艰浆鎹负甯冨皵鍒楄〃
- List<Boolean> messageBooleans = new ArrayList<>();
- for (Integer value : messageValues) {
- messageBooleans.add(value == 1 ? true : false);
- }
- // System.out.println(messageBooleans);
- List<Boolean> bolList = new ArrayList<>();
- List<Boolean> bolList2 = new ArrayList<>();
- List<Boolean> bolList3 = new ArrayList<>();
-
- for (int i = 0; i < 16 && i < messageBooleans.size(); i++) {
- bolList.add(messageBooleans.get(i));
- }
-
- for (int i = 16; i < 24 && i < messageBooleans.size(); i++) {
- bolList2.add(messageBooleans.get(i));
- }
-
- for (int i = 24; i < 26 && i < messageBooleans.size(); i++) {
- bolList3.add(messageBooleans.get(i));
- }
-
- // System.out.println(bolList);
- // System.out.println(bolList2);
- // System.out.println(bolList3);
- if (!bolList.isEmpty()) {
- S7control.getinstance().WriteBit(addressList211, bolList);
- System.out.println("messageValue锛�" + bolList + " written to PLC at address " + addressList211);
- }
- if (!bolList2.isEmpty()) {
- S7control.getinstance().WriteBit(addressList2, bolList2);
- System.out.println("messageValue锛�" + bolList2 + " written to PLC at address " + addressList2);
- }
- if (!bolList3.isEmpty()) {
- S7control.getinstance().WriteBit(addressList311, bolList3);
- System.out.println("messageValue锛�" + bolList3 + " written to PLC at address " + addressList311);
- }
- webSocketServer.clearMessages();
}
}
--
Gitblit v1.8.0