From 536ba9c36bc53201cfbafb7a1063f119a2ee3a1d Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 30 十一月 2023 09:40:44 +0800
Subject: [PATCH] 更新主界面

---
 springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter1.java |   45 ++++++++++++++++++++++-----------------------
 1 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter1.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter1.java
index 5e7007a..d1518f6 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter1.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter1.java
@@ -66,22 +66,20 @@
       } catch (InterruptedException e) {
         e.printStackTrace();
       }
-//      this.readValue();
-//      String PlcAddress = this.name;
-//      Integer Plccount = this.count;
+      // this.readValue();
+      // String PlcAddress = this.name;
+      // Integer Plccount = this.count;
 
       // System.out.println(stt);
-       List<Short> arraylist = S7control.getinstance().ReadWord("DB100.0", 12);
-       List<Short> fanzhuan1 = S7control.getinstance().ReadWord("DB100.8", 1);
-       List<Short> xiaoche1 = S7control.getinstance().ReadWord("DB100.12", 1);
-//      Short[] values1 = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 };
-//      List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
-//      Short[] fanzhuan = { 4 };
-//      List<Short> fanzhuan1 = new ArrayList<>(Arrays.asList(fanzhuan));
-//      Short[] xiaoche = {5};
-//      List<Short> xiaoche1 = new ArrayList<>(Arrays.asList(xiaoche));
-
-
+      List<Short> arraylist = S7control.getinstance().ReadWord("DB100.0", 12);
+      List<Short> fanzhuan1 = S7control.getinstance().ReadWord("DB100.8", 1);
+      List<Short> xiaoche1 = S7control.getinstance().ReadWord("DB100.12", 1);
+      // Short[] values1 = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 };
+      // List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
+      // Short[] fanzhuan = { 4 };
+      // List<Short> fanzhuan1 = new ArrayList<>(Arrays.asList(fanzhuan));
+      // Short[] xiaoche = {5};
+      // List<Short> xiaoche1 = new ArrayList<>(Arrays.asList(xiaoche));
 
       JSONObject jsonObject = new JSONObject();
       // new short[]{1,1, 1, 1, 1, 1, 2, 33, 2,3, 4, 5}
@@ -106,7 +104,7 @@
         if (!messages.isEmpty()) {
           // 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
           String lastMessage = messages.get(messages.size() - 1);
-//        System.out.println("lastMessage锛�" + lastMessage);
+          // System.out.println("lastMessage锛�" + lastMessage);
           JSONArray messageArray = new JSONArray(lastMessage);
 
           // 鏁村悎绗� 1 鍒� 3 涓暟缁勫苟鍘绘帀 null 鍏冪礌
@@ -135,8 +133,9 @@
               try {
                 String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
                 short sValue = Short.parseShort(cleanedValue.trim());
-               S7control.getinstance().WriteWord(addressList1, Arrays.asList(sValue));
-                System.out.println("messageValue锛�" + Arrays.asList(sValue) + " written to PLC at address " + addressList1);
+                S7control.getinstance().WriteWord(addressList1, Arrays.asList(sValue));
+                System.out
+                    .println("messageValue锛�" + Arrays.asList(sValue) + " written to PLC at address " + addressList3);
               } catch (NumberFormatException e) {
                 // 濡傛灉鏃犳硶瑙f瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
                 System.err.println("Could not parse value: " + value);
@@ -151,8 +150,9 @@
               try {
                 String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
                 short sValue = Short.parseShort(cleanedValue.trim());
-               S7control.getinstance().WriteWord(addressList2, Arrays.asList(sValue));
-                System.out.println("messageValue锛�" + Arrays.asList(sValue) + " written to PLC at address " + addressList2);
+                S7control.getinstance().WriteWord(addressList2, Arrays.asList(sValue));
+                System.out
+                    .println("messageValue锛�" + Arrays.asList(sValue) + " written to PLC at address " + addressList2);
               } catch (NumberFormatException e) {
                 // 濡傛灉鏃犳硶瑙f瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
                 System.err.println("Could not parse value: " + value);
@@ -162,16 +162,15 @@
 
           // 鍐欏叆绗笁涓湴鍧�
           if (!mergedList.isEmpty()) {
-          S7control.getinstance().WriteWord(addressList3, mergedList);
-            System.out.println("messageValue锛�" + mergedList + " written to PLC at address " + addressList3);
+            S7control.getinstance().WriteWord(addressList3, mergedList);
+            System.out.println("messageValue锛�" + mergedList + " written to PLC at address " + addressList1);
           }
 
           // 娓呯┖娑堟伅鍒楄〃
           webSocketServer.clearMessages();
         }
-      
 
-    }
+      }
 
     }
   }

--
Gitblit v1.8.0