From f43c5acc73d15a6bc60d6a3cb66b6d750b257dc6 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 14 十二月 2023 09:05:23 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/PLCManualJog.java | 180 ++++++++++++++++++++++++------------------------------------
1 files changed, 72 insertions(+), 108 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PLCManualJog.java b/springboot-vue3/src/main/java/com/example/springboot/component/PLCManualJog.java
index 23ac20d..baccc4d 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PLCManualJog.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PLCManualJog.java
@@ -10,52 +10,21 @@
import java.util.List;
public class PLCManualJog 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;
+
+ // 鍒涘缓涓�涓嚜瀹氫箟鐨� S7 鎺у埗鍣ㄦ秷鎭鐞嗗櫒瀵硅薄
+ MessageHandler customS7Control = new MessageHandler();
+
+
+ public PLCManualJog() 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;
- }
- // 灏唖tr瀛楃涓叉牸寮忚浆涓簀son
- JSONObject jsonObject = new JSONObject(str);
- // 鑾峰彇json涓殑鍊�
- JSONArray address = jsonObject.getJSONArray("address");
- for (int i = 0; i < address.size(); i++) {
- JSONObject ress = (JSONObject) address.get(i);
-
- this.name = ress.getStr("name");
- this.count = ress.getInt("count");
-
- }
-
- } catch (FileNotFoundException e) {
- e.printStackTrace();
- } catch (UnsupportedEncodingException e) {
- e.printStackTrace();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
@Override
public void run() {
@@ -71,9 +40,15 @@
// Integer Plccount = this.count;
// System.out.println(stt);
- List<Boolean> arraylist = S7control.getinstance().ReadBits("DB101.0.0", 16);
- List<Boolean> arraylist2 = S7control.getinstance().ReadBits("DB101.2.6", 8);
- List<Boolean> arraylist3 = S7control.getinstance().ReadBits("DB101.5.2", 2);
+
+
+ List<String> addressList21 = Arrays.asList(config.getProperty("PLCManualJog.button").split(","));
+
+
+
+
+ List<Boolean> arraylist = S7control.getinstance().readBits(addressList21);
+
// Boolean[] values1 = { false, true, true, true, false, false, true, false,
// false, true, true, true, false, false,
// true, false };
@@ -83,8 +58,7 @@
// Boolean[] values3 = { false, false };
// List<Boolean> arraylist3 = new ArrayList<>(Arrays.asList(values3));
- arraylist.addAll(arraylist2);
- arraylist.addAll(arraylist3);
+
JSONObject jsonObject = new JSONObject();
@@ -96,73 +70,63 @@
jsonObject.append("params", params);
- WebSocketServer sendwServer = WebSocketServer.sessionMap.get("ManualJog");
+// System.out.println("messageValue锛�" + arraylist +"messageValue2锛�" + arraylist2 );
+// WebSocketServer sendwServer = WebSocketServer.sessionMap.get("ManualJog");
+// if (sendwServer != null) {
+// sendwServer.sendMessage(jsonObject.toString());
+// }
+
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("ManualJog");
if (sendwServer != null) {
- sendwServer.sendMessage(jsonObject.toString());
- }
+ for (WebSocketServer webserver : sendwServer) {
+ webserver.sendMessage(jsonObject.toString());
- WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("ManualJog");
+// WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("ManualJog");
- if (webSocketServer != null) {
- String addressList1 = "DB101.0.0";
- String addressList2 = "DB101.2.6";
- String addressList3 = "DB101.5.2";
+ if (webserver != null) {
- List<String> messages = webSocketServer.getMessages();
- if (!messages.isEmpty()) {
- // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
- String lastMessage = messages.get(messages.size() - 1);
- // System.out.println("messages锛�" + messages);
- String[] parts = lastMessage.split(",");
- List<Integer> messageValues = new ArrayList<>();
- for (String part : parts) {
- try {
- // 浣跨敤姝ｅ垯琛ㄨ揪寮忔竻闄ら潪鏁板瓧瀛楃
- String cleanedPart = part.replaceAll("[^0-9-]", "");
- Integer value = Integer.parseInt(cleanedPart.trim());
- messageValues.add(value);
- } catch (NumberFormatException e) {
- // 濡傛灉鏃犳硶瑙ｆ瀽涓烘暣鏁扮被鍨嬶紝鍒欏拷鐣ヨ閮ㄥ垎
- // e.printStackTrace();
+
+
+ List<String> messages = webserver.getMessages();
+ if (!messages.isEmpty()) {
+ // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
+ String lastMessage = messages.get(messages.size() - 1);
+ // System.out.println("messages锛�" + messages);
+ String[] parts = lastMessage.split(",");
+ List<Integer> messageValues = new ArrayList<>();
+ for (String part : parts) {
+ try {
+ // 浣跨敤姝ｅ垯琛ㄨ揪寮忔竻闄ら潪鏁板瓧瀛楃
+ String cleanedPart = part.replaceAll("[^0-9-]", "");
+ Integer value = Integer.parseInt(cleanedPart.trim());
+ messageValues.add(value);
+ } catch (NumberFormatException e) {
+ // 濡傛灉鏃犳硶瑙ｆ瀽涓烘暣鏁扮被鍨嬶紝鍒欏拷鐣ヨ閮ㄥ垎
+ // e.printStackTrace();
+ }
+
+ }
+ // 灏嗘秷鎭�艰浆鎹负甯冨皵鍒楄〃
+ List<Boolean> messageBooleans = new ArrayList<>();
+ for (Integer value : messageValues) {
+ messageBooleans.add(value == 1 ? true : false);
+ }
+ // System.out.println(messageBooleans);
+ List<Boolean> bolList = new ArrayList<>();
+
+
+ for (int i = 0; i < 26 && i < messageBooleans.size(); i++) {
+ bolList.add(messageBooleans.get(i));
+ }
+
+
+ if (!bolList.isEmpty()) {
+ S7control.getinstance().WriteBit(addressList21, bolList);
+ System.out.println("messageValue锛�" + bolList + " written to PLC at address " + addressList21);
+ }
+
+ webserver.clearMessages();
}
-
- }
- // 灏嗘秷鎭�艰浆鎹负甯冨皵鍒楄〃
- List<Boolean> messageBooleans = new ArrayList<>();
- for (Integer value : messageValues) {
- messageBooleans.add(value == 1 ? true : false);
- }
- // System.out.println(messageBooleans);
- List<Boolean> bolList = new ArrayList<>();
- List<Boolean> bolList2 = new ArrayList<>();
- List<Boolean> bolList3 = new ArrayList<>();
-
- for (int i = 0; i < 16 && i < messageBooleans.size(); i++) {
- bolList.add(messageBooleans.get(i));
- }
-
- for (int i = 16; i < 24 && i < messageBooleans.size(); i++) {
- bolList2.add(messageBooleans.get(i));
- }
-
- for (int i = 24; i < 26 && i < messageBooleans.size(); i++) {
- bolList3.add(messageBooleans.get(i));
- }
-
- // System.out.println(bolList);
- // System.out.println(bolList2);
- // System.out.println(bolList3);
- if (!bolList.isEmpty()) {
- S7control.getinstance().WriteBit(addressList1, bolList);
- System.out.println("messageValue锛�" + bolList + " written to PLC at address " + addressList1);
- }
- if (!bolList2.isEmpty()) {
- S7control.getinstance().WriteBit(addressList2, bolList2);
- System.out.println("messageValue锛�" + bolList2 + " written to PLC at address " + addressList2);
- }
- if (!bolList3.isEmpty()) {
- S7control.getinstance().WriteBit(addressList3, bolList3);
- System.out.println("messageValue锛�" + bolList3 + " written to PLC at address " + addressList3);
}
}
--
Gitblit v1.8.0