Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/GeoHazardMonitor

hazard-admin/src/main/java/com/ozs/web/controller/websocket/WebSocketConteoller.java

@@ -138,6 +138,7 @@ public class WebSocketConteoller extends BaseController {
                 MsgWebPush msgWebPush = new MsgWebPush();
                 // 推送消息reqMsgAlarmVo
                 boolean userOnline = webSocketServer.userOnline(userid);
+                log.info("userOnline-userOnline-userOnline-userOnline-----：：：：：：" + userOnline);
                 if (userOnline) {
                     webSocketServer.sendOneMessage(userid, content);
                     msgWebPush.setOnline("1");