From aede0ce84402ba74deb085ee1b41c7100997ee73 Mon Sep 17 00:00:00 2001
From: zendwang <wangzhenxian@idadt.com>
Date: Wed, 29 Mar 2023 18:19:22 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E5=A2=9E=E5=8A=A0=20ruoyi-websocket=20?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/common/websocket/dto/WebSocketMessageDto.java    | 7 +------
 .../common/websocket/handler/PlusWebSocketHandler.java     | 3 ++-
 .../com/ruoyi/common/websocket/utils/WebSocketUtils.java   | 3 ++-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/com/ruoyi/common/websocket/dto/WebSocketMessageDto.java b/ruoyi-common/ruoyi-common-websocket/src/main/java/com/ruoyi/common/websocket/dto/WebSocketMessageDto.java
index ea2195d18..c3b1b33be 100644
--- a/ruoyi-common/ruoyi-common-websocket/src/main/java/com/ruoyi/common/websocket/dto/WebSocketMessageDto.java
+++ b/ruoyi-common/ruoyi-common-websocket/src/main/java/com/ruoyi/common/websocket/dto/WebSocketMessageDto.java
@@ -2,7 +2,6 @@ package com.ruoyi.common.websocket.dto;
 
 import lombok.Builder;
 import lombok.Data;
-import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.util.List;
@@ -12,8 +11,8 @@ import java.util.List;
  *
  * @author zendwang
  */
+@Builder
 @Data
-@Accessors(chain = true)
 public class WebSocketMessageDto implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -27,8 +26,4 @@ public class WebSocketMessageDto implements Serializable {
      * 需要发送的消息
      */
     private String message;
-
-    public static WebSocketMessageDto build(List<Long> sessionKeys, String message) {
-        return new WebSocketMessageDto().setMessage(message).setSessionKeys(sessionKeys);
-    }
 }
diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/com/ruoyi/common/websocket/handler/PlusWebSocketHandler.java b/ruoyi-common/ruoyi-common-websocket/src/main/java/com/ruoyi/common/websocket/handler/PlusWebSocketHandler.java
index 93e57995b..8f4c8664b 100644
--- a/ruoyi-common/ruoyi-common-websocket/src/main/java/com/ruoyi/common/websocket/handler/PlusWebSocketHandler.java
+++ b/ruoyi-common/ruoyi-common-websocket/src/main/java/com/ruoyi/common/websocket/handler/PlusWebSocketHandler.java
@@ -44,7 +44,8 @@ public class PlusWebSocketHandler extends AbstractWebSocketHandler {
         LoginUser loginUser = (LoginUser) session.getAttributes().get(LOGIN_USER_KEY);
         log.info("PlusWebSocketHandler, 连接：" + session.getId() + "，已收到消息:" + message.getPayload());
         List<Long> userIds = List.of(loginUser.getUserId());
-        WebSocketMessageDto webSocketMessageDto = WebSocketMessageDto.build(userIds, message.getPayload());
+        WebSocketMessageDto webSocketMessageDto = WebSocketMessageDto.builder()
+            .sessionKeys(userIds).message(message.getPayload()).build();
         WebSocketUtils.publishMessage(webSocketMessageDto);
     }
 
diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/com/ruoyi/common/websocket/utils/WebSocketUtils.java b/ruoyi-common/ruoyi-common-websocket/src/main/java/com/ruoyi/common/websocket/utils/WebSocketUtils.java
index e553ac2a7..b92ebc4e0 100644
--- a/ruoyi-common/ruoyi-common-websocket/src/main/java/com/ruoyi/common/websocket/utils/WebSocketUtils.java
+++ b/ruoyi-common/ruoyi-common-websocket/src/main/java/com/ruoyi/common/websocket/utils/WebSocketUtils.java
@@ -68,7 +68,8 @@ public class WebSocketUtils {
         }
         // 不在当前服务内session,发布订阅消息
         if (CollUtil.isNotEmpty(unsentSessionKeys)) {
-            WebSocketMessageDto broadcastMessage = WebSocketMessageDto.build(unsentSessionKeys, webSocketMessage.getMessage());
+            WebSocketMessageDto broadcastMessage = WebSocketMessageDto.builder()
+                .message(webSocketMessage.getMessage()).sessionKeys(unsentSessionKeys).build();
             RedisUtils.publish(WEB_SOCKET_TOPIC, broadcastMessage,  consumer -> {
                 log.info(" WebSocket发送主题订阅消息topic:{} session keys:{} message:{}",
                     WEB_SOCKET_TOPIC, unsentSessionKeys, webSocketMessage.getMessage());