From 86eb351c3eda127933902c927623c043eeb7210b Mon Sep 17 00:00:00 2001
From: clll <1320612696@qq.com>
Date: 星期三, 29 十一月 2023 11:00:47 +0800
Subject: [PATCH] 测试后修改地址,添加界面缺少的下发与读写功能

---
 springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java |   37 +++++++++++++++----------------------
 1 files changed, 15 insertions(+), 22 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 5c4348d..7d65157 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
@@ -67,7 +67,6 @@
         e.printStackTrace();
       }
 
-
       List<String> addressList1 = new ArrayList<>();
       addressList1.add("DB103.32~45");
       addressList1.add("DB103.46~59");
@@ -82,7 +81,6 @@
       addressList1.add("DB103.228~241");
       List<Boolean> paramlist = S7control.getinstance().readBits(addressList1);
 
-
       List<String> addresses = new ArrayList<>();
       addresses.add("DB103.0");
       addresses.add("DB103.2");
@@ -96,11 +94,9 @@
       addresses.add("DB103.6");
       List<Short> data = S7control.getinstance().readWords(addresses);
 
-
-
       List<Boolean> data2 = S7control.getinstance().ReadBits("DB101.9.2", 10);
       List<String> addressList3 = new ArrayList<>();
-      addressList3.add("DB106.64-DB106.77");
+      addressList3.add("DB103.6");
       List<Boolean> data3 = S7control.getinstance().readBits(addressList3);
 
       List<String> addresses4 = new ArrayList<>();
@@ -111,19 +107,17 @@
 
       List<Short> data4 = S7control.getinstance().readWords(addresses4);
 
-
-//     Boolean[] values = { false, true, true, true, true, true, true, true, true,
-//            true};
-//      List<Boolean> paramlist = new ArrayList<>(Arrays.asList(values));
-//      Short[] values1 = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
-//     List<Short> data = new ArrayList<>(Arrays.asList(values1));
-//      Short[] values2 = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
-//     List<Short> data2 = new ArrayList<>(Arrays.asList(values2));
-//      Short[] values3 = { 11};
-//     List<Short> data3 = new ArrayList<>(Arrays.asList(values3));
-//      Short[] values4 = { 2,2,3,4};
-//      List<Short> data4 = new ArrayList<>(Arrays.asList(values4));
-
+      // Boolean[] values = { false, true, true, true, true, true, true, true, true,
+      // true};
+      // List<Boolean> paramlist = new ArrayList<>(Arrays.asList(values));
+      // Short[] values1 = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
+      // List<Short> data = new ArrayList<>(Arrays.asList(values1));
+      // Short[] values2 = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
+      // List<Short> data2 = new ArrayList<>(Arrays.asList(values2));
+      // Short[] values3 = { 11};
+      // List<Short> data3 = new ArrayList<>(Arrays.asList(values3));
+      // Short[] values4 = { 2,2,3,4};
+      // List<Short> data4 = new ArrayList<>(Arrays.asList(values4));
 
       JSONObject jsonObject = new JSONObject();
       short[] params = new short[paramlist.size()];
@@ -133,11 +127,10 @@
       }
 
       jsonObject.append("params", params);
-      jsonObject.append("params", data2);
       jsonObject.append("params", data);
+      jsonObject.append("params", data2);
       jsonObject.append("params", data3);
       jsonObject.append("params", data4);
-
 
       WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Parameter2");
       if (sendwServer != null) {
@@ -165,7 +158,7 @@
               messageValues.add(value);
             } catch (NumberFormatException e) {
               // 濡傛灉鏃犳硶瑙f瀽涓烘暣鏁扮被鍨嬶紝鍒欏拷鐣ヨ閮ㄥ垎
-//              e.printStackTrace();
+              // e.printStackTrace();
             }
           }
 
@@ -176,7 +169,7 @@
           }
 
           // 灏嗗竷灏斿垪琛ㄥ啓鍏� PLC
-         S7control.getinstance().WriteBit(addressList, messageBooleans);
+          S7control.getinstance().WriteBit(addressList, messageBooleans);
           System.out.println("messageValues锛�" + messageBooleans);
           System.out.println("addressList锛�" + addressList);
           // 娓呯┖娑堟伅鍒楄〃

--
Gitblit v1.8.0