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/PlcManualonePosition2.java | 385 +++++++++++++++++++++++++++++-------------------------
1 files changed, 205 insertions(+), 180 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition2.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition2.java
index 61e8c6f..51b0640 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition2.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition2.java
@@ -10,52 +10,41 @@
import java.util.List;
public class PlcManualonePosition2 extends Thread {
- String name = "";
- Integer count = 0;
+ private Configuration config;
- public static String readFileToString(String filePath) throws IOException {
- File file = new File(filePath);
- return FileUtils.readFileToString(file, "UTF-8");
+ public PlcManualonePosition2() throws IOException {
+ config = new Configuration("config.properties");
}
- public void readValue() {
- String str = "";
- BufferedReader bufferedReader = null;
- FileInputStream fileInputStream;
- try {
- // 浠庢枃浠朵腑璇诲彇瀛楄妭鏁版嵁瀛樺叆 fileInputStream
- fileInputStream = new FileInputStream("CanadaMes-ui/src/configuration/address.json");
- // 璇诲彇 fileInputStream 涓瓧鑺傚苟灏嗗叾瑙ｇ爜涓哄瓧绗�
- InputStreamReader inputStreamReader = new InputStreamReader(fileInputStream, "utf-8");
- // 鎻愰珮璇诲彇鏁堢巼锛屽湪 BufferedReader 鍐呭寘瑁� InputStreamReader
- bufferedReader = new BufferedReader(inputStreamReader);
- String line = null;
- // 灏� bufferedReader 鍐呭涓�琛屼竴琛岃祴鍊肩粰str
- while ((line = bufferedReader.readLine()) != null) {
- str += line;
+ public static class PLCBooleanConverter {
+
+ public static short[] convertListsToBinaryShortArray(List<Boolean>... lists) {
+ // 璁＄畻鎵�鏈夊垪琛ㄤ腑鍏冪礌鐨勬�绘暟
+ int totalSize = 0;
+ for (List<Boolean> list : lists) {
+ totalSize += list.size();
}
- // 灏唖tr瀛楃涓叉牸寮忚浆涓簀son
- JSONObject jsonObject = new JSONObject(str);
+ // 鍒涘缓涓�涓冻澶熷ぇ鐨勬暟缁勬潵瀛樻斁鎵�鏈夌殑浜岃繘鍒跺��
+ short[] binaryShortArray = new short[totalSize];
- // 鑾峰彇json涓殑鍊�
- JSONArray address = jsonObject.getJSONArray("ServoManualone");
- for (int i = 0; i < address.size(); i++) {
- JSONObject ress = (JSONObject) address.get(i);
+ // 褰撳墠鏁扮粍濉厖浣嶇疆鎸囬拡
+ int currentIndex = 0;
- this.name = ress.getStr("name");
- this.count = ress.getInt("count");
-
+ // 閬嶅巻鎵�鏈夌殑鍒楄〃
+ for (List<Boolean> list : lists) {
+ // 灏嗘瘡涓竷灏斿�艰浆鎹负 0 鎴� 1 骞跺～鍏ユ暟缁�
+ for (Boolean value : list) {
+ binaryShortArray[currentIndex++] = (short) (value ? 1 : 0);
+ }
}
- } catch (FileNotFoundException e) {
- e.printStackTrace();
- } catch (UnsupportedEncodingException e) {
- e.printStackTrace();
- } catch (IOException e) {
- e.printStackTrace();
+ return binaryShortArray;
}
}
+
+
+
@Override
public void run() {
@@ -120,184 +109,220 @@
params3[i] = value ? (short) 1 : (short) 0;
}
+
+
+ //A01鍚姩鍦板潃
+ List<String> A01start = Arrays.asList(config.getProperty("mlp2.A01start"));
+ //A02鍚姩鍦板潃
+ List<String> A02start = Arrays.asList(config.getProperty("mlp2.A02start"));
+
+
+
+ List<Boolean> A01readstart = S7control.getinstance().readBits(A01start);
+ List<Boolean> A02readstart = S7control.getinstance().readBits(A02start);
+
+
+ short[] combinedBinaryShortArray = PLCBooleanConverter.convertListsToBinaryShortArray(
+ A01readstart, A02readstart
+ );
+
JSONObject jsonObject = new JSONObject();
jsonObject.append("zuhe1", arraylist);
jsonObject.append("zuhe2", arraylist2);
jsonObject.append("guzhang", params2);
jsonObject.append("weihuiling", params3);
+ jsonObject.append("qidong", combinedBinaryShortArray);
// System.out.println(jsonObject);
- WebSocketServer sendwServer = WebSocketServer.sessionMap.get("ManualonePosition2");
+// WebSocketServer sendwServer = WebSocketServer.sessionMap.get("ManualonePosition2");
+// if (sendwServer != null) {
+// sendwServer.sendMessage(jsonObject.toString());
+// }
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("ManualonePosition2");
if (sendwServer != null) {
- sendwServer.sendMessage(jsonObject.toString());
- }
+ for (WebSocketServer webserver : sendwServer) {
+ webserver.sendMessage(jsonObject.toString());
- WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("ManualonePosition2");
- if (webSocketServer != null) {
- List<String> messages = webSocketServer.getMessages();
- List<String> waddresses1 = new ArrayList<>();
- waddresses1.add("DB100.116");
- waddresses1.add("DB100.16");
+// WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("ManualonePosition2");
+ if (webserver != null) {
+ List<String> messages = webserver.getMessages();
+ List<String> waddresses1 = new ArrayList<>();
+ waddresses1.add("DB100.116");
+ waddresses1.add("DB100.16");
- List<String> waddresses2 = new ArrayList<>();
- waddresses2.add("DB100.118");
- waddresses2.add("DB100.192");
+ List<String> waddresses2 = new ArrayList<>();
+ waddresses2.add("DB100.118");
+ waddresses2.add("DB100.192");
- // 鏁呴殰鍦板潃
- List<String> waddresses3 = new ArrayList<>();
- waddresses3.add("DB103.242");
- waddresses3.add("DB103.248");
+ // 鏁呴殰鍦板潃
+ List<String> waddresses3 = new ArrayList<>();
+ waddresses3.add("DB103.242");
+ waddresses3.add("DB103.248");
- // 澶嶄綅鍦板潃
- List<String> waddresses4 = new ArrayList<>();
- waddresses4.add("DB101.3.6");
- waddresses4.add("DB101.4.1");
+ // 澶嶄綅鍦板潃
+ List<String> waddresses4 = new ArrayList<>();
+ waddresses4.add("DB101.3.6");
+ waddresses4.add("DB101.4.1");
- // 鍥為浂鍦板潃
- List<String> waddresses5 = new ArrayList<>();
- waddresses5.add("DB101.3.7");
- waddresses5.add("DB101.4.2");
+ // 鍥為浂鍦板潃
+ List<String> waddresses5 = new ArrayList<>();
+ waddresses5.add("DB101.3.7");
+ waddresses5.add("DB101.4.2");
- if (!messages.isEmpty()) {
- // 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
- String lastMessage = messages.get(messages.size() - 1);
- // System.out.println("lastMessage锛�" + lastMessage);
- JSONArray messageArray = new JSONArray(lastMessage);
+ if (!messages.isEmpty()) {
+ // 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
+ String lastMessage = messages.get(messages.size() - 1);
+ // System.out.println("lastMessage锛�" + lastMessage);
+ JSONArray messageArray = new JSONArray(lastMessage);
- // A01涓嬪彂
- if (messageArray.getJSONArray(0).size() > 0) {
- JSONArray jsonArray = messageArray.getJSONArray(0);
- List<Short> sValue = new ArrayList<>();
- for (int i = 0; i < jsonArray.size(); i++) {
- Object value = jsonArray.get(i);
- if (value != null && !value.toString().equals("null")) {
- try {
- String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
- short val = Short.parseShort(cleanedValue.trim());
- sValue.add(val);
- System.out.println("messageValue锛�" + Arrays.asList(val) + " added to the list");
- } catch (NumberFormatException e) {
- // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
- System.err.println("Could not parse value: " + value);
+ // A01涓嬪彂
+ if (messageArray.getJSONArray(0).size() > 0) {
+ JSONArray jsonArray = messageArray.getJSONArray(0);
+ List<Short> sValue = new ArrayList<>();
+ for (int i = 0; i < jsonArray.size(); i++) {
+ Object value = jsonArray.get(i);
+ if (value != null && !value.toString().equals("null")) {
+ try {
+ String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
+ short val = Short.parseShort(cleanedValue.trim());
+ sValue.add(val);
+ System.out.println("messageValue锛�" + Arrays.asList(val) + " added to the list");
+ } catch (NumberFormatException e) {
+ // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+ System.err.println("Could not parse value: " + value);
+ }
+ }
+ }
+ if (!sValue.isEmpty()) {
+ S7control.getinstance().WriteWord(waddresses1, sValue);
+ if (A01readstart != null && !A01readstart.isEmpty()) {
+ // 鍒涘缓涓�涓柊鐨勫垪琛ㄧ敤浜庡啓鍏ユ柊鍊�
+ List<Boolean> a01startval = new ArrayList<>();
+ // 閬嶅巻鎵�鏈夎鍙栧埌鐨勪綅鍊�
+ for (Boolean bit : A01readstart) {
+ // 鍙栧弽褰撳墠浣嶇殑鍊煎苟娣诲姞鍒版柊鐨勫垪琛ㄤ腑
+ a01startval.add(!bit);
+ }
+ // 鍐欏叆鏂扮殑浣嶅�煎垪琛�
+ S7control.getinstance().WriteBit(A01start, a01startval);
+ }
+ System.out.println("Values " + sValue + " written to PLC at address " + waddresses1);
}
}
- }
- if (!sValue.isEmpty()) {
- S7control.getinstance().WriteWord(waddresses1, sValue);
- List<String> A01start = new ArrayList<>();
- A01start.add("DB101.2.0");
- Boolean[] a01values7 = { true};
- List<Boolean> a01startval = new ArrayList<>(Arrays.asList(a01values7));
- S7control.getinstance().WriteBit(A01start, a01startval);
- System.out.println("Values " + sValue + " written to PLC at address " + waddresses1);
- }
- }
- // A02涓嬪彂
- if (messageArray.getJSONArray(1).size() > 0) {
- JSONArray jsonArray = messageArray.getJSONArray(1);
- List<Short> sValue2 = new ArrayList<>();
- for (int i = 0; i < jsonArray.size(); i++) {
- Object value = jsonArray.get(i);
- if (value != null && !value.toString().equals("null")) {
- try {
- String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
- short val = Short.parseShort(cleanedValue.trim());
- sValue2.add(val);
- System.out.println("messageValue锛�" + Arrays.asList(val) + " added to the list");
- } catch (NumberFormatException e) {
- // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
- System.err.println("Could not parse value: " + value);
+ // A02涓嬪彂
+ if (messageArray.getJSONArray(1).size() > 0) {
+ JSONArray jsonArray = messageArray.getJSONArray(1);
+ List<Short> sValue2 = new ArrayList<>();
+ for (int i = 0; i < jsonArray.size(); i++) {
+ Object value = jsonArray.get(i);
+ if (value != null && !value.toString().equals("null")) {
+ try {
+ String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
+ short val = Short.parseShort(cleanedValue.trim());
+ sValue2.add(val);
+ System.out.println("messageValue锛�" + Arrays.asList(val) + " added to the list");
+ } catch (NumberFormatException e) {
+ // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+ System.err.println("Could not parse value: " + value);
+ }
+ }
+ }
+ if (!sValue2.isEmpty()) {
+ S7control.getinstance().WriteWord(waddresses2, sValue2);
+ if (A02readstart != null && !A02readstart.isEmpty()) {
+ // 鍒涘缓涓�涓柊鐨勫垪琛ㄧ敤浜庡啓鍏ユ柊鍊�
+ List<Boolean> a02startval = new ArrayList<>();
+ // 閬嶅巻鎵�鏈夎鍙栧埌鐨勪綅鍊�
+ for (Boolean bit : A02readstart) {
+ // 鍙栧弽褰撳墠浣嶇殑鍊煎苟娣诲姞鍒版柊鐨勫垪琛ㄤ腑
+ a02startval.add(!bit);
+ }
+ // 鍐欏叆鏂扮殑浣嶅�煎垪琛�
+ S7control.getinstance().WriteBit(A02start, a02startval);
+ }
+ System.out.println("Values " + sValue2 + " written to PLC at address " + waddresses2);
}
}
- }
- if (!sValue2.isEmpty()) {
- S7control.getinstance().WriteWord(waddresses2, sValue2);
- List<String> A02start = new ArrayList<>();
- A02start.add("DB101.2.1");
- Boolean[] a02values7 = { true};
- List<Boolean> a01startval = new ArrayList<>(Arrays.asList(a02values7));
- S7control.getinstance().WriteBit(A02start, a01startval);
- System.out.println("Values " + sValue2 + " written to PLC at address " + waddresses2);
- }
- }
- // 鍐欏叆鏁呴殰鍦板潃
- if (messageArray.getJSONArray(2).size() > 0) {
- JSONArray jsonArray = messageArray.getJSONArray(2);
- List<Short> sValue2 = new ArrayList<>();
- for (int i = 0; i < jsonArray.size(); i++) {
- Object value = jsonArray.get(i);
- if (value != null && !value.toString().equals("null")) {
- try {
- String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
- short val = Short.parseShort(cleanedValue.trim());
- sValue2.add(val);
- System.out.println("messageValue锛�" + Arrays.asList(val) + " added to the list");
- } catch (NumberFormatException e) {
- // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
- System.err.println("Could not parse value: " + value);
+ // 鍐欏叆鏁呴殰鍦板潃
+ if (messageArray.getJSONArray(2).size() > 0) {
+ JSONArray jsonArray = messageArray.getJSONArray(2);
+ List<Short> sValue2 = new ArrayList<>();
+ for (int i = 0; i < jsonArray.size(); i++) {
+ Object value = jsonArray.get(i);
+ if (value != null && !value.toString().equals("null")) {
+ try {
+ String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
+ short val = Short.parseShort(cleanedValue.trim());
+ sValue2.add(val);
+ System.out.println("messageValue锛�" + Arrays.asList(val) + " added to the list");
+ } catch (NumberFormatException e) {
+ // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+ System.err.println("Could not parse value: " + value);
+ }
+ }
+ }
+ if (!sValue2.isEmpty()) {
+ S7control.getinstance().WriteWord(waddresses3, sValue2);
+ System.out.println("Values " + sValue2 + " written to PLC at address " + waddresses3);
}
}
- }
- if (!sValue2.isEmpty()) {
- S7control.getinstance().WriteWord(waddresses3, sValue2);
- System.out.println("Values " + sValue2 + " written to PLC at address " + waddresses3);
- }
- }
- // 鍐欏叆澶嶄綅鍦板潃
- if (messageArray.getJSONArray(3).size() > 0) {
- JSONArray jsonArray3 = messageArray.getJSONArray(3);
- 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 (messageArray.getJSONArray(3).size() > 0) {
+ JSONArray jsonArray3 = messageArray.getJSONArray(3);
+ 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(waddresses4, sValue3);
+ System.out.println("Values " + sValue3 + " written to PLC at address " + waddresses4);
}
}
- }
- if (!sValue3.isEmpty()) {
- S7control.getinstance().WriteBit(waddresses4, sValue3);
- System.out.println("Values " + sValue3 + " written to PLC at address " + waddresses4);
- }
- }
- // 鍐欏叆鍥為浂鍦板潃
- if (messageArray.getJSONArray(4).size() > 0) {
- JSONArray jsonArray3 = messageArray.getJSONArray(4);
- 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 (messageArray.getJSONArray(4).size() > 0) {
+ JSONArray jsonArray3 = messageArray.getJSONArray(4);
+ 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(waddresses5, sValue3);
+ System.out.println("Values " + sValue3 + " written to PLC at address " + waddresses5);
}
}
- }
- if (!sValue3.isEmpty()) {
- S7control.getinstance().WriteBit(waddresses5, sValue3);
- System.out.println("Values " + sValue3 + " written to PLC at address " + waddresses5);
+
+ // 娓呯┖娑堟伅鍒楄〃
+ webserver.clearMessages();
}
}
-
- // 娓呯┖娑堟伅鍒楄〃
- webSocketServer.clearMessages();
}
}
}
--
Gitblit v1.8.0