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/PlcParameter2.java | 223 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 172 insertions(+), 51 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java
index 3b02ae3..361b818 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java
@@ -12,26 +12,52 @@
public class PlcParameter2 extends Thread {
-
-
- // 鐢ㄤ簬瀛樺偍搴旂敤绋嬪簭鐨勯厤缃俊鎭�
- private Configuration config;
-
- // 鍒涘缓涓�涓嚜瀹氫箟鐨� S7 鎺у埗鍣ㄦ秷鎭鐞嗗櫒瀵硅薄
- MessageHandler customS7Control = new MessageHandler();
-
-
- public PlcParameter2() throws IOException {
- config = new Configuration("config.properties");
- }
-
+ 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;
+ }
+ // 灏唖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");
+
+ }
+
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
@Override
public void run() {
@@ -43,42 +69,78 @@
e.printStackTrace();
}
- // id
- List<String> addressList1 = Arrays.asList(config.getProperty("Parameter2.id").split(","));
+ // 鎵嬪姩鐘舵�佸湴鍧�
+ List<String> addressList1 = new ArrayList<>();
+ addressList1.add("DB103.44");//D01
+ addressList1.add("DB103.58");//D02
+ addressList1.add("DB103.72");//D03
+ addressList1.add("DB103.86");//D04
+ addressList1.add("DB103.100");//D05
+ addressList1.add("DB103.114");//D06
+ addressList1.add("DB103.128");//A01
+ addressList1.add("DB103.142");//A01 2
+ addressList1.add("DB103.156");//A02
+ addressList1.add("DB103.184");//B01
+ addressList1.add("DB103.212");//B02
List<String> paramlist = S7control.getinstance().readStrings(addressList1);
//娓呴櫎ID鍦板潃
- List<String> addresses = Arrays.asList(config.getProperty("Parameter2.cleanid").split(","));
-
+ List<String> addresses = new ArrayList<>();
+ addresses.add("DB103.0");
+ addresses.add("DB103.2");
+ addresses.add("DB103.12");
+ addresses.add("DB103.14");
+ addresses.add("DB103.16");
+ addresses.add("DB103.18");
+ addresses.add("DB103.8");
+ addresses.add("DB103.10");
+ addresses.add("DB103.4");
+ addresses.add("DB103.6");
List<Short> data = S7control.getinstance().readWords(addresses);
- //鎵嬪姩鐘舵��
- List<String> addressList0 = Arrays.asList(config.getProperty("Parameter2.state").split(","));
+ //id
+ List<String> addressList0 = new ArrayList<>();
+ addressList0.add("DB101.9.2");
+ addressList0.add("DB101.9.3");
+ addressList0.add("DB101.9.4");
+ addressList0.add("DB101.9.5");
+ addressList0.add("DB101.9.6");
+ addressList0.add("DB101.9.7");
+ addressList0.add("DB101.10.0");
+ addressList0.add("DB101.10.1");
+ addressList0.add("DB101.10.2");
+ addressList0.add("DB101.10.3");
+
+ // 鎵爜鏋�
List<Boolean> data2 = S7control.getinstance().readBits(addressList0);
- // 鎵爜鏋�
- List<String> addressList3 = Arrays.asList(config.getProperty("Parameter2.scanner").split(","));
-
- List<String> data3 = S7control.getinstance().readStrings(addressList3);
+ List<String> addressList3 = new ArrayList<>();
+ addressList3.add("DB103.256");
+ addressList3.add("DB103.270");
-//鎬ュ仠
- List<String> niuanaddressList3 = Arrays.asList(config.getProperty("Parameter2.stop").split(","));
+
+ List<String> niuanaddressList3 = new ArrayList<>();
+
+ niuanaddressList3.add("DB101.10.4");
List<Boolean> anniuread = S7control.getinstance().readBits(niuanaddressList3);
-
-// A01 A02 B01 B02 褰撳墠鏍煎瓙
- List<String> addresses4 = Arrays.asList(config.getProperty("Parameter2.Currentcell").split(","));
-
+ List<String> data3 = S7control.getinstance().readStrings(addressList3);
+// A01 A02 B01 B02
+ List<String> addresses4 = new ArrayList<>();
+ addresses4.add("DB103.32");
+ addresses4.add("DB103.34");
+ addresses4.add("DB103.36");
+ addresses4.add("DB103.40");
List<Short> data4 = S7control.getinstance().readWords(addresses4);
@@ -90,7 +152,7 @@
-
+//
// String[] values6 = { ".x1 ","x2 ","x3",";;x4","x5","x6","x7","x8","x9","x10","x11"};
// List<String> paramlist = new ArrayList<>(Arrays.asList(values6));
// Short[] values1 = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1};
@@ -110,7 +172,7 @@
boolean value = data2.get(i);
params[i] = value ? (short) 1 : (short) 0;
}
-
+//
short[] anniuparams = new short[anniuread.size()];
for (int i = 0; i < anniuread.size(); i++) {
boolean value = anniuread.get(i);
@@ -122,43 +184,102 @@
jsonObject.append("params", data);
jsonObject.append("params", data3);
jsonObject.append("params", data4);
- jsonObject.append("jiting", anniuparams);
+ jsonObject.append("jiting", anniuparams);
+// WebSocketServer sendwServer = WebSocketServer.getWebSocketServer("Parameter2");
+// if (sendwServer != null) {
+// JSONObject jsonObject = new JSONObject();
+// jsonObject.set("message", "Hello, Parameter2!");
+// sendwServer.sendMessage(jsonObject.toString());
+// }
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("Parameter2");
if (sendwServer != null) {
- for (WebSocketServer webserver : sendwServer) {
- webserver.sendMessage(jsonObject.toString());
+ for (WebSocketServer webserver : sendwServer) {
+
+ webserver.sendMessage(jsonObject.toString());
+ if (webserver != null) {
- List<String> messages = webserver.getMessages();
+ List<String> messages = webserver.getMessages();
+ List<String> addressList = new ArrayList<>();
+
+ addressList.add("DB101.9.2");
+ addressList.add("DB101.9.3");
+ addressList.add("DB101.9.4");
+ addressList.add("DB101.9.5");
+ addressList.add("DB101.9.6");
+ addressList.add("DB101.9.7");
+ addressList.add("DB101.10.0");
+ addressList.add("DB101.10.1");
+ addressList.add("DB101.10.2");
+ addressList.add("DB101.10.3");
-
-
-
- if (!messages.isEmpty()) {
- // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
- String lastMessage = messages.get(messages.size() - 1);
+ if (!messages.isEmpty()) {
+ // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
+ String lastMessage = messages.get(messages.size() - 1);
// System.out.println("lastMessage锛�" + lastMessage);
- JSONArray messageArray = new JSONArray(lastMessage);
+ JSONArray messageArray = new JSONArray(lastMessage);
- //娓呴櫎id
- customS7Control.writeBitToPLC( messageArray, addresses,0);
+ if (messageArray.getJSONArray(0).size() > 0) {
+ JSONArray jsonArray3 = messageArray.getJSONArray(0);
+ 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-]", "");
+ boolean val = "1".equals(cleanedValue.trim());
+ sValue3.add(val);
+ System.out.println("messageValue: " + Arrays.asList(val) + " added to the list");
+ } catch (NumberFormatException e) {
+ // 濡傛灉鏃犳硶瑙ｆ瀽涓� boolean 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+ System.err.println("Could not parse value: " + value);
+ }
+ }
+ }
+ if (!sValue3.isEmpty()) {
+ S7control.getinstance().WriteBit(addressList, sValue3);
+ System.out.println("Values " + sValue3 + " written to PLC at address " + addressList);
+ }
+ }
+ // 灏嗗竷灏斿垪琛ㄥ啓鍏� PLC
+ if (messageArray.getJSONArray(1).size() > 0) {
+ JSONArray jsonArray3 = messageArray.getJSONArray(1);
+ 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-]", "");
+ boolean val = "1".equals(cleanedValue.trim());
+ sValue3.add(val);
+ System.out.println("messageValue: " + Arrays.asList(val) + " added to the list");
+ } catch (NumberFormatException e) {
+ // 濡傛灉鏃犳硶瑙ｆ瀽涓� boolean 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+ System.err.println("Could not parse value: " + value);
+ }
+ }
+ }
+ if (!sValue3.isEmpty()) {
+ S7control.getinstance().WriteBit(niuanaddressList3, sValue3);
- //鎬ュ仠
- customS7Control.writeBitToPLC( messageArray, niuanaddressList3,1);
+ System.out.println("Values " + sValue3 + " written to PLC at address " + sValue3);
+ }
+ }
- // 娓呯┖娑堟伅鍒楄〃
- webserver.clearMessages();
- }
- }
+ // 娓呯┖娑堟伅鍒楄〃
+ webserver.clearMessages();
+ }
+ }
+ }
}
- }
+ }
}
}
--
Gitblit v1.8.0