From c85904597bf93e0fbae321093a970dd973b0f64f Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 13 五月 2024 13:54:28 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

---
 springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java |   86 +++++++++++++++++++++++++------------------
 1 files changed, 50 insertions(+), 36 deletions(-)

diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java
index 89881b8..4e3cd54 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
+import lombok.extern.slf4j.Slf4j;
 
 import java.io.BufferedReader;
 import java.io.FileInputStream;
@@ -13,6 +14,7 @@
 import java.util.List;
 import java.util.Arrays;
 
+@Slf4j
 public class Plcsign extends Thread {
   String name = "";
   Integer count = 0;
@@ -61,46 +63,58 @@
     while (this != null) {
       try {
         Thread.sleep(1000);
+        // this.readValue();
+        // String PlcAddress = this.name;
+        // Integer Plccount = this.count;
+        // System.out.println(PlcAddress);
+
+        // List<Boolean> plclist = S7control.getinstance().ReadBits(PlcAddress,
+        // Plccount);
+        List<Boolean> plclist = S7control.getinstance().ReadBits("DB102.0.0", 112);
+
+        // Boolean[] values = { true, true, true, true, true, false, true, false,
+        // true, false, true, false, true, false,
+        // true, false, true, false, true, false, true, false, true, false, true, false,
+        // true, false, true, false, true,
+        // false, true, false, true, false,
+        // true, false, true, false, true, false, true, false, null,
+        // true, false,
+        // true, false, true, false, true, false,
+        // true, false, true, false, true, };
+        // List<Boolean> plclist = new ArrayList<>(Arrays.asList(values));
+
+        if (plclist != null) {
+          // 灏嗚幏鍙栫殑甯冨皵绫诲瀷杞崲涓烘暣鏁扮被鍨�
+          List<Integer> Intlist = new ArrayList<>();
+          for (Boolean value : plclist) {
+            if (value != null) {
+              Intlist.add(value == true ? 0 : 1);
+            }
+
+          }
+          JSONObject jsonObject = new JSONObject();
+          jsonObject.append("sig", Intlist);
+          // WebSocketServer sendwServer3 = WebSocketServer.sessionMap.get("Sign");
+          // if (sendwServer3 != null) {
+          // sendwServer3.sendMessage(jsonObject.toString());
+          // }
+
+          ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("Sign");
+          if (sendwServer != null) {
+            for (WebSocketServer webserver : sendwServer) {
+              if (webserver != null && webserver.session.isOpen()) {
+                webserver.sendMessage(jsonObject.toString());
+              }else{
+                log.info("Sign is closed");
+              }
+              
+            }
+          }
+        }
       } catch (InterruptedException e) {
         e.printStackTrace();
       }
 
-//      this.readValue();
-//      String PlcAddress = this.name;
-//      Integer Plccount = this.count;
-      // System.out.println(PlcAddress);
-
-//      List<Boolean> plclist = S7control.getinstance().ReadBits(PlcAddress, Plccount);
-       List<Boolean> plclist = S7control.getinstance().ReadBits("DB102.0.0", 64);
-
-//       Boolean[] values = { true, true, true, true, true, false, true, false,
-//       true, false, true, false, true, false,
-//       true, false, true, false, true, false, true, false, true, false, true, false,
-//       true, false, true, false, true,
-//       false, true, false, true, false,
-//       true, false, true, false, true, false, true, false, null,
-//       true, false,
-//       true, false, true, false, true, false,
-//       true, false, true, false, true, };
-//       List<Boolean> plclist = new ArrayList<>(Arrays.asList(values));
-
-      if (plclist != null) {
-        // 灏嗚幏鍙栫殑甯冨皵绫诲瀷杞崲涓烘暣鏁扮被鍨�
-        List<Integer> Intlist = new ArrayList<>();
-        for (Boolean value : plclist) {
-          if (value != null) {
-            Intlist.add(value == true ? 0 : 1);
-          }
-
-        }
-        JSONObject jsonObject = new JSONObject();
-        jsonObject.append("sig", Intlist);
-        WebSocketServer sendwServer3 = WebSocketServer.sessionMap.get("Sign");
-        if (sendwServer3 != null) {
-          sendwServer3.sendMessage(jsonObject.toString());
-        }
-
-      }
     }
   }
 }

--
Gitblit v1.8.0