app消息通知修改

soc-common/soc-common-websocket/src/main/java/com/xunmei/common/websocket/handler/PlusWebSocketHandler.java

@@ -45,12 +45,13 @@ public class PlusWebSocketHandler extends AbstractWebSocketHandler {
             log.info("收到心跳检测sessionId:{},userId:{},userName:{}", session.getId(), loginUser.getUserid(), loginUser.getUsername());
             return;
         }
-        List<Long> userIds = new ArrayList<>();
-        userIds.add(loginUser.getUserid());
-        WebSocketMessageDto webSocketMessageDto = new WebSocketMessageDto();
-        webSocketMessageDto.setSessionKeys(userIds);
-        webSocketMessageDto.setMessage(message.getPayload());
-        WebSocketUtils.publishMessage(webSocketMessageDto);
+        //暂时不接收客户端发送的消息
+//        List<Long> userIds = new ArrayList<>();
+//        userIds.add(loginUser.getUserid());
+//        WebSocketMessageDto webSocketMessageDto = new WebSocketMessageDto();
+//        webSocketMessageDto.setSessionKeys(userIds);
+//        webSocketMessageDto.setMessage(message.getPayload());
+//        WebSocketUtils.publishMessage(webSocketMessageDto);
     }
 
     @Override

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/NoticeServiceImpl.java

@@ -9,6 +9,7 @@ import com.xunmei.common.core.domain.mediator.domain.IotAlarmData;
 import com.xunmei.common.core.domain.notice.WebsocketNoticeLog;
 import com.xunmei.common.core.vo.notice.WebSocketNoticeVo;
 import com.xunmei.common.security.utils.SecurityUtils;
+import com.xunmei.common.websocket.dto.WebSocketMessageDto;
 import com.xunmei.common.websocket.utils.WebSocketUtils;
 import com.xunmei.system.api.vo.WebSocketSendVo;
 import com.xunmei.system.dto.notice.NoticeDealDto;
@@ -132,7 +133,12 @@ public class NoticeServiceImpl extends ServiceImpl<NoticeLogMapper, WebsocketNot
         for (WebSocketSendVo webSocketSendVo : list) {
             Long userId = webSocketSendVo.getUserId();
             JSONObject object = new JSONObject(webSocketSendVo.getContent());
-            WebSocketUtils.sendMessage(userId, object.toString());
+            WebSocketMessageDto messageDto = new WebSocketMessageDto();
+            List<Long> sessionKeys = new ArrayList<>();
+            sessionKeys.add(userId);
+            messageDto.setSessionKeys(sessionKeys);
+            messageDto.setMessage(object.toString());
+            WebSocketUtils.publishMessage(messageDto);
         }
     }