From f43c5acc73d15a6bc60d6a3cb66b6d750b257dc6 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 14 十二月 2023 09:05:23 +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 | 170 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 91 insertions(+), 79 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..361b818 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;
@@ -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);
@@ -151,7 +152,7 @@
-
+//
// String[] values6 = { ".x1 ","x2 ","x3",";;x4","x5","x6","x7","x8","x9","x10","x11"};
// List<String> paramlist = new ArrayList<>(Arrays.asList(values6));
// Short[] values1 = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1};
@@ -171,7 +172,7 @@
boolean value = data2.get(i);
params[i] = value ? (short) 1 : (short) 0;
}
-
+//
short[] anniuparams = new short[anniuread.size()];
for (int i = 0; i < anniuread.size(); i++) {
boolean value = anniuread.get(i);
@@ -183,91 +184,102 @@
jsonObject.append("params", data);
jsonObject.append("params", data3);
jsonObject.append("params", data4);
- jsonObject.append("jiting", anniuparams);
+ jsonObject.append("jiting", anniuparams);
- WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Parameter2");
- if (sendwServer != null) {
- sendwServer.sendMessage(jsonObject.toString());
- }
+// WebSocketServer sendwServer = WebSocketServer.getWebSocketServer("Parameter2");
+// if (sendwServer != null) {
+// JSONObject jsonObject = new JSONObject();
+// jsonObject.set("message", "Hello, Parameter2!");
+// 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) {
- List<String> messages = webSocketServer.getMessages();
- List<String> addressList = new ArrayList<>();
-
- addressList.add("DB101.9.2");
- addressList.add("DB101.9.3");
- addressList.add("DB101.9.4");
- addressList.add("DB101.9.5");
- addressList.add("DB101.9.6");
- addressList.add("DB101.9.7");
- addressList.add("DB101.10.0");
- addressList.add("DB101.10.1");
- addressList.add("DB101.10.2");
- addressList.add("DB101.10.3");
+ webserver.sendMessage(jsonObject.toString());
+ if (webserver != null) {
- if (!messages.isEmpty()) {
- // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
- String lastMessage = messages.get(messages.size() - 1);
+
+ List<String> messages = webserver.getMessages();
+ List<String> addressList = new ArrayList<>();
+
+ addressList.add("DB101.9.2");
+ addressList.add("DB101.9.3");
+ addressList.add("DB101.9.4");
+ addressList.add("DB101.9.5");
+ addressList.add("DB101.9.6");
+ addressList.add("DB101.9.7");
+ addressList.add("DB101.10.0");
+ addressList.add("DB101.10.1");
+ addressList.add("DB101.10.2");
+ addressList.add("DB101.10.3");
+
+
+ if (!messages.isEmpty()) {
+ // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
+ String lastMessage = messages.get(messages.size() - 1);
// System.out.println("lastMessage锛�" + lastMessage);
- JSONArray messageArray = new JSONArray(lastMessage);
+ JSONArray messageArray = new JSONArray(lastMessage);
- if (messageArray.getJSONArray(0).size() > 0) {
- JSONArray jsonArray3 = messageArray.getJSONArray(0);
- List<Boolean> sValue3 = new ArrayList<>();
- for (int i = 0; i < jsonArray3.size(); i++) {
- Object value = jsonArray3.get(i);
- if (value != null && !value.toString().equals("null")) {
- try {
- String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
- boolean val = "1".equals(cleanedValue.trim());
- sValue3.add(val);
- System.out.println("messageValue: " + Arrays.asList(val) + " added to the list");
- } catch (NumberFormatException e) {
- // 濡傛灉鏃犳硶瑙ｆ瀽涓� boolean 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
- System.err.println("Could not parse value: " + value);
- }
- }
- }
- if (!sValue3.isEmpty()) {
- S7control.getinstance().WriteBit(addressList, sValue3);
- System.out.println("Values " + sValue3 + " written to PLC at address " + sValue3);
- }
- }
- // 灏嗗竷灏斿垪琛ㄥ啓鍏� PLC
- if (messageArray.getJSONArray(1).size() > 0) {
- JSONArray jsonArray3 = messageArray.getJSONArray(1);
- List<Boolean> sValue3 = new ArrayList<>();
- for (int i = 0; i < jsonArray3.size(); i++) {
- Object value = jsonArray3.get(i);
- if (value != null && !value.toString().equals("null")) {
- try {
- String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
- boolean val = "1".equals(cleanedValue.trim());
- sValue3.add(val);
- System.out.println("messageValue: " + Arrays.asList(val) + " added to the list");
- } catch (NumberFormatException e) {
- // 濡傛灉鏃犳硶瑙ｆ瀽涓� boolean 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
- System.err.println("Could not parse value: " + value);
- }
- }
- }
- if (!sValue3.isEmpty()) {
- S7control.getinstance().WriteBit(niuanaddressList3, sValue3);
+ if (messageArray.getJSONArray(0).size() > 0) {
+ JSONArray jsonArray3 = messageArray.getJSONArray(0);
+ List<Boolean> sValue3 = new ArrayList<>();
+ for (int i = 0; i < jsonArray3.size(); i++) {
+ Object value = jsonArray3.get(i);
+ if (value != null && !value.toString().equals("null")) {
+ try {
+ String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
+ boolean val = "1".equals(cleanedValue.trim());
+ sValue3.add(val);
+ System.out.println("messageValue: " + Arrays.asList(val) + " added to the list");
+ } catch (NumberFormatException e) {
+ // 濡傛灉鏃犳硶瑙ｆ瀽涓� boolean 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+ System.err.println("Could not parse value: " + value);
+ }
+ }
+ }
+ if (!sValue3.isEmpty()) {
+ S7control.getinstance().WriteBit(addressList, sValue3);
+ System.out.println("Values " + sValue3 + " written to PLC at address " + addressList);
+ }
+ }
+ // 灏嗗竷灏斿垪琛ㄥ啓鍏� PLC
+ if (messageArray.getJSONArray(1).size() > 0) {
+ JSONArray jsonArray3 = messageArray.getJSONArray(1);
+ List<Boolean> sValue3 = new ArrayList<>();
+ for (int i = 0; i < jsonArray3.size(); i++) {
+ Object value = jsonArray3.get(i);
+ if (value != null && !value.toString().equals("null")) {
+ try {
+ String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
+ boolean val = "1".equals(cleanedValue.trim());
+ sValue3.add(val);
+ System.out.println("messageValue: " + Arrays.asList(val) + " added to the list");
+ } catch (NumberFormatException e) {
+ // 濡傛灉鏃犳硶瑙ｆ瀽涓� boolean 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+ System.err.println("Could not parse value: " + value);
+ }
+ }
+ }
+ if (!sValue3.isEmpty()) {
+ S7control.getinstance().WriteBit(niuanaddressList3, sValue3);
- System.out.println("Values " + sValue3 + " written to PLC at address " + sValue3);
- }
- }
+ System.out.println("Values " + sValue3 + " written to PLC at address " + sValue3);
+ }
+ }
- // 娓呯┖娑堟伅鍒楄〃
- webSocketServer.clearMessages();
- }
+ // 娓呯┖娑堟伅鍒楄〃
+ webserver.clearMessages();
+ }
+ }
+ }
+ }
}
}
}
-}
+
--
Gitblit v1.8.0