From 37f7f87968cfd2c400283fbf83851c39c2c4d456 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 20 十二月 2023 08:12:26 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSetting.java | 39 +++++++++++++--------------------------
1 files changed, 13 insertions(+), 26 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 d6f44b4..7ae28fc 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
@@ -11,8 +11,16 @@
public class PLCAutomaticParameterSetting extends Thread {
+ // 鐢ㄤ簬瀛樺偍搴旂敤绋嬪簭鐨勯厤缃俊鎭�
+ private Configuration config;
+
// 鍒涘缓涓�涓嚜瀹氫箟鐨� S7 鎺у埗鍣ㄦ秷鎭鐞嗗櫒瀵硅薄
MessageHandler customS7Control = new MessageHandler();
+
+
+ public PLCAutomaticParameterSetting() throws IOException {
+ config = new Configuration("config.properties");
+ }
@Override
public void run() {
while (this != null) {
@@ -25,23 +33,14 @@
// 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);
//缈昏浆
List<Short> fanzhuan2 = S7control.getinstance().ReadWord("DB100.8", 1);
@@ -131,20 +130,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";
--
Gitblit v1.8.0