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/PLCAutomaticParameterSetting.java | 89 +++++++++++++++++++++++---------------------
1 files changed, 47 insertions(+), 42 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSetting.java b/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSetting.java
index f5d262f..15e3552 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSetting.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSetting.java
@@ -71,18 +71,18 @@
// Integer Plccount = this.count;
// System.out.println(stt);
- // List<Short> arraylist = S7control.getinstance().ReadWord("DB100.120", 8);
- // List<Short> dache1 = S7control.getinstance().ReadWord("DB100.18", 1);
- // List<Short> xiaoche1 = S7control.getinstance().ReadWord("DB100.22", 1);
- // List<Short> fanzhuan1 = S7control.getinstance().ReadWord("DB100.14", 1);
- Short[] values1 = { 1, 2, 3, 4, 5, 6, 7, 8 };
- List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
- Short[] fanzhuan = { 4 };
- List<Short> fanzhuan1 = new ArrayList<>(Arrays.asList(fanzhuan));
- Short[] dache = { 5 };
- List<Short> dache1 = new ArrayList<>(Arrays.asList(dache));
- Short[] xiaoche = { 6 };
- List<Short> xiaoche1 = new ArrayList<>(Arrays.asList(xiaoche));
+ List<Short> arraylist = S7control.getinstance().ReadWord("DB100.120", 8);
+ List<Short> dache1 = S7control.getinstance().ReadWord("DB100.18", 1);
+ List<Short> xiaoche1 = S7control.getinstance().ReadWord("DB100.22", 1);
+ List<Short> fanzhuan1 = S7control.getinstance().ReadWord("DB100.14", 1);
+ // Short[] values1 = { 1, 2, 3, 4, 5, 6, 7, 8 };
+ // List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
+ // Short[] fanzhuan = { 4 };
+ // List<Short> fanzhuan1 = new ArrayList<>(Arrays.asList(fanzhuan));
+ // Short[] dache = { 5 };
+ // List<Short> dache1 = new ArrayList<>(Arrays.asList(dache));
+ // Short[] xiaoche = { 6 };
+ // List<Short> xiaoche1 = new ArrayList<>(Arrays.asList(xiaoche));
JSONObject jsonObject = new JSONObject();
// new short[]{1,1, 1, 1, 1, 1, 2, 33, 2,3, 4, 5}
@@ -92,15 +92,19 @@
jsonObject.append("dache1", dache1);
jsonObject.append("xiaoche", xiaoche1);
jsonObject.append("fanzhuan", fanzhuan1);
-
- WebSocketServer sendwServer = WebSocketServer.sessionMap.get("AutomaticParameterSetting");
+//
+// WebSocketServer sendwServer = WebSocketServer.sessionMap.get("AutomaticParameterSetting");
+// if (sendwServer != null) {
+// sendwServer.sendMessage(jsonObject.toString());
+// }
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("AutomaticParameterSetting");
if (sendwServer != null) {
- sendwServer.sendMessage(jsonObject.toString());
- }
+ for (WebSocketServer webserver : sendwServer) {
+ webserver.sendMessage(jsonObject.toString());
- WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("AutomaticParameterSetting");
- if (webSocketServer != null) {
- List<String> messages = webSocketServer.getMessages();
+// WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("AutomaticParameterSetting");
+ if (webserver != null) {
+ List<String> messages = webserver.getMessages();
String addressList1 = "DB100.120";
String addressList2 = "DB100.18";
String addressList3 = "DB100.22";
@@ -138,9 +142,9 @@
try {
String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
short sValue = Short.parseShort(cleanedValue.trim());
- // S7control.getinstance().WriteWord(addressList1, Arrays.asList(sValue));
+ S7control.getinstance().WriteWord(addressList2, Arrays.asList(sValue));
System.out
- .println("messageValue锛�" + Arrays.asList(sValue) + " written to PLC at address " + addressList2);
+ .println("messageValue锛�" + Arrays.asList(sValue) + " written to PLC at address " + addressList2);
} catch (NumberFormatException e) {
// 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
System.err.println("Could not parse value: " + value);
@@ -155,26 +159,9 @@
try {
String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
short sValue = Short.parseShort(cleanedValue.trim());
- // S7control.getinstance().WriteWord(addressList2, Arrays.asList(sValue));
+ S7control.getinstance().WriteWord(addressList3, Arrays.asList(sValue));
System.out
- .println("messageValue锛�" + Arrays.asList(sValue) + " written to PLC at address " + addressList3);
- } catch (NumberFormatException e) {
- // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
- System.err.println("Could not parse value: " + value);
- }
- }
- }
-
- // 鍐欏叆绗簩涓湴鍧�
- if (messageArray.getJSONArray(4).size() > 0) {
- Object value = messageArray.getJSONArray(4).get(0);
- if (value != null && !value.toString().equals("null")) {
- try {
- String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
- short sValue = Short.parseShort(cleanedValue.trim());
- // S7control.getinstance().WriteWord(addressList2, Arrays.asList(sValue));
- System.out
- .println("messageValue锛�" + Arrays.asList(sValue) + " written to PLC at address " + addressList4);
+ .println("messageValue锛�" + Arrays.asList(sValue) + " written to PLC at address " + addressList3);
} catch (NumberFormatException e) {
// 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
System.err.println("Could not parse value: " + value);
@@ -183,14 +170,32 @@
}
// 鍐欏叆绗笁涓湴鍧�
+ if (messageArray.getJSONArray(4).size() > 0) {
+ Object value = messageArray.getJSONArray(4).get(0);
+ if (value != null && !value.toString().equals("null")) {
+ try {
+ String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
+ short sValue = Short.parseShort(cleanedValue.trim());
+ S7control.getinstance().WriteWord(addressList4, Arrays.asList(sValue));
+ System.out
+ .println("messageValue锛�" + Arrays.asList(sValue) + " written to PLC at address " + addressList4);
+ } catch (NumberFormatException e) {
+ // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+ System.err.println("Could not parse value: " + value);
+ }
+ }
+ }
+
+ // 鍐欏叆绗洓涓湴鍧�
if (!mergedList.isEmpty()) {
- // S7control.getinstance().WriteWord(addressList3, mergedList);
+ S7control.getinstance().WriteWord(addressList1, mergedList);
System.out.println("messageValue锛�" + mergedList + " written to PLC at address " + addressList1);
}
// 娓呯┖娑堟伅鍒楄〃
- webSocketServer.clearMessages();
+ webserver.clearMessages();
}
+ }}
}
--
Gitblit v1.8.0