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

@@ -166,6 +166,7 @@ public class WebSocketConteoller extends BaseController {
             lwMsgAppPush.eq(MsgAppPush::getAlarmId, msgAlarm.getAlarmId());
         }
         List<MsgAppPush> msgAppPushList = msgAppPushService.list(lwMsgAppPush);
+        log.info("APPmsgAppPushList     size -----" + msgAppPushList.size());
         if (StringUtils.isEmpty(msgAppPushList) || msgAppPushList.size() == 0) {
             List<String> alias = new ArrayList<>();
             if (!StringUtils.isEmpty(userIdList) || userIdList.size() > 0) {
@@ -174,6 +175,7 @@ public class WebSocketConteoller extends BaseController {
             List<String> listString = distinct(alias);
             if (!StringUtils.isEmpty(listString) || listString.size() > 0) {
                 for (String userid : listString) {
+                    log.info("APP  userid    -----" + userid);
                     String pushId = UUID.randomUUID().toString();
                     msgAlarmResp.setPushId(UUID.randomUUID().toString());
                     String content = objStr(msgAlarmResp);