From 8dfb37b10ffb2fcb41c85b3fa266d1ef2874aebc Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 30 十一月 2023 08:53:27 +0800
Subject: [PATCH] 修改电气管理PLC通讯逻辑

---
 springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter1.java |   51 +++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 39 insertions(+), 12 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 d1518f6..e2fa2b8 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
@@ -71,9 +71,23 @@
       // 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);
+      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> arraylist = S7control.getinstance().readWords(addresses);
+
+    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 };
@@ -86,8 +100,8 @@
       // new short[]{0,0, 0, 0, 0, 0, 0, 0, 0, 0}
 
       jsonObject.append("params", arraylist);
-      jsonObject.append("fanzhuan", fanzhuan1);
-      jsonObject.append("xiaoche", xiaoche1);
+     jsonObject.append("fanzhuan", fanzhuan1);
+     jsonObject.append("xiaoche", xiaoche1);
 
       WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Parameter1");
       if (sendwServer != null) {
@@ -97,7 +111,20 @@
       WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("Parameter1");
       if (webSocketServer != null) {
         List<String> messages = webSocketServer.getMessages();
-        String addressList1 = "DB100.0";
+        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 addressList2 = "DB100.8";
         String addressList3 = "DB100.12";
 
@@ -133,9 +160,9 @@
               try {
                 String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
                 short sValue = Short.parseShort(cleanedValue.trim());
-                S7control.getinstance().WriteWord(addressList1, Arrays.asList(sValue));
+                S7control.getinstance().WriteWord(addressList2, Arrays.asList(sValue));
                 System.out
-                    .println("messageValue锛�" + Arrays.asList(sValue) + " written to PLC at address " + addressList3);
+                    .println("messageValue锛�" + Arrays.asList(sValue) + " written to PLC at address " + addressList2);
               } catch (NumberFormatException e) {
                 // 濡傛灉鏃犳硶瑙f瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
                 System.err.println("Could not parse value: " + value);
@@ -150,9 +177,9 @@
               try {
                 String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
                 short sValue = Short.parseShort(cleanedValue.trim());
-                S7control.getinstance().WriteWord(addressList2, Arrays.asList(sValue));
+                S7control.getinstance().WriteWord(addressList3, Arrays.asList(sValue));
                 System.out
-                    .println("messageValue锛�" + Arrays.asList(sValue) + " written to PLC at address " + addressList2);
+                    .println("messageValue锛�" + Arrays.asList(sValue) + " written to PLC at address " + addressList3);
               } catch (NumberFormatException e) {
                 // 濡傛灉鏃犳硶瑙f瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
                 System.err.println("Could not parse value: " + value);
@@ -162,8 +189,8 @@
 
           // 鍐欏叆绗笁涓湴鍧�
           if (!mergedList.isEmpty()) {
-            S7control.getinstance().WriteWord(addressList3, mergedList);
-            System.out.println("messageValue锛�" + mergedList + " written to PLC at address " + addressList1);
+            S7control.getinstance().WriteWord(waddresses1, mergedList);
+            System.out.println("messageValue锛�" + mergedList + " written to PLC at address " + waddresses1);
           }
 
           // 娓呯┖娑堟伅鍒楄〃

--
Gitblit v1.8.0