From ee04d1ab881479ae30c8d5600d29ac56b70f751e Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期三, 24 四月 2024 15:46:16 +0800
Subject: [PATCH] 增加工位显示方法

---
 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/Plchome.java |   32 ++++++++++++++++++++------------
 1 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/Plchome.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/Plchome.java
index feb80b2..4969337 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/Plchome.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/Plchome.java
@@ -2,18 +2,24 @@
 
 import cn.hutool.json.JSONObject;
 
+import com.mes.downworkstation.service.DownWorkstationService;
 import com.mes.tools.WebSocketServer;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 import java.util.function.Supplier;
 
 @Component
 public class Plchome extends Thread {
     private int i = 1;
     private static final Logger log = LogManager.getLogger(Plchome.class);
+    @Autowired
+    private  DownWorkstationService downWorkstationService;
 
    // private final Supplier<DownGlassLogic> plcServiceSupplier;
 
@@ -27,8 +33,19 @@
         while (!Thread.currentThread().isInterrupted()) {
             try {
                 i++;
-                Thread.sleep(100);
-
+                Thread.sleep(1000);
+                JSONObject jsonObject = new JSONObject();
+                System.out.println(77);
+                downWorkstationService = WebSocketServer.applicationContext.getBean(DownWorkstationService.class);
+                List<Map<String, Object>>  yy= downWorkstationService.getTotalGlassDimensionsByWorkstation();
+                jsonObject.append("data", yy);
+                ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("unloadglass");
+                if (sendwServer != null) {
+                    for (WebSocketServer webserver : sendwServer) {
+                        webserver.sendMessage(jsonObject.toString());
+                        log.info("鍑嗗鍚� WebSocket 鏈嶅姟鍣ㄥ彂閫佹秷鎭�: {}", jsonObject.toString());
+                    }
+                }
 
 
             } catch (InterruptedException e) {
@@ -36,16 +53,7 @@
                 e.printStackTrace();
             }
 
-            JSONObject jsonObject = new JSONObject();
-            // System.out.println(arraylist6);
-            jsonObject.append("data", 1);
-            ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("unloadglass");
-            if (sendwServer != null) {
-                for (WebSocketServer webserver : sendwServer) {
-                    webserver.sendMessage(jsonObject.toString());
-                    log.info("鍑嗗鍚� WebSocket 鏈嶅姟鍣ㄥ彂閫佹秷鎭�: {}", jsonObject.toString());
-                }
-            }
+
 
         }
     }

--
Gitblit v1.8.0