From 209a57aecbf26911f6a3ae0692b51ed0289f5b1a Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 14 九月 2023 17:04:56 +0800
Subject: [PATCH] 优化理片笼逻辑

---
 springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java |  139 ++++++++++++++++++++-------------------------
 1 files changed, 62 insertions(+), 77 deletions(-)

diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java
index 4fc251a..cc0f805 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java
@@ -3,99 +3,84 @@
 import cn.hutool.json.JSONObject;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 public class Plcaction extends Thread {
-    private static final long SEND_INTERVAL = 2000; // 鍙戦�佹秷鎭殑鏃堕棿闂撮殧
-    private static final long WRITE_INTERVAL = 100; // 鍐欏叆PLC鐨勬椂闂撮棿闅�
+  @Override
+  public void run() {
+    while (this != null) {
+      try {
+        Thread.sleep(1000);
+      } catch (InterruptedException e) {
+        e.printStackTrace();
+      }
 
-    @Override
-    public void run() {
-        try {
-            // 鍙戦�佷竴娆℃秷鎭�
-            sendMessages();
+//      List<Boolean> paramlist = S7control.getinstance().ReadBits("DB100.DBW", 12);
+////
+//      JSONObject jsonObject = new JSONObject();
+//      jsonObject.append("params", new short[]{1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0});
 
-            // 寤惰繜涓�娈垫椂闂�
-            Thread.sleep(SEND_INTERVAL);
+ List<Boolean> paramlist = S7control.getinstance().ReadBits("DB2.DBX0.0 ", 26);
+//      Boolean[] values = {true, true,true, true,true, true,true, true,true, true,true, true,true, true,true, true,true, true,true, true,true, true,true, true,false, true};
+//      List<Boolean> paramlist = new ArrayList<>(Arrays.asList(values));
+      if (paramlist == null) {
 
-            while (true) {
-                // 鍐欏叆PLC
-                writeToPlc();
-                Thread.sleep(WRITE_INTERVAL);
+      } else {
+        short[] params = new short[paramlist.size()];
 
-                // 鍙戦�佹秷鎭�
-                sendMessages();
-                Thread.sleep(SEND_INTERVAL);
-            }
-
-        } catch (InterruptedException e) {
-            e.printStackTrace();
+        for (int i = 0; i < paramlist.size(); i++) {
+          boolean value = paramlist.get(i);
+          params[i] = value ? (short) 1 : (short) 0;
         }
-    }
-
-
-    private void sendMessages() {
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.append("params", params);
         WebSocketServer sendwServer = WebSocketServer.sessionMap.get("action");
         if (sendwServer != null) {
-
-            List<Boolean> paramlist = S7control.getinstance().ReadBits("DB100.DBW", 12);
-            //        new short[]{1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0}
-            JSONObject jsonObject = new JSONObject();
-            jsonObject.append("params", new short[]{1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0});
-
-            sendwServer.sendMessage(jsonObject.toString());
+          sendwServer.sendMessage(jsonObject.toString());
         }
+      }
 
 
+      WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("action");
+      if (webSocketServer != null) {
 
+          List<String> messages = webSocketServer.getMessages();
 
-    }
+          String addressList = "DB100.DBW0";
 
-    private void writeToPlc() {
-        WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("action");
-        if (webSocketServer != null) {
-            List<String> messages = webSocketServer.getMessages();
-
-            String addressList = "DB100.DBW0";
-
-            if (!messages.isEmpty()) {
-                // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
-                String lastMessage = messages.get(messages.size() - 1);
-                System.out.println("messages锛�" + messages);
-                String[] parts = lastMessage.split(",");
-                List<Integer> messageValues = new ArrayList<>();
-                for (String part : parts) {
-                    try {
-                        // 浣跨敤姝e垯琛ㄨ揪寮忔竻闄ら潪鏁板瓧瀛楃
-                        String cleanedPart = part.replaceAll("[^0-9-]", "");
-                        Integer value = Integer.parseInt(cleanedPart.trim());
-                        messageValues.add(value);
-                    } catch (NumberFormatException e) {
-                        // 濡傛灉鏃犳硶瑙f瀽涓烘暣鏁扮被鍨嬶紝鍒欏拷鐣ヨ閮ㄥ垎
-                        e.printStackTrace();
-                    }
-                }
-
-                // 灏嗘秷鎭�艰浆鎹负甯冨皵鍒楄〃
-                List<Boolean> messageBooleans = new ArrayList<>();
-                for (Integer value : messageValues) {
-                    messageBooleans.add(value == 0 ? true : false);
-                }
-
-                // 灏嗗竷灏斿垪琛ㄥ啓鍏� PLC
-                S7control.getinstance().WriteBit(addressList, messageBooleans);
-                System.out.println("messageValues锛�" + messageBooleans);
-                System.out.println("addressList锛�" + addressList);
-
-                // 娓呯┖娑堟伅鍒楄〃
-                webSocketServer.clearMessages();
+          if (!messages.isEmpty()) {
+            // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
+            String lastMessage = messages.get(messages.size() - 1);
+            System.out.println("messages锛�" + messages);
+            String[] parts = lastMessage.split(",");
+            List<Integer> messageValues = new ArrayList<>();
+            for (String part : parts) {
+              try {
+                // 浣跨敤姝e垯琛ㄨ揪寮忔竻闄ら潪鏁板瓧瀛楃
+                String cleanedPart = part.replaceAll("[^0-9-]", "");
+                Integer value = Integer.parseInt(cleanedPart.trim());
+                messageValues.add(value);
+              } catch (NumberFormatException e) {
+                // 濡傛灉鏃犳硶瑙f瀽涓烘暣鏁扮被鍨嬶紝鍒欏拷鐣ヨ閮ㄥ垎
+                e.printStackTrace();
+              }
             }
+
+            // 灏嗘秷鎭�艰浆鎹负甯冨皵鍒楄〃
+            List<Boolean> messageBooleans = new ArrayList<>();
+            for (Integer value : messageValues) {
+              messageBooleans.add(value == 1 ? true : false);
+            }
+
+            // 灏嗗竷灏斿垪琛ㄥ啓鍏� PLC
+            S7control.getinstance().WriteBit(addressList, messageBooleans);
+            System.out.println("messageValues锛�" + messageBooleans);
+            System.out.println("addressList锛�" + addressList);
+          // 娓呯┖娑堟伅鍒楄〃
+          webSocketServer.clearMessages();
         }
+      }
     }
-
-    private List<Boolean> paramList() {
-        // 鑾峰彇鍙傛暟鍒楄〃鐨勯�昏緫
-
-        return new ArrayList<>(); // 鍋囪杩斿洖绌哄垪琛�
-    }
-}
\ No newline at end of file
+  }
+}

--
Gitblit v1.8.0