From 0ece3ba8c92df0438af52b8de6b9225d8ada4103 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 30 十一月 2023 08:46:34 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning1.java | 224 +++++++++++++++++++++++++++----------------------------
1 files changed, 110 insertions(+), 114 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning1.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning1.java
index 17e0010..11b23a1 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning1.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning1.java
@@ -17,135 +17,131 @@
import org.apache.commons.io.FileUtils;
public class PlcPositioning1 extends Thread {
- String name = "";
- Integer count = 0;
+ 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 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;
+ }
+
+ // 灏唖tr瀛楃涓叉牸寮忚浆涓簀son
+ JSONObject jsonObject = new JSONObject(str);
+
+ // 鑾峰彇json涓殑鍊�
+ JSONArray address = jsonObject.getJSONArray("Positioning1");
+ for (int i = 0; i < address.size(); i++) {
+ JSONObject ress = (JSONObject) address.get(i);
+
+ this.name = ress.getStr("name");
+ this.count = ress.getInt("count");
+ System.out.println("messageValues锛�" + this.name);
+ System.out.println("messageValues锛�" + this.count);
+ }
+
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
}
+ }
- 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;
- }
+ @Override
+ public void run() {
+ while (this != null) {
+ try {
+ Thread.sleep(1000);
- // 灏唖tr瀛楃涓叉牸寮忚浆涓簀son
- JSONObject jsonObject = new JSONObject(str);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ // this.readValue();
+ // String PlcAddress = this.name;
+ // Integer Plccount = this.count;
- // 鑾峰彇json涓殑鍊�
- JSONArray address = jsonObject.getJSONArray("Positioning1");
- for (int i = 0; i < address.size(); i++) {
- JSONObject ress = (JSONObject) address.get(i);
+ // System.out.println(stt);
+ List<Short> arraylist = S7control.getinstance().ReadWord("DB100.42", 23);
- this.name = ress.getStr("name");
- this.count = ress.getInt("count");
- System.out.println("messageValues锛�" + this.name);
- System.out.println("messageValues锛�" + this.count);
- }
+ // Short[] 瀛樼墖 = { 1 };
+ // List<Short> 瀛樼墖1 = new ArrayList<>(Arrays.asList(瀛樼墖));
+ // Short[] 鎺ョ墖 = { 1 };
+ // List<Short> 鎺ョ墖1 = new ArrayList<>(Arrays.asList(鎺ョ墖));
+ // Short[] 闂磋窛 = { 1 };
+ // List<Short> 闂磋窛1 = new ArrayList<>(Arrays.asList(闂磋窛));
+ // Short[] values1 = {1,1,1, 1,2, 3, 4, 5, 6, 7, 8, 9, 10,11,
+ // 12,13,14,15,16,17,18,19,20 };
+ // List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
- } catch (FileNotFoundException e) {
- e.printStackTrace();
- } catch (UnsupportedEncodingException e) {
- e.printStackTrace();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
+ JSONObject jsonObject = new JSONObject();
- @Override
- public void run() {
- while (this != null) {
- try {
- Thread.sleep(1000);
+ jsonObject.append("params", arraylist);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
-// this.readValue();
-// String PlcAddress = this.name;
-// Integer Plccount = this.count;
+ WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Positioning1");
+ if (sendwServer != null) {
+ sendwServer.sendMessage(jsonObject.toString());
+ }
- // System.out.println(stt);
- List<Short> arraylist = S7control.getinstance().ReadWord("DB100.42", 20);
+ WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("Positioning1");
+ if (webSocketServer != null) {
+ List<String> messages = webSocketServer.getMessages();
-// Short[] 瀛樼墖 = { 1 };
-// List<Short> 瀛樼墖1 = new ArrayList<>(Arrays.asList(瀛樼墖));
-// Short[] 鎺ョ墖 = { 1 };
-// List<Short> 鎺ョ墖1 = new ArrayList<>(Arrays.asList(鎺ョ墖));
-// Short[] 闂磋窛 = { 1 };
-// List<Short> 闂磋窛1 = new ArrayList<>(Arrays.asList(闂磋窛));
-// Short[] values1 = {1,1,1, 1,2, 3, 4, 5, 6, 7, 8, 9, 10,11, 12,13,14,15,16,17,18,19,20 };
-// List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
+ String addressList3 = "DB100.12";
+ if (!messages.isEmpty()) {
+ // 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
+ String lastMessage = messages.get(messages.size() - 1);
+ // System.out.println("lastMessage锛�" + lastMessage);
+ JSONArray messageArray = new JSONArray(lastMessage);
- JSONObject jsonObject = new JSONObject();
-
-
- jsonObject.append("params", arraylist);
-
-
- WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Positioning1");
- if (sendwServer != null) {
- sendwServer.sendMessage(jsonObject.toString());
- }
-
- WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("Positioning1");
- if (webSocketServer != null) {
- List<String> messages = webSocketServer.getMessages();
-
- String addressList3 = "DB100.12";
-
- if (!messages.isEmpty()) {
- // 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
- String lastMessage = messages.get(messages.size() - 1);
-// System.out.println("lastMessage锛�" + lastMessage);
- JSONArray messageArray = new JSONArray(lastMessage);
-
- // 鏁村悎绗� 1 鍒� 3 涓暟缁勫苟鍘绘帀 null 鍏冪礌
- List<Short> mergedList = new ArrayList<>();
- for (int i = 0; i < 5; i++) {
- JSONArray sublist = messageArray.getJSONArray(i);
- for (int j = 0; j < sublist.size(); j++) {
- Object value = sublist.get(j);
- if (value != null && !value.toString().equals("null")) {
- try {
- String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
- short sValue = Short.parseShort(cleanedValue.trim());
- mergedList.add(sValue);
- } catch (NumberFormatException e) {
- // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
- System.err.println("Could not parse value: " + value);
- }
- }
- }
- }
-
-
- // 鍐欏叆绗瑈i涓湴鍧�
- if (!mergedList.isEmpty()) {
-// S7control.getinstance().WriteWord(addressList3, mergedList);
- System.out.println("messageValue锛�" + mergedList + " written to PLC at address " + addressList3);
- }
-
- // 娓呯┖娑堟伅鍒楄〃
- webSocketServer.clearMessages();
+ // 鏁村悎绗� 1 鍒� 3 涓暟缁勫苟鍘绘帀 null 鍏冪礌
+ List<Short> mergedList = new ArrayList<>();
+ for (int i = 0; i < 5; i++) {
+ JSONArray sublist = messageArray.getJSONArray(i);
+ for (int j = 0; j < sublist.size(); j++) {
+ Object value = sublist.get(j);
+ if (value != null && !value.toString().equals("null")) {
+ try {
+ String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
+ short sValue = Short.parseShort(cleanedValue.trim());
+ mergedList.add(sValue);
+ } catch (NumberFormatException e) {
+ // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+ System.err.println("Could not parse value: " + value);
}
-
-
+ }
}
+ }
+
+ // 鍐欏叆绗瑈i涓湴鍧�
+ if (!mergedList.isEmpty()) {
+ // S7control.getinstance().WriteWord(addressList3, mergedList);
+ System.out.println("messageValue锛�" + mergedList + " written to PLC at address " + addressList3);
+ }
+
+ // 娓呯┖娑堟伅鍒楄〃
+ webSocketServer.clearMessages();
}
+
+ }
}
+ }
}
--
Gitblit v1.8.0