From 2a6d8a858ca7e41436548b35db147b5cdad4e4be Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 14 十二月 2023 14:08:17 +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 | 277 ++++++++++++++++---------------------------------------
1 files changed, 82 insertions(+), 195 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 a7d9579..896be4c 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,119 +10,60 @@
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");
- }
- 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;
- }
+ // 鐢ㄤ簬瀛樺偍搴旂敤绋嬪簭鐨勯厤缃俊鎭�
+ private Configuration config;
- // 灏唖tr瀛楃涓叉牸寮忚浆涓簀son
- JSONObject jsonObject = new JSONObject(str);
+ // 鍒涘缓涓�涓嚜瀹氫箟鐨� S7 鎺у埗鍣ㄦ秷鎭鐞嗗櫒瀵硅薄
+ MessageHandler customS7Control = new MessageHandler();
- // 鑾峰彇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();
+ public PLCManualJog() throws IOException {
+ config = new Configuration("config.properties");
}
- }
- @Override
- public void run() {
- while (this != null) {
- try {
- Thread.sleep(500);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- // this.readValue();
- // String PlcAddress = this.name;
- // Integer Plccount = this.count;
+ @Override
+ public void run() {
+ while (this != null) {
+ try {
+ Thread.sleep(500);
- // System.out.println(stt);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ // this.readValue();
+ // String PlcAddress = this.name;
+ // Integer Plccount = this.count;
- List<String> addressList0 = new ArrayList<>();
- addressList0.add("DB101.2.6");
- addressList0.add("DB101.2.7");
- addressList0.add("DB101.3.0");
- addressList0.add("DB101.3.1");
- addressList0.add("DB101.3.2");
- addressList0.add("DB101.3.3");
- addressList0.add("DB101.3.4");
- addressList0.add("DB101.3.5");
+ // System.out.println(stt);
- List<String> addressList21 = new ArrayList<>();
- addressList21.add("DB101.0.0");
- addressList21.add("DB101.0.1");
- addressList21.add("DB101.0.2");
- addressList21.add("DB101.0.3");
- addressList21.add("DB101.0.4");
- addressList21.add("DB101.0.5");
- addressList21.add("DB101.0.6");
- addressList21.add("DB101.0.7");
- addressList21.add("DB101.1.0");
- addressList21.add("DB101.1.1");
- addressList21.add("DB101.1.2");
- addressList21.add("DB101.1.3");
- addressList21.add("DB101.1.4");
- addressList21.add("DB101.1.5");
- addressList21.add("DB101.1.6");
- addressList21.add("DB101.1.7");
- List<Boolean> arraylist = S7control.getinstance().readBits(addressList21);
- List<Boolean> arraylist2 = S7control.getinstance().readBits(addressList0);
- List<Boolean> arraylist3 = S7control.getinstance().ReadBits("DB101.5.2", 2);
- // Boolean[] values1 = { false, true, true, true, false, false, true, false,
- // false, true, true, true, false, false,
- // true, false };
- // List<Boolean> arraylist = new ArrayList<>(Arrays.asList(values1));
- // Boolean[] values2 = { false, true, true, true, false, false, true, false };
- // List<Boolean> arraylist2 = new ArrayList<>(Arrays.asList(values2));
- // Boolean[] values3 = { false, false };
- // List<Boolean> arraylist3 = new ArrayList<>(Arrays.asList(values3));
- arraylist.addAll(arraylist2);
- arraylist.addAll(arraylist3);
+ List<String> addressList21 = Arrays.asList(config.getProperty("PLCManualJog.button").split(","));
- JSONObject jsonObject = new JSONObject();
- short[] params = new short[arraylist.size()];
- for (int i = 0; i < arraylist.size(); i++) {
- boolean value = arraylist.get(i);
- params[i] = value ? (short) 1 : (short) 0;
- }
+ List<Boolean> arraylist = S7control.getinstance().readBits(addressList21);
- jsonObject.append("params", params);
+ // Boolean[] values1 = { false, true, true, true, false, false, true, false,
+ // false, true, true, true, false, false,
+ // true, false };
+ // List<Boolean> arraylist = new ArrayList<>(Arrays.asList(values1));
+ // Boolean[] values2 = { false, true, true, true, false, false, true, false };
+ // List<Boolean> arraylist2 = new ArrayList<>(Arrays.asList(values2));
+ // Boolean[] values3 = { false, false };
+ // List<Boolean> arraylist3 = new ArrayList<>(Arrays.asList(values3));
+
+
+ JSONObject jsonObject = new JSONObject();
+
+ short[] params = new short[arraylist.size()];
+ for (int i = 0; i < arraylist.size(); i++) {
+ boolean value = arraylist.get(i);
+ params[i] = value ? (short) 1 : (short) 0;
+ }
+
+ jsonObject.append("params", params);
// System.out.println("messageValue锛�" + arraylist +"messageValue2锛�" + arraylist2 );
// WebSocketServer sendwServer = WebSocketServer.sessionMap.get("ManualJog");
@@ -130,115 +71,61 @@
// sendwServer.sendMessage(jsonObject.toString());
// }
- ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("ManualJog");
- if (sendwServer != null) {
- for (WebSocketServer webserver : sendwServer) {
- webserver.sendMessage(jsonObject.toString());
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("ManualJog");
+ if (sendwServer != null) {
+ for (WebSocketServer webserver : sendwServer) {
+ webserver.sendMessage(jsonObject.toString());
// WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("ManualJog");
- if (webserver != null) {
- // String addressList1 = "DB101.0.0";
-// String addressList2 = "DB101.2.6";
- String addressList3 = "DB101.5.2";
+ if (webserver != null) {
- List<String> addressList2 = new ArrayList<>();
- addressList2.add("DB101.2.6");
- addressList2.add("DB101.2.7");
- addressList2.add("DB101.3.0");
- addressList2.add("DB101.3.1");
- addressList2.add("DB101.3.2");
- addressList2.add("DB101.3.3");
- addressList2.add("DB101.3.4");
- addressList2.add("DB101.3.5");
+ 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<>();
- List<String> addressList211 = new ArrayList<>();
- addressList211.add("DB101.0.0");
- addressList211.add("DB101.0.1");
- addressList211.add("DB101.0.2");
- addressList211.add("DB101.0.3");
- addressList211.add("DB101.0.4");
- addressList211.add("DB101.0.5");
- addressList211.add("DB101.0.6");
- addressList211.add("DB101.0.7");
- addressList211.add("DB101.1.0");
- addressList211.add("DB101.1.1");
- addressList211.add("DB101.1.2");
- addressList211.add("DB101.1.3");
- addressList211.add("DB101.1.4");
- addressList211.add("DB101.1.5");
- addressList211.add("DB101.1.6");
- addressList211.add("DB101.1.7");
+ for (int i = 0; i < 26 && i < messageBooleans.size(); i++) {
+ bolList.add(messageBooleans.get(i));
+ }
- List<String> addressList311 = new ArrayList<>();
- addressList311.add("DB101.5.2");
- addressList311.add("DB101.5.3");
- 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();
+ 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(addressList211, bolList);
- System.out.println("messageValue锛�" + bolList + " written to PLC at address " + addressList211);
- }
- 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(addressList311, bolList3);
- System.out.println("messageValue锛�" + bolList3 + " written to PLC at address " + addressList311);
- }
- webserver.clearMessages();
}
- }
+
}
-
- }
-
}
- }
}
--
Gitblit v1.8.0