1、解决冲突

zhoushihao

2024-08-06 54aeb39206453ccfd2d1c89fe4f9def88b2c985c

1、解决冲突

 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java

@@ -129,7 +129,7 @@
        JSONObject jsonObject4 = new JSONObject();

        jsonObject4.append("downGlassInfos", listMap);

        jsonObject4.append("engineerIdList", engineerIdList);

        ArrayList<WebSocketServer> sendwServer4 = WebSocketServer.sessionMap.get("sendDownGlass");

        ArrayList<WebSocketServer> sendwServer4 = WebSocketServer.sessionMap.get("unloadglass");

        if (sendwServer4 != null) {

            for (WebSocketServer webserver : sendwServer4) {

                if (webserver != null && webserver.session.isOpen()) {