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/PlcManualonePosition.java | 281 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 185 insertions(+), 96 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java
index 49566c2..1d685d8 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java
@@ -10,52 +10,41 @@
import java.util.List;
public class PlcManualonePosition 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 PlcManualonePosition() 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("ManualonePosition");
- 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() {
@@ -73,46 +62,96 @@
List<String> addresses = new ArrayList<>();
addresses.add("DB100.108");
addresses.add("DB100.20");
- addresses.add("DB103.52");
+ addresses.add("DB103.32");
List<Short> arraylist = S7control.getinstance().readWords(addresses);
-// System.out.println(arraylist);
+ // System.out.println(arraylist);
List<String> addresses2 = new ArrayList<>();
addresses2.add("DB100.110");
addresses2.add("DB100.176");
- addresses2.add("DB103.54");
+ addresses2.add("DB103.34");
List<Short> arraylist2 = S7control.getinstance().readWords(addresses2);
List<String> addresses3 = new ArrayList<>();
addresses3.add("DB100.112");
addresses3.add("DB100.24");
- addresses3.add("DB103.56");
+ addresses3.add("DB103.36");
List<Short> arraylist3 = S7control.getinstance().readWords(addresses3);
List<String> addresses4 = new ArrayList<>();
addresses4.add("DB100.114");
addresses4.add("DB100.178");
- addresses4.add("DB103.60");
+ addresses4.add("DB103.40");
List<Short> arraylist4 = S7control.getinstance().readWords(addresses4);
- List<Short> arraylist5 = S7control.getinstance().ReadWord("DB103.40", 1);
- List<Short> arraylist6 = S7control.getinstance().ReadWord("DB103.44", 1);
- List<Short> arraylist7 = S7control.getinstance().ReadWord("DB103.48", 1);
- List<Short> arraylist8 = S7control.getinstance().ReadWord("DB103.50", 1);
+ List<Short> arraylist5 = S7control.getinstance().ReadWord("DB106.0", 1);
+ List<Short> arraylist6 = S7control.getinstance().ReadWord("DB106.12", 1);
+ List<Short> arraylist7 = S7control.getinstance().ReadWord("DB106.40", 1);
+ List<Short> arraylist8 = S7control.getinstance().ReadWord("DB106.50", 1);
List<String> addresses9 = new ArrayList<>();
addresses9.add("DB104.1.2");
addresses9.add("DB104.1.3");
addresses9.add("DB104.1.6");
addresses9.add("DB104.1.7");
-// addresses9.add("DB104.28");
-// addresses9.add("DB104.30");
List<Boolean> arraylist9 = S7control.getinstance().readBits(addresses9);
+
+ List<String> addresses10 = new ArrayList<>();
+ addresses10.add("DB104.9.4");
+ addresses10.add("DB104.9.5");
+ addresses10.add("DB104.9.4");
+ addresses10.add("DB104.9.5");
+ List<Boolean> arraylist10 = S7control.getinstance().readBits(addresses10);
+
+ //A01鍚姩鍦板潃
+ List<String> A01start = Arrays.asList(config.getProperty("mlp.A01start"));
+ //A02鍚姩鍦板潃
+ List<String> A02start = Arrays.asList(config.getProperty("mlp.A02start"));
+
+ List<String> B01start = Arrays.asList(config.getProperty("mlp.B01start"));
+
+ List<String> B02start = Arrays.asList(config.getProperty("mlp.B02start"));
+
+ List<Boolean> A01readstart = S7control.getinstance().readBits(A01start);
+ List<Boolean> A02readstart = S7control.getinstance().readBits(A02start);
+ List<Boolean> B01readstart = S7control.getinstance().readBits(B01start);
+ List<Boolean> B02readstart = S7control.getinstance().readBits(B02start);
+
+ short[] combinedBinaryShortArray = PLCBooleanConverter.convertListsToBinaryShortArray(
+ A01readstart, A02readstart,B01readstart, B02readstart
+ );
+
+ // Short[] values1 = { 1, 2, 3 };
+ // List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
+ // Short[] values2 = { 1, 2, 3 };
+ // List<Short> arraylist2 = new ArrayList<>(Arrays.asList(values2));
+ // Short[] values3 = { 1, 2, 3 };
+ // List<Short> arraylist3 = new ArrayList<>(Arrays.asList(values3));
+ // Short[] values4 = { 1, 2, 3 };
+ // List<Short> arraylist4 = new ArrayList<>(Arrays.asList(values4));
+ // Short[] values5 = { 5 };
+ // List<Short> arraylist5 = new ArrayList<>(Arrays.asList(values5));
+ // Short[] values6 = { 6 };
+ // List<Short> arraylist6 = new ArrayList<>(Arrays.asList(values6));
+ // Short[] values7 = { 7 };
+ // List<Short> arraylist7 = new ArrayList<>(Arrays.asList(values7));
+ // Short[] values8 = { 8 };
+ // List<Short> arraylist8 = new ArrayList<>(Arrays.asList(values8));
+ // Boolean[] values9 = { false, false, true, true };
+ // List<Boolean> arraylist9 = new ArrayList<>(Arrays.asList(values9));
short[] params2 = new short[arraylist9.size()];
for (int i = 0; i < arraylist9.size(); i++) {
boolean value = arraylist9.get(i);
params2[i] = value ? (short) 1 : (short) 0;
}
-// List<Short> arraylist9 = S7control.getinstance().readWords(addresses9);
+
+ // Boolean[] values10 = { false, false, true, true };
+ // List<Boolean> arraylist10 = new ArrayList<>(Arrays.asList(values10));
+ short[] params3 = new short[arraylist10.size()];
+ for (int i = 0; i < arraylist10.size(); i++) {
+ boolean value = arraylist10.get(i);
+ params3[i] = value ? (short) 1 : (short) 0;
+ }
+ // List<Short> arraylist9 = S7control.getinstance().readWords(addresses9);
arraylist5.addAll(arraylist6);
arraylist5.addAll(arraylist7);
arraylist5.addAll(arraylist8);
@@ -125,40 +164,46 @@
jsonObject.append("zuhe4", arraylist4);
jsonObject.append("shishi1", arraylist5);
jsonObject.append("guzhang", params2);
- // jsonObject.append("weihuiling", arraylist8);
+ jsonObject.append("weihuiling", params3);
+ jsonObject.append("qidong", combinedBinaryShortArray);
- WebSocketServer sendwServer = WebSocketServer.sessionMap.get("ManualonePosition");
+// WebSocketServer sendwServer = WebSocketServer.sessionMap.get("ManualonePosition");
+// if (sendwServer != null) {
+// sendwServer.sendMessage(jsonObject.toString());
+// }
+
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("ManualonePosition");
if (sendwServer != null) {
- sendwServer.sendMessage(jsonObject.toString());
- }
+ for (WebSocketServer webserver : sendwServer) {
+ webserver.sendMessage(jsonObject.toString());
- WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("ManualonePosition");
- if (webSocketServer != null) {
- List<String> messages = webSocketServer.getMessages();
+// WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("ManualonePosition");
+ if (webserver != null) {
+ List<String> messages = webserver.getMessages();
List<String> waddresses1 = new ArrayList<>();
waddresses1.add("DB100.108");
waddresses1.add("DB100.20");
- waddresses1.add("DB103.52");
+ waddresses1.add("DB103.32");
List<String> waddresses2 = new ArrayList<>();
waddresses2.add("DB100.110");
waddresses2.add("DB100.176");
- waddresses2.add("DB103.54");
+ waddresses2.add("DB103.34");
List<String> waddresses3 = new ArrayList<>();
waddresses3.add("DB100.112");
waddresses3.add("DB100.24");
- waddresses3.add("DB103.56");
+ waddresses3.add("DB103.36");
List<String> waddresses4 = new ArrayList<>();
waddresses4.add("DB100.114");
waddresses4.add("DB100.178");
- waddresses4.add("DB103.60");
+ waddresses4.add("DB103.40");
// 鏁呴殰鍦板潃
List<String> waddresses5 = new ArrayList<>();
- waddresses5.add("DB103.244");
- waddresses5.add("DB103.250");
+ // waddresses5.add("DB103.244");
+ // waddresses5.add("DB103.250");
waddresses5.add("DB103.252");
waddresses5.add("DB103.254");
@@ -171,10 +216,12 @@
// 鍥為浂鍦板潃
List<String> waddresses7 = new ArrayList<>();
+
waddresses7.add("DB101.4.5");
waddresses7.add("DB101.4.7");
- System.out.println(messages.isEmpty());
+
+ // System.out.println(messages.isEmpty());
if (!messages.isEmpty()) {
// 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
String lastMessage = messages.get(messages.size() - 1);
@@ -200,11 +247,26 @@
}
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("a01startval " + a01startval + " written to PLC at address " + A01start);
+ }
+
+
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<>();
@@ -224,6 +286,19 @@
}
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);
}
}
@@ -247,7 +322,18 @@
}
}
if (!sValue2.isEmpty()) {
- S7control.getinstance().WriteWord(waddresses2, sValue2);
+ S7control.getinstance().WriteWord(waddresses3, sValue2);
+ if (B01readstart != null && !B01readstart.isEmpty()) {
+ // 鍒涘缓涓�涓柊鐨勫垪琛ㄧ敤浜庡啓鍏ユ柊鍊�
+ List<Boolean> b01startval = new ArrayList<>();
+ // 閬嶅巻鎵�鏈夎鍙栧埌鐨勪綅鍊�
+ for (Boolean bit : B01readstart) {
+ // 鍙栧弽褰撳墠浣嶇殑鍊煎苟娣诲姞鍒版柊鐨勫垪琛ㄤ腑
+ b01startval.add(!bit);
+ }
+ // 鍐欏叆鏂扮殑浣嶅�煎垪琛�
+ S7control.getinstance().WriteBit(B01start, b01startval);
+ }
System.out.println("Values " + sValue2 + " written to PLC at address " + waddresses3);
}
}
@@ -271,7 +357,19 @@
}
}
if (!sValue2.isEmpty()) {
- S7control.getinstance().WriteWord(waddresses2, sValue2);
+ S7control.getinstance().WriteWord(waddresses4, sValue2);
+ if (B02readstart != null && !B02readstart.isEmpty()) {
+ // 鍒涘缓涓�涓柊鐨勫垪琛ㄧ敤浜庡啓鍏ユ柊鍊�
+ List<Boolean> b02startval = new ArrayList<>();
+ // 閬嶅巻鎵�鏈夎鍙栧埌鐨勪綅鍊�
+ for (Boolean bit : B02readstart) {
+ // 鍙栧弽褰撳墠浣嶇殑鍊煎苟娣诲姞鍒版柊鐨勫垪琛ㄤ腑
+ b02startval.add(!bit);
+ }
+ // 鍐欏叆鏂扮殑浣嶅�煎垪琛�
+ S7control.getinstance().WriteBit(B02start, b02startval);
+ System.out.println("Values " + b02startval + " written to PLC at address " + B02start);
+ }
System.out.println("Values " + sValue2 + " written to PLC at address " + waddresses4);
}
}
@@ -302,65 +400,56 @@
// 鍐欏叆澶嶄綅鍦板潃
if (messageArray.getJSONArray(5).size() > 0) {
- JSONArray jsonArray = messageArray.getJSONArray(5);
- List<Short> sValue2 = new ArrayList<>();
- List<Boolean> messageBooleans = new ArrayList<>();
- for (int i = 0; i < jsonArray.size(); i++) {
- Object value = jsonArray.get(i);
+ JSONArray jsonArray3 = messageArray.getJSONArray(5);
+ 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-]", "");
- short val = Short.parseShort(cleanedValue.trim());
- sValue2.add(val);
- // 灏嗘秷鎭�艰浆鎹负甯冨皵鍒楄〃
- for (short values : sValue2) {
- messageBooleans.add(values == 1 ? true : false);
- }
- System.out.println("messageValue锛�" + Arrays.asList(val) + " added to the list");
+ boolean val = "1".equals(cleanedValue.trim());
+ sValue3.add(val);
+ System.out.println("messageValue: " + Arrays.asList(val) + " added to the list");
} catch (NumberFormatException e) {
- // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+ // 濡傛灉鏃犳硶瑙ｆ瀽涓� boolean 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
System.err.println("Could not parse value: " + value);
}
}
}
- if (!messageBooleans.isEmpty()) {
- // S7control.getinstance().WriteWord(waddresses6, messageBooleans);
- System.out.println("Values " + messageBooleans + " written to PLC at address " + waddresses6);
+ if (!sValue3.isEmpty()) {
+ S7control.getinstance().WriteBit(waddresses6, sValue3);
+ System.out.println("Values " + sValue3 + " written to PLC at address " + waddresses6);
}
}
// 鍐欏叆鍥為浂鍦板潃
if (messageArray.getJSONArray(6).size() > 0) {
- JSONArray jsonArray = messageArray.getJSONArray(6);
- List<Short> sValue2 = new ArrayList<>();
- List<Boolean> messageBooleans = new ArrayList<>();
- for (int i = 0; i < jsonArray.size(); i++) {
- Object value = jsonArray.get(i);
+ JSONArray jsonArray3 = messageArray.getJSONArray(6);
+ 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-]", "");
- short val = Short.parseShort(cleanedValue.trim());
- sValue2.add(val);
- // 灏嗘秷鎭�艰浆鎹负甯冨皵鍒楄〃
- for (short values : sValue2) {
- messageBooleans.add(values == 1 ? true : false);
- }
- System.out.println("messageValue锛�" + Arrays.asList(val) + " added to the list");
+ boolean val = "1".equals(cleanedValue.trim());
+ sValue3.add(val);
+ System.out.println("messageValue: " + Arrays.asList(val) + " added to the list");
} catch (NumberFormatException e) {
- // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+ // 濡傛灉鏃犳硶瑙ｆ瀽涓� boolean 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
System.err.println("Could not parse value: " + value);
}
}
}
- if (!messageBooleans.isEmpty()) {
- S7control.getinstance().WriteBit(waddresses7, messageBooleans);
- System.out.println("Values " + messageBooleans + " written to PLC at address " + waddresses7);
+ if (!sValue3.isEmpty()) {
+ S7control.getinstance().WriteBit(waddresses7, sValue3);
+ System.out.println("Values " + sValue3 + " written to PLC at address " + waddresses7);
}
}
// 娓呯┖娑堟伅鍒楄〃
- webSocketServer.clearMessages();
+ webserver.clearMessages();
}
+ }}
}
}
}
--
Gitblit v1.8.0