From 46f29e79b43be98199d0727a71d85dddaa6e1fd4 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 15 十二月 2023 10:00:23 +0800
Subject: [PATCH] 增加A01 A02行走伺服回零 输入密码才能点击
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java | 80 ++++++++-------------------------------
1 files changed, 17 insertions(+), 63 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 e4889b3..89f1811 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
@@ -13,10 +13,16 @@
public class PlcParameter2 extends Thread {
+ // 鐢ㄤ簬瀛樺偍搴旂敤绋嬪簭鐨勯厤缃俊鎭�
+ private Configuration config;
// 鍒涘缓涓�涓嚜瀹氫箟鐨� S7 鎺у埗鍣ㄦ秷鎭鐞嗗櫒瀵硅薄
MessageHandler customS7Control = new MessageHandler();
+
+ public PlcParameter2() throws IOException {
+ config = new Configuration("config.properties");
+ }
@Override
public void run() {
@@ -29,74 +35,36 @@
}
// id
- 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> addressList1 = Arrays.asList(config.getProperty("Parameter2.id").split(","));
List<String> paramlist = S7control.getinstance().readStrings(addressList1);
//鎵嬪姩鐘舵��
- 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<String> addresses = Arrays.asList(config.getProperty("Parameter2.state").split(","));
+
List<Short> data = S7control.getinstance().readWords(addresses);
//娓呴櫎id
- List<String> addressList0 = new ArrayList<>();
+ List<String> addressList0 = Arrays.asList(config.getProperty("Parameter2.cleanid").split(","));
- 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 = new ArrayList<>();
- addressList3.add("DB103.256");
- addressList3.add("DB103.270");
+ List<String> addressList3 = Arrays.asList(config.getProperty("Parameter2.scanner").split(","));
+//鎬ュ仠鎸夐挳
+ 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);
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<String> addresses4 = Arrays.asList(config.getProperty("Parameter2.Currentcell").split(","));
+
List<Short> data4 = S7control.getinstance().readWords(addresses4);
@@ -160,18 +128,6 @@
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()) {
@@ -180,11 +136,9 @@
// System.out.println("lastMessage锛�" + lastMessage);
JSONArray messageArray = new JSONArray(lastMessage);
//娓呴櫎ID
- customS7Control.writeBitToPLC(messageArray, addressList, 0);
+ customS7Control.writeBitToPLC(messageArray, addressList0, 0);
//鎬ュ仠
customS7Control.writeBitToPLC(messageArray, niuanaddressList3, 1);
-
-
// 娓呯┖娑堟伅鍒楄〃
webserver.clearMessages();
}
--
Gitblit v1.8.0