From 767fa4cb586ea8f83f0b97ce2e9b9c1279310aef Mon Sep 17 00:00:00 2001
From: rays <1615175118@qq.com>
Date: Mon, 21 Jun 2021 16:02:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B6=88=E6=81=AFid,?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E9=80=81=E7=BB=99=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E4=B8=BA=E5=AD=97=E7=AC=A6=E4=B8=B2?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../roses/kernel/message/db/MessageDbServiceImpl.java    | 9 ++++-----
 .../roses/kernel/message/db/entity/SysMessage.java       | 6 ++++++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/MessageDbServiceImpl.java b/kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/MessageDbServiceImpl.java
index a48d14e84..2618d793e 100644
--- a/kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/MessageDbServiceImpl.java
+++ b/kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/MessageDbServiceImpl.java
@@ -110,13 +110,12 @@ public class MessageDbServiceImpl implements MessageApi {
                 sendMsgList.add(sysMessage);
             }
         });
-
-        // 给用户发送通知
-        for (Long userId : userIdSet) {
-            socketOperatorApi.sendMsgOfUserSession(ServerMessageTypeEnum.SYS_NOTICE_MSG_TYPE.getCode(), userId.toString(), messageSendRequest);
-        }
         sysMessageService.saveBatch(sendMsgList);
 
+        // 给用户发送通知
+        for (SysMessage item : sendMsgList) {
+            socketOperatorApi.sendMsgOfUserSession(ServerMessageTypeEnum.SYS_NOTICE_MSG_TYPE.getCode(), item.getReceiveUserId().toString(), item);
+        }
     }
 
     @Override
diff --git a/kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/entity/SysMessage.java b/kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/entity/SysMessage.java
index 6089e9e08..8a45bc7c0 100644
--- a/kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/entity/SysMessage.java
+++ b/kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/entity/SysMessage.java
@@ -25,6 +25,8 @@
 package cn.stylefeng.roses.kernel.message.db.entity;
 
 import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.alibaba.fastjson.serializer.ToStringSerializer;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -46,18 +48,21 @@ public class SysMessage extends BaseEntity {
      * 主键
      */
     @TableId(value = "message_id", type = IdType.ASSIGN_ID)
+    @JSONField(serializeUsing= ToStringSerializer.class)
     private Long messageId;
 
     /**
      * 接收用户id
      */
     @TableField(value = "receive_user_id")
+    @JSONField(serializeUsing= ToStringSerializer.class)
     private Long receiveUserId;
 
     /**
      * 发送用户id
      */
     @TableField(value = "send_user_id")
+    @JSONField(serializeUsing= ToStringSerializer.class)
     private Long sendUserId;
 
     /**
@@ -94,6 +99,7 @@ public class SysMessage extends BaseEntity {
      * 业务id
      */
     @TableField(value = "business_id")
+    @JSONField(serializeUsing= ToStringSerializer.class)
     private Long businessId;
 
     /**