From e7eaa7bb402aae3bb88d9219e50f0e1179f3257f Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期二, 26 十二月 2023 09:28:52 +0800
Subject: [PATCH] layout 布局页增加A01 A02终止继续后选择 弹框

---
 springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSetting.java |   87 +++++++++++++++++++------------------------
 1 files changed, 38 insertions(+), 49 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..76ba5f6 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,44 +33,37 @@
 
 
       // 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<Short> arraylist2 = S7control.getinstance().readWords(addresses);
-//缈昏浆
-      List<Short> fanzhuan2 = S7control.getinstance().ReadWord("DB100.8", 1);
-      List<Short> xiaoche2 = S7control.getinstance().ReadWord("DB100.12", 1);
 
-
-//       Short[] values1 = { 1, 2, 3, 4, 5, 6, 7, 8 };
-//       List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
-//       Short[] fanzhuan = { 4 };
-//       List<Short> fanzhuan1 = new ArrayList<>(Arrays.asList(fanzhuan));
-//       Short[] dache = { 5 };
-//       List<Short> dache1 = new ArrayList<>(Arrays.asList(dache));
-//       Short[] xiaoche = { 6 };
-//       List<Short> xiaoche1 = new ArrayList<>(Arrays.asList(xiaoche));
+//      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);
 //
-//       Short[] values2 = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 };
-//       List<Short> arraylist2 = new ArrayList<>(Arrays.asList(values2));
-//       Short[] fanzhuan22 = { 4 };
-//       List<Short> fanzhuan2 = new ArrayList<>(Arrays.asList(fanzhuan22));
-//       Short[] xiaoche22 = {5};
-//       List<Short> xiaoche2 = new ArrayList<>(Arrays.asList(xiaoche22));
+//      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);
+
+
+       Short[] values1 = { 1, 2, 3, 4, 5, 6, 7, 8 };
+       List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
+       Short[] fanzhuan = { 4 };
+       List<Short> fanzhuan1 = new ArrayList<>(Arrays.asList(fanzhuan));
+       Short[] dache = { 5 };
+       List<Short> dache1 = new ArrayList<>(Arrays.asList(dache));
+       Short[] xiaoche = { 6 };
+       List<Short> xiaoche1 = new ArrayList<>(Arrays.asList(xiaoche));
+
+       Short[] values2 = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 };
+       List<Short> arraylist2 = new ArrayList<>(Arrays.asList(values2));
+       Short[] fanzhuan22 = { 4 };
+       List<Short> fanzhuan2 = new ArrayList<>(Arrays.asList(fanzhuan22));
+       Short[] xiaoche22 = {5};
+       List<Short> xiaoche2 = new ArrayList<>(Arrays.asList(xiaoche22));
 
       JSONObject jsonObject = new JSONObject();
       // new short[]{1,1, 1, 1, 1, 1, 2, 33, 2,3, 4, 5}
@@ -131,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";

--
Gitblit v1.8.0