From de6afc2ec06724885de7cc0eb8b8cad61f8c0b3b Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 07 十二月 2023 08:32:41 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcServoManualone.java | 336 +++++++++++++++++++++++--------------------------------
1 files changed, 142 insertions(+), 194 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcServoManualone.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcServoManualone.java
index 21ab755..4366a77 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcServoManualone.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcServoManualone.java
@@ -11,40 +11,43 @@
import java.util.List;
public class PlcServoManualone extends Thread {
- String name = "";
- Integer count = 0;
- public static String readFileToString(String filePath) throws IOException {
- File file = new File(filePath);
- return FileUtils.readFileToString(file, "UTF-8");
+
+
+ private Configuration config;
+
+ public PlcServoManualone() throws IOException {
+ config = new Configuration("config.properties");
}
+ public static class PLCBooleanConverter {
+ public static short[] convertListsToBinaryShortArray(List<Boolean>... lists) {
+ // 璁＄畻鎵�鏈夊垪琛ㄤ腑鍏冪礌鐨勬�绘暟
+ int totalSize = 0;
+ for (List<Boolean> list : lists) {
+ totalSize += list.size();
+ }
+ // 鍒涘缓涓�涓冻澶熷ぇ鐨勬暟缁勬潵瀛樻斁鎵�鏈夌殑浜岃繘鍒跺��
+ short[] binaryShortArray = new short[totalSize];
-// public void insertDataToList(List<Short> list, String rangeAddress, int insertIndex) {
-// if (list.size() >= insertIndex + 14) {
-// List<Short> rangeData = new ArrayList<>();
-// byte[] byteData = S7control.getinstance().ReadByte(rangeAddress, 14);
-// if (byteData != null && byteData.length >= 13) {
-// for (byte b : byteData) {
-// rangeData.add((short) b);
-// }
-// } else {
-// // 璇诲彇鏁版嵁澶辫触锛屾坊鍔犻粯璁ゅ��
-// for (int i = 0; i < 14; i++) {
-// rangeData.add((short) -1);
-// }
-// }
-//
-// list.addAll(insertIndex, rangeData);
-// }else{
-// List<Short> rangeData = new ArrayList<>();
-// rangeData.add((short) 0);
-// list.addAll(insertIndex, rangeData);
-// }
-// }
+ // 褰撳墠鏁扮粍濉厖浣嶇疆鎸囬拡
+ int currentIndex = 0;
+ // 閬嶅巻鎵�鏈夌殑鍒楄〃
+ for (List<Boolean> list : lists) {
+ // 灏嗘瘡涓竷灏斿�艰浆鎹负 0 鎴� 1 骞跺～鍏ユ暟缁�
+ for (Boolean value : list) {
+ binaryShortArray[currentIndex++] = (short) (value ? 1 : 0);
+ }
+ }
+
+ return binaryShortArray;
+ }
+ }
+
+//璇诲彇id
public StringBuilder queGlassid(String address,int count) {
StringBuilder writedstrIdOut = new StringBuilder();
byte[] writedglassidbytesOut = S7control.getinstance().ReadByte(address, count);
@@ -56,7 +59,7 @@
}
return writedstrIdOut;
}
-
+//鍐欏叆id
public void outmesid(String glassid,String address) {
//System.out.println("outmesid:" + glassid);
List<Byte> glassidlist = new ArrayList();
@@ -66,7 +69,7 @@
}
byte[] bytes = Bytes.toArray(glassidlist);
System.out.println("outmesidbytes:" + bytes.length);
- S7control.getinstance().WriteByte(address, bytes);// 娲惧彂鍑虹墖id
+ S7control.getinstance().WriteByte(address, bytes);
}
@Override
@@ -80,59 +83,69 @@
}
//A01缁勫悎涓湴鍧�琛ㄩ泦鍚�
- List<String> addresses = new ArrayList<>();
- addresses.add("DB103.32");
- addresses.add("DB100.144");
- addresses.add("DB100.184");
- addresses.add("DB100.186");
- addresses.add("DB100.180");
- addresses.add("DB100.182");
+ List<String> addresses = Arrays.asList(config.getProperty("A01.addresses").split(","));
+ //System.out.println(addresses);
List<Short> arraylist = S7control.getinstance().readWords(addresses);
-// String rangeAddress = "DB100.148-161";
-// String rangeAddress = "DB100.148";
-// int insertIndex = 2;
-// insertDataToList(arraylist, rangeAddress, insertIndex);
-
//A02缁勫悎涓湴鍧�琛ㄩ泦鍚�
- List<String> addresses2 = new ArrayList<>();
- addresses2.add("DB103.26");
- addresses2.add("DB100.188");
- addresses2.add("DB100.190");
- addresses2.add("DB100.146");
-// addresses2.add("DB100.162-175");
+ List<String> addresses2 = Arrays.asList(config.getProperty("A02.addresses").split(","));
List<Short> arraylist2 = S7control.getinstance().readWords(addresses2);
-// String rangeAddress2 = "DB100.148-161";
-// String rangeAddress2 = "DB100.162";
-// int insertIndex2 = 4;
-// insertDataToList(arraylist2, rangeAddress2, insertIndex2);
-// System.out.println(arraylist2);
//A01缈昏浆鍦板潃
- List<String> addresses3 = new ArrayList<>();
- addresses3.add("DB103.42");
+ List<String> addresses3 = Arrays.asList(config.getProperty("A01.flipAddress"));
List<Short> arraylist3 = S7control.getinstance().readWords(addresses3);
-
//A02缈昏浆鍦板潃
- List<String> addresses4 = new ArrayList<>();
- addresses4.add("DB103.46");
+ List<String> addresses4 = Arrays.asList(config.getProperty("A02.flipAddress"));
+
List<Short> arraylist4 = S7control.getinstance().readWords(addresses4);
//B01缁勫悎涓湴鍧�
- List<Short> arraylist5 = S7control.getinstance().ReadWord("DB103.27", 2);
+ String b01Address = config.getProperty("B01.address");
+ List<Short> arraylist5 = S7control.getinstance().ReadWord(b01Address, 2);
//B02缁勫悎鍦板潃
- List<Short> arraylist6 = S7control.getinstance().ReadWord("DB103.29", 2);
-
+ String b02Address = config.getProperty("B02.address");
+ List<Short> arraylist6 = S7control.getinstance().ReadWord(b02Address, 2);
+// System.out.println(b02Address);
// 鎵�鏈夋晠闅滄寜閽湴鍧�
- List<String> addresses7 = new ArrayList<>();
- addresses7.add("DB104.1.4");
- addresses7.add("DB104.1.5");
- addresses7.add("DB104.1.2");
- addresses7.add("DB104.1.3");
- addresses7.add("DB104.1.6");
- addresses7.add("DB104.1.7");
+ List<String> addresses7 = Arrays.asList(config.getProperty("faultButtonAddresses").split(","));
List<Boolean> arraylist7 = S7control.getinstance().readBits(addresses7);
+
+ //A01鍚姩鍦板潃
+ List<String> A01start = Arrays.asList(config.getProperty("A01start"));
+ //A02鍚姩鍦板潃
+ List<String> A02start = Arrays.asList(config.getProperty("A02start"));
+//A01鍗婅嚜鍔ㄥ湴鍧�
+ List<String> A01Bstart = Arrays.asList(config.getProperty("A01Bstart"));
+ //A02鍗婅嚜鍔ㄥ湴鍧�
+ List<String> A02Bstart = Arrays.asList(config.getProperty("A02Bstart"));
+ //
+ List<String> abortresumeTasks = Arrays.asList(config.getProperty("abortresumeTasks"));
+ //鍥為浂鎸夐挳鍦板潃
+ List<String> waddresses4 = Arrays.asList(config.getProperty("HomedButtonAddresses").split(","));
+ // 鎵�鏈夊浣嶆寜閽湴鍧�
+ List<String> Reset = Arrays.asList(config.getProperty("resetButtonAddresses").split(","));
+// System.out.println(Reset);
+ // 鎵�鏈夋湭鍥為浂鎸夐挳鍦板潃
+ List<String> addresses8 = Arrays.asList(config.getProperty("notHomedButtonAddresses").split(","));
+ // 杩涚墖id鍦板潃
+ String inputGlassIdAddress = config.getProperty("inputGlassIdAddress");
+ String outputGlassIdAddress = config.getProperty("outputGlassIdAddress");
+ StringBuilder queueid1 = queGlassid(inputGlassIdAddress, 14);
+ // 瀛樼墖id鍦板潃
+ StringBuilder queueid2 = queGlassid(outputGlassIdAddress, 14);
+
+ List<Boolean> A01readstart = S7control.getinstance().readBits(A01start);
+ List<Boolean> A02readstart = S7control.getinstance().readBits(A02start);
+ List<Boolean> A01readBstart = S7control.getinstance().readBits(A01Bstart);
+ List<Boolean> A02readsBtart = S7control.getinstance().readBits(A02Bstart);
+
+ List<Boolean> resumeTasks = S7control.getinstance().readBits(abortresumeTasks);
+
+ short[] combinedBinaryShortArray = PLCBooleanConverter.convertListsToBinaryShortArray(
+ A01readstart, A01readBstart, A02readstart, A02readsBtart
+ );
+
// 鎵�鏈夋晠闅滄寜閽浆鎹负1鍜�0
short[] params2 = new short[arraylist7.size()];
@@ -142,16 +155,8 @@
}
- // 鎵�鏈夊浣嶆寜閽湴鍧�
- List<String> Reset = new ArrayList<>();
- Reset.add("DB101.4.0");
- Reset.add("DB101.4.3");
- Reset.add("DB101.3.6");
- Reset.add("DB101.4.1");
- Reset.add("DB101.4.4");
- Reset.add("DB101.4.6");
List<Boolean> Reset1 = S7control.getinstance().readBits(Reset);
-
+ // System.out.println(Reset1);
// 鎵�鏈夋晠闅滄寜閽浆鎹负1鍜�0
short[] rReset = new short[Reset1.size()];
for (int i = 0; i < Reset1.size(); i++) {
@@ -159,14 +164,8 @@
rReset[i] = value ? (short) 1 : (short) 0;
}
- // 鎵�鏈夋湭鍥為浂鎸夐挳鍦板潃
- List<String> addresses8 = new ArrayList<>();
- addresses8.add("DB104.9.0");
- addresses8.add("DB104.9.1");
- addresses8.add("DB104.9.0");
- addresses8.add("DB104.9.1");
- addresses8.add("DB104.9.4");
- addresses8.add("DB104.9.5");
+
+
List<Boolean> arraylist8 = S7control.getinstance().readBits(addresses8);
short[] params = new short[arraylist8.size()];
for (int i = 0; i < arraylist8.size(); i++) {
@@ -174,10 +173,7 @@
params[i] = value ? (short) 1 : (short) 0;
}
- // 杩涚墖id鍦板潃
- StringBuilder queueid1 = queGlassid("DB100.148", 14);
- // 瀛樼墖id鍦板潃
- StringBuilder queueid2 = queGlassid("DB100.162", 14);
+
@@ -228,6 +224,8 @@
jsonObject.append("jinpianid", queueid1);
jsonObject.append("qupianid", queueid2);
jsonObject.append("fuwei", rReset);
+ jsonObject.append("qidong", combinedBinaryShortArray);
+ jsonObject.append("resumeTasks", resumeTasks);
@@ -239,47 +237,6 @@
WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("ServoManualone");
if (webSocketServer != null) {
List<String> messages = webSocketServer.getMessages();
- // A01缁勫悎鍦板潃
- List<String> waddresses1 = new ArrayList<>();
- waddresses1.add("DB103.32");
- waddresses1.add("DB100.144");
-// waddresses1.add("DB100.148-161");
- waddresses1.add("DB100.184");
- waddresses1.add("DB100.186");
- waddresses1.add("DB100.180");
- waddresses1.add("DB100.182");
-
- // A02缁勫悎鍦板潃
- List<String> waddresses2 = new ArrayList<>();
- waddresses2.add("DB103.26");
- waddresses2.add("DB100.188");
- waddresses2.add("DB100.190");
- waddresses2.add("DB100.146");
-// waddresses2.add("DB100.162-175");
-
-
- // 澶嶄綅鎸夐挳鍦板潃
- List<String> waddresses3 = new ArrayList<>();
- waddresses3.add("DB101.4.0");
- waddresses3.add("DB101.4.3");
- waddresses3.add("DB101.3.6");
- waddresses3.add("DB101.4.1");
- waddresses3.add("DB101.4.4");
- waddresses3.add("DB101.4.6");
-
- //鍥為浂鎸夐挳鍦板潃
- List<String> waddresses4 = new ArrayList<>();
- waddresses4.add("DB101.3.7");
- waddresses4.add("DB101.4.2");
- waddresses4.add("DB101.4.5");
- waddresses4.add("DB101.4.7");
-
-
-String waddresses5="DB100.148";
-String waddresses6="DB100.162";
-
-
-
@@ -288,8 +245,6 @@
String lastMessage = messages.get(messages.size() - 1);
// System.out.println("lastMessage锛�" + lastMessage);
JSONArray messageArray = new JSONArray(lastMessage);
-
-
// 鍐欏叆AO1缁勫悎
@@ -312,15 +267,20 @@
}
if (!sValue.isEmpty()) {
-
-
- S7control.getinstance().WriteWord(waddresses1, sValue);
- List<String> A01start = new ArrayList<>();
- A01start.add("DB101.5.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);
+ S7control.getinstance().WriteWord(addresses, 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 " + addresses);
}
}
@@ -344,13 +304,20 @@
}
}
if (!sValue2.isEmpty()) {
- S7control.getinstance().WriteWord(waddresses2, sValue2);
- List<String> A02start = new ArrayList<>();
- A02start.add("DB101.5.1");
- Boolean[] a02values7 = {true};
- List<Boolean> a02startval = new ArrayList<>(Arrays.asList(a02values7));
- S7control.getinstance().WriteBit(A02start, a02startval);
- System.out.println("Values " + sValue2 + " written to PLC at address " + waddresses2);
+ S7control.getinstance().WriteWord(addresses2, 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 " + addresses2);
}
}
@@ -374,8 +341,8 @@
}
}
if (!sValue3.isEmpty()) {
- S7control.getinstance().WriteBit(waddresses3, sValue3);
- System.out.println("Values " + sValue3 + " written to PLC at address " + waddresses3);
+ S7control.getinstance().WriteBit(Reset, sValue3);
+ System.out.println("Values " + sValue3 + " written to PLC at address " + Reset);
}
}
@@ -404,7 +371,6 @@
}
-
//杩涚墖ID鍐欏叆
if (messageArray.getJSONArray(4).size() > 0) {
// JSONArray jsonArray5 = messageArray.getJSONArray(4);
@@ -412,8 +378,8 @@
if (!jsonArray5.isEmpty()) {
// String value = (String) jsonArray5.get(0);
jsonArray5 = jsonArray5.replaceAll("[\\[\\]\"]", ""); // 鍘婚櫎鏂规嫭鍙峰拰鍙屽紩鍙�
- outmesid( jsonArray5,waddresses5);
- System.out.println("Values " + jsonArray5 + " written to PLC at address " + waddresses5);
+ outmesid( jsonArray5,inputGlassIdAddress);
+ System.out.println("Values " + jsonArray5 + " written to PLC at address " + inputGlassIdAddress);
}
}
// 瀛樼墖ID鍐欏叆
@@ -422,8 +388,8 @@
if (!jsonArray6.isEmpty()) {
String value2 = (String) jsonArray6.get(0);
- outmesid( value2,waddresses6);
- System.out.println("Values " + value2 + " written to PLC at address " + waddresses6);
+ outmesid( value2,outputGlassIdAddress);
+ System.out.println("Values " + value2 + " written to PLC at address " + outputGlassIdAddress);
}
}
if (messageArray.getJSONArray(6).size() > 0) {
@@ -445,17 +411,10 @@
}
if (!sValueb4.isEmpty()) {
- List<String> A01Bstart = new ArrayList<>();
- A01Bstart.add("DB101.11.0");
-// Boolean[] a01values7 = {true};
-// List<Boolean> a01Bstartval = new ArrayList<>(Arrays.asList(a01values7));
S7control.getinstance().WriteBit(A01Bstart, sValueb4);
System.out.println("Values " + sValueb4 + " written to PLC at address " + A01Bstart);
}
}
-
-
-
if (messageArray.getJSONArray(7).size() > 0) {
@@ -477,46 +436,35 @@
}
if (!sValueb5.isEmpty()) {
- List<String> A02Bstart = new ArrayList<>();
- A02Bstart.add("DB101.11.1");
-// Boolean[] a01values7 = {true};
-// List<Boolean> a01Bstartval = new ArrayList<>(Arrays.asList(a01values7));
S7control.getinstance().WriteBit(A02Bstart, sValueb5);
System.out.println("Values " + sValueb5 + " written to PLC at address " + A02Bstart);
}
}
+ if (messageArray.getJSONArray(8).size() > 0) {
+ JSONArray jsonArray5 = messageArray.getJSONArray(8);
+ List<Boolean> sValueb5 = new ArrayList<>();
+ for (int i = 0; i < jsonArray5.size(); i++) {
+ Object value = jsonArray5.get(i);
+ if (value != null && !value.toString().equals("null")) {
+ try {
+ String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
+ boolean val = "1".equals(cleanedValue.trim());
+ sValueb5.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 (!sValueb5.isEmpty()) {
+ S7control.getinstance().WriteBit(abortresumeTasks, sValueb5);
+ System.out.println("Values " + sValueb5 + " written to PLC at address " + A02Bstart);
+ }
+ }
-
-
-// if (messageArray.getJSONArray(6).size() > 0) {
-// JSONArray jsonArray6 = messageArray.getJSONArray(6);
-//
-// if (!jsonArray6.isEmpty()) {
-// String value2 = (String) jsonArray6.get(0);
-// List<String> A01Bstart = new ArrayList<>();
-// A01Bstart.add("DB101.11.0");
-// Boolean[] a01values7 = {true};
-// List<Boolean> a01Bstartval = new ArrayList<>(Arrays.asList(a01values7));
-// S7control.getinstance().WriteBit(A01Bstart, a01Bstartval);
-// System.out.println("Values " + value2 + " written to PLC at address " + waddresses6);
-// }
-// }
-
-// if (messageArray.getJSONArray(7).size() > 0) {
-// JSONArray jsonArray6 = messageArray.getJSONArray(7);
-//
-// if (!jsonArray6.isEmpty()) {
-// String value2 = (String) jsonArray6.get(0);
-// List<String> A02Bstart = new ArrayList<>();
-// A02Bstart.add("DB101.11.1");
-// Boolean[] a02values7 = {true};
-// List<Boolean> a02Bstartval = new ArrayList<>(Arrays.asList(a02values7));
-// S7control.getinstance().WriteBit(A02Bstart, a02Bstartval);
-// System.out.println("Values " + value2 + " written to PLC at address " + waddresses6);
-// }
-// }
// 娓呯┖娑堟伅鍒楄〃
webSocketServer.clearMessages();
--
Gitblit v1.8.0