From c0b596275d583b0874e501f49a90e7a1dfd879e3 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 09 五月 2024 09:37:48 +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 | 266 ++++++++++++++++++++++++----------------------------
1 files changed, 123 insertions(+), 143 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 d6f44b4..8862fa0 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
@@ -2,6 +2,8 @@
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+
import org.apache.commons.io.FileUtils;
import java.io.*;
@@ -9,153 +11,91 @@
import java.util.Arrays;
import java.util.List;
+@Slf4j
public class PLCAutomaticParameterSetting extends Thread {
+
+ // 鐢ㄤ簬瀛樺偍搴旂敤绋嬪簭鐨勯厤缃俊鎭�
+ private Configuration config;
// 鍒涘缓涓�涓嚜瀹氫箟鐨� S7 鎺у埗鍣ㄦ秷鎭鐞嗗櫒瀵硅薄
MessageHandler customS7Control = new MessageHandler();
+
+ public PLCAutomaticParameterSetting() throws IOException {
+ config = new Configuration("config.properties");
+ }
+
@Override
public void run() {
while (this != null) {
try {
Thread.sleep(1000);
+ // System.out.println(stt);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
+ 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);
+ List<String> addresses = Arrays.asList(config.getProperty("Auto.addresses").split(","));
+ List<Short> arraylist2 = S7control.getinstance().readWords(addresses);
+ // System.out.println("lastMessage锛�" + arraylist2);
+ // 缈昏浆
+ List<Short> fanzhuan2 = S7control.getinstance().ReadWord("DB100.8", 1);
+ List<Short> xiaoche2 = S7control.getinstance().ReadWord("DB100.12", 1);
+ // System.out.println("messageValue锛�"+ arraylist );
- // 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);
- List<String> addresses = new ArrayList<>();
- addresses.add("DB100.0");
- addresses.add("DB100.2");
- addresses.add("DB100.4");
- addresses.add("DB100.6");
- addresses.add("DB100.26");
- addresses.add("DB100.28");
- addresses.add("DB100.30");
- addresses.add("DB100.32");
- addresses.add("DB100.34");
- addresses.add("DB100.36");
- addresses.add("DB100.38");
- addresses.add("DB100.40");
- List<Short> arraylist2 = S7control.getinstance().readWords(addresses);
-//缈昏浆
- List<Short> fanzhuan2 = S7control.getinstance().ReadWord("DB100.8", 1);
- List<Short> xiaoche2 = S7control.getinstance().ReadWord("DB100.12", 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));
+ //
+ // Short[] values2 = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 };
+ // List<Short> arraylist2 = new ArrayList<>(Arrays.asList(values2));
+ // Short[] fanzhuan22 = { 4 };
+ // List<Short> fanzhuan2 = new ArrayList<>(Arrays.asList(fanzhuan22));
+ // Short[] xiaoche22 = {5};
+ // List<Short> xiaoche2 = new ArrayList<>(Arrays.asList(xiaoche22));
+ JSONObject jsonObject = new JSONObject();
+ // new short[]{1,1, 1, 1, 1, 1, 2, 33, 2,3, 4, 5}
+ // new short[]{0,0, 0, 0, 0, 0, 0, 0, 0, 0}
-// 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));
-//
-// Short[] values2 = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 };
-// List<Short> arraylist2 = new ArrayList<>(Arrays.asList(values2));
-// Short[] fanzhuan22 = { 4 };
-// List<Short> fanzhuan2 = new ArrayList<>(Arrays.asList(fanzhuan22));
-// Short[] xiaoche22 = {5};
-// List<Short> xiaoche2 = new ArrayList<>(Arrays.asList(xiaoche22));
+ jsonObject.append("params", arraylist);
+ jsonObject.append("dache1", dache1);
+ jsonObject.append("xiaoche", xiaoche1);
+ jsonObject.append("fanzhuan", fanzhuan1);
+ jsonObject.append("params2", arraylist2);
+ jsonObject.append("fanzhuan2", fanzhuan2);
+ jsonObject.append("xiaoche2", xiaoche2);
- JSONObject jsonObject = new JSONObject();
- // new short[]{1,1, 1, 1, 1, 1, 2, 33, 2,3, 4, 5}
- // new short[]{0,0, 0, 0, 0, 0, 0, 0, 0, 0}
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("AutomaticParameterSetting");
+ if (sendwServer != null) {
+ for (WebSocketServer webserver : sendwServer) {
+
- jsonObject.append("params", arraylist);
- jsonObject.append("dache1", dache1);
- jsonObject.append("xiaoche", xiaoche1);
- jsonObject.append("fanzhuan", fanzhuan1);
- jsonObject.append("params2", arraylist2);
- jsonObject.append("fanzhuan2", fanzhuan2);
- jsonObject.append("xiaoche2", xiaoche2);
-
- ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("AutomaticParameterSetting");
- if (sendwServer != null) {
- for (WebSocketServer webserver : sendwServer) {
- webserver.sendMessage(jsonObject.toString());
-
-// 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";
- String addressList4 = "DB100.14";
-
- if (!messages.isEmpty()) {
- // 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
- String lastMessage = messages.get(messages.size() - 1);
- // System.out.println("lastMessage锛�" + lastMessage);
- JSONArray messageArray = new JSONArray(lastMessage);
-
- // 鏁村悎绗� 1 鍒� 2 涓暟缁勫苟鍘绘帀 null 鍏冪礌
- List<Short> mergedList = new ArrayList<>();
- for (int i = 0; i < 2; i++) {
- JSONArray sublist = messageArray.getJSONArray(i);
- for (int j = 0; j < sublist.size(); j++) {
- Object value = sublist.get(j);
- if (value != null && !value.toString().equals("null")) {
- try {
- String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
- short sValue = Short.parseShort(cleanedValue.trim());
- mergedList.add(sValue);
- } catch (NumberFormatException e) {
- // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
- System.err.println("Could not parse value: " + value);
- }
- }
- }
- }
- System.out.println(messageArray);
- // 鍐欏叆绗竴涓湴鍧�
- customS7Control.WriteWordsToPLC(messageArray, addressList2,2);
-
- // 鍐欏叆绗簩涓湴鍧�
- customS7Control.WriteWordsToPLC(messageArray, addressList3,3);
-
-
- // 鍐欏叆绗笁涓湴鍧�
- customS7Control.WriteWordsToPLC(messageArray, addressList4,4);
-
-
- // 鍐欏叆绗洓涓湴鍧�
- if (!mergedList.isEmpty()) {
- S7control.getinstance().WriteWord(addressList1, mergedList);
- System.out.println("messageValue锛�" + mergedList + " written to PLC at address " + addressList1);
- }
-
-
- List<String> waddresses1 = new ArrayList<>();
- waddresses1.add("DB100.0");
- waddresses1.add("DB100.2");
- waddresses1.add("DB100.4");
- waddresses1.add("DB100.6");
- waddresses1.add("DB100.26");
- waddresses1.add("DB100.28");
- waddresses1.add("DB100.30");
- waddresses1.add("DB100.32");
- waddresses1.add("DB100.34");
- waddresses1.add("DB100.36");
- waddresses1.add("DB100.38");
- waddresses1.add("DB100.40");
-
- String addressList22 = "DB100.8";
- String addressList33 = "DB100.12";
+ // WebSocketServer webSocketServer =
+ // WebSocketServer.sessionMap.get("AutomaticParameterSetting");
+ if (webserver != null&&webserver.session.isOpen()) {
+ webserver.sendMessage(jsonObject.toString());
+ List<String> messages = webserver.getMessages();
+ String addressList1 = "DB100.120";
+ String addressList2 = "DB100.18";
+ String addressList3 = "DB100.22";
+ String addressList4 = "DB100.14";
if (!messages.isEmpty()) {
// 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
+ String lastMessage = messages.get(messages.size() - 1);
+ // System.out.println("lastMessage锛�" + lastMessage);
+ JSONArray messageArray = new JSONArray(lastMessage);
-
- // 鏁村悎绗� 1 鍒� 3 涓暟缁勫苟鍘绘帀 null 鍏冪礌
- List<Short> mergedList2 = new ArrayList<>();
- for (int i = 5; i < 8; i++) {
+ // 鏁村悎绗� 1 鍒� 2 涓暟缁勫苟鍘绘帀 null 鍏冪礌
+ List<Short> mergedList = new ArrayList<>();
+ for (int i = 0; i < 2; i++) {
JSONArray sublist = messageArray.getJSONArray(i);
for (int j = 0; j < sublist.size(); j++) {
Object value = sublist.get(j);
@@ -163,7 +103,7 @@
try {
String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
short sValue = Short.parseShort(cleanedValue.trim());
- mergedList2.add(sValue);
+ mergedList.add(sValue);
} catch (NumberFormatException e) {
// 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
System.err.println("Could not parse value: " + value);
@@ -171,28 +111,68 @@
}
}
}
-
- // 鍐欏叆绗紞涓湴鍧�
- customS7Control.WriteWordsToPLC(messageArray, addressList22,8);
-
-
- // 鍐欏叆绗叚涓湴鍧�
- customS7Control.WriteWordsToPLC(messageArray, addressList33,9);
-
- // 鍐欏叆绗竷涓湴鍧�
- if (!mergedList2.isEmpty()) {
- S7control.getinstance().WriteWord(waddresses1, mergedList2);
- System.out.println("messageValue锛�" + mergedList2 + " written to PLC at address " + waddresses1);
+ System.out.println(messageArray);
+ // 鍐欏叆绗竴涓湴鍧�
+ customS7Control.WriteWordsToPLC(messageArray, addressList2, 2);
+ // 鍐欏叆绗簩涓湴鍧�
+ customS7Control.WriteWordsToPLC(messageArray, addressList3, 3);
+ // 鍐欏叆绗笁涓湴鍧�
+ customS7Control.WriteWordsToPLC(messageArray, addressList4, 4);
+ // 鍐欏叆绗洓涓湴鍧�
+ if (!mergedList.isEmpty()) {
+ S7control.getinstance().WriteWord(addressList1, mergedList);
+ System.out.println("messageValue锛�" + mergedList + " written to PLC at address " + addressList1);
}
+ List<String> waddresses1 = Arrays.asList(config.getProperty("Auto.shusong").split(","));
+ String addressList22 = "DB100.8";
+ String addressList33 = "DB100.12";
+ if (!messages.isEmpty()) {
+ // 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
+ // 鏁村悎绗� 1 鍒� 3 涓暟缁勫苟鍘绘帀 null 鍏冪礌
+ List<Short> mergedList2 = new ArrayList<>();
+ for (int i = 5; i < 8; i++) {
+ JSONArray sublist = messageArray.getJSONArray(i);
+ for (int j = 0; j < sublist.size(); j++) {
+ Object value = sublist.get(j);
+ if (value != null && !value.toString().equals("null")) {
+ try {
+ String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
+ short sValue = Short.parseShort(cleanedValue.trim());
+ mergedList2.add(sValue);
+ } catch (NumberFormatException e) {
+ // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+ System.err.println("Could not parse value: " + value);
+ }
+ }
+ }
+ }
- // 娓呯┖娑堟伅鍒楄〃
- webserver.clearMessages();
+ // 鍐欏叆绗紞涓湴鍧�
+ customS7Control.WriteWordsToPLC(messageArray, addressList22, 8);
+ // 鍐欏叆绗叚涓湴鍧�
+ customS7Control.WriteWordsToPLC(messageArray, addressList33, 9);
+ // 鍐欏叆绗竷涓湴鍧�
+ if (!mergedList2.isEmpty()) {
+ S7control.getinstance().WriteWord(waddresses1, mergedList2);
+ System.out.println("messageValue锛�" + mergedList2 + " written to PLC at address " + waddresses1);
+ }
+ //鍘熺偣璁板繂
+
+
+ // 娓呯┖娑堟伅鍒楄〃
+ webserver.clearMessages();
+ }
}
}
+ else{
+ log.info("AutomaticParameterSetting is closed");
+ }
}
-
}
+
+ } catch (InterruptedException e) {
+ e.printStackTrace();
}
}
--
Gitblit v1.8.0