From 9057d8571f11a552a326fa35fda9b5ec614f5c58 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 23 四月 2024 09:33:09 +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 | 53 ++++++++++++-----------------------------------------
1 files changed, 12 insertions(+), 41 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..c1cc9db 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,24 +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);
+ //System.out.println("lastMessage锛�" + arraylist2);
//缈昏浆
List<Short> fanzhuan2 = S7control.getinstance().ReadWord("DB100.8", 1);
List<Short> xiaoche2 = S7control.getinstance().ReadWord("DB100.12", 1);
@@ -116,43 +114,21 @@
System.out.println(messageArray);
// 鍐欏叆绗竴涓湴鍧�
customS7Control.WriteWordsToPLC(messageArray, addressList2,2);
-
// 鍐欏叆绗簩涓湴鍧�
customS7Control.WriteWordsToPLC(messageArray, addressList3,3);
-
-
// 鍐欏叆绗笁涓湴鍧�
customS7Control.WriteWordsToPLC(messageArray, addressList4,4);
-
-
// 鍐欏叆绗洓涓湴鍧�
if (!mergedList.isEmpty()) {
S7control.getinstance().WriteWord(addressList1, mergedList);
System.out.println("messageValue锛�" + mergedList + " written to PLC at address " + addressList1);
}
-
- 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");
-
+ List<String> waddresses1 = Arrays.asList(config.getProperty("Auto.shusong").split(","));
String addressList22 = "DB100.8";
String addressList33 = "DB100.12";
-
if (!messages.isEmpty()) {
// 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
-
-
// 鏁村悎绗� 1 鍒� 3 涓暟缁勫苟鍘绘帀 null 鍏冪礌
List<Short> mergedList2 = new ArrayList<>();
for (int i = 5; i < 8; i++) {
@@ -174,18 +150,13 @@
// 鍐欏叆绗紞涓湴鍧�
customS7Control.WriteWordsToPLC(messageArray, addressList22,8);
-
-
// 鍐欏叆绗叚涓湴鍧�
customS7Control.WriteWordsToPLC(messageArray, addressList33,9);
-
// 鍐欏叆绗竷涓湴鍧�
if (!mergedList2.isEmpty()) {
S7control.getinstance().WriteWord(waddresses1, mergedList2);
System.out.println("messageValue锛�" + mergedList2 + " written to PLC at address " + waddresses1);
}
-
-
// 娓呯┖娑堟伅鍒楄〃
webserver.clearMessages();
}
--
Gitblit v1.8.0