From d42ca2ff3ffb623224063cbec6e7d7af15460c20 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 05 十二月 2024 14:58:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java |   33 +++++++++++++++++++++------------
 1 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java
index 1d89478..0a3d658 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java
@@ -126,22 +126,31 @@
             queryDataSource1();
             //鏌ヨ浣跨敤鏁版嵁婧�2鏌ヨ鏁版嵁
             queryDataSource2();
-
-            ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("slicecage");
-            if (sendwServer != null) {
-                for (WebSocketServer webserver : sendwServer) {
-                    if (webserver != null) {
-                        webserver.sendMessage(jsonObject.toString());
-                        List<String> messages = webserver.getMessages();
-                        if (!messages.isEmpty()) {
-                            // // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
-                            webserver.clearMessages();
+            try {
+                ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("slicecage");
+                if (sendwServer != null) {
+                    for (WebSocketServer webserver : sendwServer) {
+                        if (webserver != null) {
+                            webserver.sendMessage(jsonObject.toString());
+                            List<String> messages = webserver.getMessages();
+                            if (!messages.isEmpty()) {
+                                // // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
+                                webserver.clearMessages();
+                            }
+                        } else {
+                            log.info("Home is closed");
                         }
-                    } else {
-                        log.info("Home is closed");
                     }
                 }
+            }catch (Exception e){
+                e.printStackTrace(); // 鎵撳嵃鍫嗘爤淇℃伅锛屾柟渚垮畾浣嶉棶棰�
+                System.out.println("webserver鍑虹幇寮傚父: " + e.getMessage());
+                // TODO: handle exception
             }
+
+
+
+
         } catch (Exception e) {
             e.printStackTrace();
         }

--
Gitblit v1.8.0