Merge remote-tracking branch 'origin/master'

zhoushihao

2024-12-05 d42ca2ff3ffb623224063cbec6e7d7af15460c20

Merge remote-tracking branch 'origin/master'

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java

@@ -126,7 +126,7 @@
            queryDataSource1();
            //查询使用数据源2查询数据
            queryDataSource2();

            try {
            ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("slicecage");
            if (sendwServer != null) {
                for (WebSocketServer webserver : sendwServer) {
@@ -143,6 +143,15 @@
                }
            }
        } catch (Exception e) {
                e.printStackTrace(); // 打印堆栈信息，方便定位问题
                System.out.println("webserver出现异常: " + e.getMessage());
                // TODO: handle exception
            }




        } catch (Exception e) {
            e.printStackTrace();
        }
    }