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

@@ -3,6 +3,7 @@ package com.ozs.web.controller.websocket;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ozs.common.core.controller.BaseController;
+import com.ozs.common.core.domain.entity.SysUser;
 import com.ozs.common.utils.AppendUtils;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.service.entity.BaseCameraManagement;
@@ -11,6 +12,7 @@ import com.ozs.service.entity.MsgAppPush;
 import com.ozs.service.entity.MsgWebPush;
 import com.ozs.service.entity.vo.MsgAlarmResp;
 import com.ozs.service.service.*;
+import com.ozs.system.service.ISysUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +38,8 @@ public class WebSocketConteoller extends BaseController {
     private WebSocketServer webSocketServer;
     @Autowired
     private BaseUserService baseUserService;
+    @Autowired
+    private ISysUserService userService;
     @Resource
     private BaseRailwayManagementService baseRailwayManagementService;
     @Autowired
@@ -102,7 +106,11 @@ public class WebSocketConteoller extends BaseController {
         }
         // 存入数据
         if (!StringUtils.isEmpty(msgAlarm.getAlarmId()) || !StringUtils.isEmpty(userIdList)) {
-            String userIdLogin = getUserId();
+            String userIdLogin = "admin编码";
+            SysUser user = userService.selectUserById(1L);
+            if (!ObjectUtils.isEmpty(user)) {
+                userIdLogin = user.getUserId();
+            }
             String alarmId = msgAlarm.getAlarmId();
             for (String userId : userIdList) {
                 MsgWebPush msgWebPush = new MsgWebPush();