From df73c9042ce5bfc91f9d2a0472aa070fa22aa5df Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 21 十二月 2023 15:11:29 +0800
Subject: [PATCH] 修改终止进出片方法
---
springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSetting.java | 174 ++++++++-------------------------------------------------
1 files changed, 25 insertions(+), 149 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSetting.java b/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSetting.java
index 9bd4e04..3532c83 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSetting.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSetting.java
@@ -10,53 +10,17 @@
import java.util.List;
public class PLCAutomaticParameterSetting 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 PLCAutomaticParameterSetting() 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() {
while (this != null) {
@@ -66,29 +30,20 @@
} 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.120", 8);
List<Short> dache1 = S7control.getinstance().ReadWord("DB100.18", 1);
List<Short> xiaoche1 = S7control.getinstance().ReadWord("DB100.22", 1);
List<Short> fanzhuan1 = S7control.getinstance().ReadWord("DB100.14", 1);
- List<String> addresses = new ArrayList<>();
- addresses.add("DB100.0");
- addresses.add("DB100.2");
- addresses.add("DB100.4");
- addresses.add("DB100.6");
- addresses.add("DB100.26");
- addresses.add("DB100.28");
- addresses.add("DB100.30");
- addresses.add("DB100.32");
- addresses.add("DB100.34");
- addresses.add("DB100.36");
- addresses.add("DB100.38");
- addresses.add("DB100.40");
+
+ List<String> addresses = Arrays.asList(config.getProperty("Auto.addresses").split(","));
+
List<Short> arraylist2 = S7control.getinstance().readWords(addresses);
+ //System.out.println("lastMessage锛�" + arraylist2);
+
//缈昏浆
List<Short> fanzhuan2 = S7control.getinstance().ReadWord("DB100.8", 1);
List<Short> xiaoche2 = S7control.getinstance().ReadWord("DB100.12", 1);
@@ -161,55 +116,15 @@
}
System.out.println(messageArray);
// 鍐欏叆绗竴涓湴鍧�
- if (messageArray.getJSONArray(2).size() > 0) {
- Object value = messageArray.getJSONArray(2).get(0);
- if (value != null && !value.toString().equals("null")) {
- try {
- String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
- short sValue = Short.parseShort(cleanedValue.trim());
- S7control.getinstance().WriteWord(addressList2, Arrays.asList(sValue));
- System.out
- .println("messageValue锛�" + Arrays.asList(sValue) + " written to PLC at address " + addressList2);
- } catch (NumberFormatException e) {
- // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
- System.err.println("Could not parse value: " + value);
- }
- }
- }
+ customS7Control.WriteWordsToPLC(messageArray, addressList2,2);
// 鍐欏叆绗簩涓湴鍧�
- if (messageArray.getJSONArray(3).size() > 0) {
- Object value = messageArray.getJSONArray(3).get(0);
- if (value != null && !value.toString().equals("null")) {
- try {
- String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
- short sValue = Short.parseShort(cleanedValue.trim());
- S7control.getinstance().WriteWord(addressList3, Arrays.asList(sValue));
- System.out
- .println("messageValue锛�" + Arrays.asList(sValue) + " written to PLC at address " + addressList3);
- } catch (NumberFormatException e) {
- // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
- System.err.println("Could not parse value: " + value);
- }
- }
- }
+ customS7Control.WriteWordsToPLC(messageArray, addressList3,3);
+
// 鍐欏叆绗笁涓湴鍧�
- if (messageArray.getJSONArray(4).size() > 0) {
- Object value = messageArray.getJSONArray(4).get(0);
- if (value != null && !value.toString().equals("null")) {
- try {
- String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
- short sValue = Short.parseShort(cleanedValue.trim());
- S7control.getinstance().WriteWord(addressList4, Arrays.asList(sValue));
- System.out
- .println("messageValue锛�" + Arrays.asList(sValue) + " written to PLC at address " + addressList4);
- } catch (NumberFormatException e) {
- // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
- System.err.println("Could not parse value: " + value);
- }
- }
- }
+ customS7Control.WriteWordsToPLC(messageArray, addressList4,4);
+
// 鍐欏叆绗洓涓湴鍧�
if (!mergedList.isEmpty()) {
@@ -217,20 +132,8 @@
System.out.println("messageValue锛�" + mergedList + " written to PLC at address " + addressList1);
}
+ List<String> waddresses1 = Arrays.asList(config.getProperty("Auto.shusong").split(","));
- List<String> waddresses1 = new ArrayList<>();
- waddresses1.add("DB100.0");
- waddresses1.add("DB100.2");
- waddresses1.add("DB100.4");
- waddresses1.add("DB100.6");
- waddresses1.add("DB100.26");
- waddresses1.add("DB100.28");
- waddresses1.add("DB100.30");
- waddresses1.add("DB100.32");
- waddresses1.add("DB100.34");
- waddresses1.add("DB100.36");
- waddresses1.add("DB100.38");
- waddresses1.add("DB100.40");
String addressList22 = "DB100.8";
String addressList33 = "DB100.12";
@@ -259,38 +162,11 @@
}
// 鍐欏叆绗紞涓湴鍧�
- if (messageArray.getJSONArray(8).size() > 0) {
- Object value = messageArray.getJSONArray(8).get(0);
- if (value != null && !value.toString().equals("null")) {
- try {
- String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
- short sValue = Short.parseShort(cleanedValue.trim());
- S7control.getinstance().WriteWord(addressList22, Arrays.asList(sValue));
- System.out
- .println("messageValue锛�" + Arrays.asList(sValue) + " written to PLC at address " + addressList2);
- } catch (NumberFormatException e) {
- // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
- System.err.println("Could not parse value: " + value);
- }
- }
- }
+ customS7Control.WriteWordsToPLC(messageArray, addressList22,8);
+
// 鍐欏叆绗叚涓湴鍧�
- if (messageArray.getJSONArray(9).size() > 0) {
- Object value = messageArray.getJSONArray(9).get(0);
- if (value != null && !value.toString().equals("null")) {
- try {
- String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
- short sValue = Short.parseShort(cleanedValue.trim());
- S7control.getinstance().WriteWord(addressList33, Arrays.asList(sValue));
- System.out
- .println("messageValue锛�" + Arrays.asList(sValue) + " written to PLC at address " + addressList3);
- } catch (NumberFormatException e) {
- // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
- System.err.println("Could not parse value: " + value);
- }
- }
- }
+ customS7Control.WriteWordsToPLC(messageArray, addressList33,9);
// 鍐欏叆绗竷涓湴鍧�
if (!mergedList2.isEmpty()) {
--
Gitblit v1.8.0