From 0f3ea8b9dd921b942015d30c5dfce06af25cd71c Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期三, 13 十二月 2023 09:15:00 +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 | 134 ++++++++++++++++++++++++++++----------------
1 files changed, 84 insertions(+), 50 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 87a5c68..819e14e 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,49 @@
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;
+
+
+ // 鍒涘缓涓�涓嚜瀹氫箟鐨� S7 鎺у埗鍣ㄦ秷鎭鐞嗗櫒瀵硅薄
+ MessageHandler customS7Control = new MessageHandler();
+
+
+
+
+ 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() {
@@ -95,10 +92,10 @@
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");
@@ -112,6 +109,25 @@
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 };
@@ -157,16 +173,21 @@
jsonObject.append("shishi1", arraylist5);
jsonObject.append("guzhang", params2);
jsonObject.append("weihuiling", params3);
- // jsonObject.append("weihuiling", arraylist8);
+ 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");
@@ -175,12 +196,12 @@
List<String> waddresses2 = new ArrayList<>();
waddresses2.add("DB100.110");
waddresses2.add("DB100.176");
- waddresses2.add("DB103.34");
+ waddresses2.add("DB103.34");
List<String> waddresses3 = new ArrayList<>();
waddresses3.add("DB100.112");
waddresses3.add("DB100.24");
- waddresses3.add("DB103.36");
+ waddresses3.add("DB103.36");
List<String> waddresses4 = new ArrayList<>();
waddresses4.add("DB100.114");
@@ -234,13 +255,15 @@
}
if (!sValue.isEmpty()) {
S7control.getinstance().WriteWord(waddresses1, sValue);
+
+
System.out.println("Values " + sValue + " written to PLC at address " + waddresses1);
}
}
// 鍐欏叆A02
- if ( messageArray.getJSONArray(1).size() > 0) {
+ if (messageArray.getJSONArray(1).size() > 0) {
JSONArray jsonArray = messageArray.getJSONArray(1);
List<Short> sValue2 = new ArrayList<>();
for (int i = 0; i < jsonArray.size(); i++) {
@@ -259,6 +282,9 @@
}
if (!sValue2.isEmpty()) {
S7control.getinstance().WriteWord(waddresses2, sValue2);
+
+
+
System.out.println("Values " + sValue2 + " written to PLC at address " + waddresses2);
}
}
@@ -283,6 +309,7 @@
}
if (!sValue2.isEmpty()) {
S7control.getinstance().WriteWord(waddresses3, sValue2);
+
System.out.println("Values " + sValue2 + " written to PLC at address " + waddresses3);
}
}
@@ -307,6 +334,7 @@
}
if (!sValue2.isEmpty()) {
S7control.getinstance().WriteWord(waddresses4, sValue2);
+
System.out.println("Values " + sValue2 + " written to PLC at address " + waddresses4);
}
}
@@ -383,9 +411,15 @@
}
}
+ customS7Control.writeBitToPLC( messageArray, A01start,7);
+ customS7Control.writeBitToPLC( messageArray, A02start,8);
+ customS7Control.writeBitToPLC( messageArray,B01start,9);
+ customS7Control.writeBitToPLC( messageArray, B02start,10);
+
// 娓呯┖娑堟伅鍒楄〃
- webSocketServer.clearMessages();
+ webserver.clearMessages();
}
+ }}
}
}
}
--
Gitblit v1.8.0