From 69d6f1711a32ba4d1a989fef6b3640ff5ae4f2e2 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期二, 12 十二月 2023 13:15:40 +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 | 206 ++++++++++++++++++++++++++++-----------------------
1 files changed, 113 insertions(+), 93 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 466e88b..3b02ae3 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
@@ -7,138 +7,158 @@
import java.io.*;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
+
public class PlcParameter2 extends Thread {
- String name = "";
- Integer count = 0;
+
+
+ // 鐢ㄤ簬瀛樺偍搴旂敤绋嬪簭鐨勯厤缃俊鎭�
+ private Configuration config;
+
+ // 鍒涘缓涓�涓嚜瀹氫箟鐨� S7 鎺у埗鍣ㄦ秷鎭鐞嗗櫒瀵硅薄
+ MessageHandler customS7Control = new MessageHandler();
+
+
+ public PlcParameter2() throws IOException {
+ config = new Configuration("config.properties");
+ }
+
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() {
while (this != null) {
try {
- Thread.sleep(500);
+ Thread.sleep(1000);
} catch (InterruptedException e) {
e.printStackTrace();
}
-// this.readValue();
-// String PlcAddress = this.name;
-// Integer Plccount = this.count;
- // System.out.println(stt);
- // List<Short> arraylist = S7control.getinstance().ReadWord("DB100.0", 12);
- // List<Short> state = S7control.getinstance().ReadWord("DB103.0", 10);
+ // id
+ List<String> addressList1 = Arrays.asList(config.getProperty("Parameter2.id").split(","));
- Boolean[] values = { false, true, true, true, true, true, true, true, true,
- true};
- List<Boolean> paramlist = new ArrayList<>(Arrays.asList(values));
- Short[] values1 = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
- List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
- Short[] values2 = { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 };
- List<Short> state = new ArrayList<>(Arrays.asList(values2));
+ List<String> paramlist = S7control.getinstance().readStrings(addressList1);
+
+
+ //娓呴櫎ID鍦板潃
+ List<String> addresses = Arrays.asList(config.getProperty("Parameter2.cleanid").split(","));
+
+ List<Short> data = S7control.getinstance().readWords(addresses);
+
+
+ //鎵嬪姩鐘舵��
+ List<String> addressList0 = Arrays.asList(config.getProperty("Parameter2.state").split(","));
+
+
+ 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> niuanaddressList3 = Arrays.asList(config.getProperty("Parameter2.stop").split(","));
+
+ List<Boolean> anniuread = S7control.getinstance().readBits(niuanaddressList3);
+
+
+
+
+// A01 A02 B01 B02 褰撳墠鏍煎瓙
+ List<String> addresses4 = Arrays.asList(config.getProperty("Parameter2.Currentcell").split(","));
+
+
+ List<Short> data4 = S7control.getinstance().readWords(addresses4);
+
+// List<Long> TIME2 = Collections.singletonList(S7control.getinstance().readtime("DB100.194"));
+// System.out.println("addressList锛�" + TIME2);
+
+
+ //
+
+
+
+
+// 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};
+// List<Short> data = new ArrayList<>(Arrays.asList(values1));
+// Boolean[] value4 = { false, false, false, false, false, false, false, false, false,
+// false};
+// List<Boolean> data2 = new ArrayList<>(Arrays.asList(value4));
+// String[] values3 = { ".x11 ","x21 "};
+// List<String> data3 = new ArrayList<>(Arrays.asList(values3));
+// Short[] values4 = { 2,2,3,4};
+// List<Short> data4 = new ArrayList<>(Arrays.asList(values4));
+//
+//
JSONObject jsonObject = new JSONObject();
- short[] params = new short[paramlist.size()];
- for (int i = 0; i < paramlist.size(); i++) {
- boolean value = paramlist.get(i);
+ short[] params = new short[data2.size()];
+ for (int i = 0; i < data2.size(); i++) {
+ boolean value = data2.get(i);
params[i] = value ? (short) 1 : (short) 0;
}
- // new short[]{1,1, 1, 1, 1, 1, 2, 33, 2,3, 4, 5}
- // new short[]{0,0, 0, 0, 0, 0, 0, 0, 0, 0}
- jsonObject.append("params", params);
- jsonObject.append("params", arraylist);
- jsonObject.append("params", state);
- WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Parameter2");
- if (sendwServer != null) {
- sendwServer.sendMessage(jsonObject.toString());
+ short[] anniuparams = new short[anniuread.size()];
+ for (int i = 0; i < anniuread.size(); i++) {
+ boolean value = anniuread.get(i);
+ anniuparams[i] = value ? (short) 1 : (short) 0;
}
- WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("Parameter2");
- if (webSocketServer != null) {
+ jsonObject.append("params", params);
+ jsonObject.append("params", paramlist);
+ jsonObject.append("params", data);
+ jsonObject.append("params", data3);
+ jsonObject.append("params", data4);
+ jsonObject.append("jiting", anniuparams);
- List<String> messages = webSocketServer.getMessages();
- String addressList = "DB2.0.0";
+
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("Parameter2");
+ if (sendwServer != null) {
+ for (WebSocketServer webserver : sendwServer) {
+ webserver.sendMessage(jsonObject.toString());
+
+
+
+
+ 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();
- }
- }
+// System.out.println("lastMessage锛�" + lastMessage);
+ JSONArray messageArray = new JSONArray(lastMessage);
- // 灏嗘秷鎭�艰浆鎹负甯冨皵鍒楄〃
- List<Boolean> messageBooleans = new ArrayList<>();
- for (Integer value : messageValues) {
- messageBooleans.add(value == 1 ? true : false);
- }
+ //娓呴櫎id
+ customS7Control.writeBitToPLC( messageArray, addresses,0);
- // 灏嗗竷灏斿垪琛ㄥ啓鍏� PLC
-// S7control.getinstance().WriteBit(addressList, messageBooleans);
- System.out.println("messageValues锛�" + messageBooleans);
- System.out.println("addressList锛�" + addressList);
+ //鎬ュ仠
+ customS7Control.writeBitToPLC( messageArray, niuanaddressList3,1);
+
+
// 娓呯┖娑堟伅鍒楄〃
- webSocketServer.clearMessages();
+ webserver.clearMessages();
}
}
+ }
+ }
}
}
-}
+
--
Gitblit v1.8.0