From 3dd0b5aac246e852946f3ccf06b8cd507ad91d8b Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Mon, 8 Apr 2024 13:58:53 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=908.1.4=E3=80=91=E3=80=90message?=
 =?UTF-8?q?=E3=80=91=E6=B6=88=E6=81=AF=E5=8F=91=E9=80=81api=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=9A=E5=8A=A1=E8=AF=A6=E6=83=85=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../roses/kernel/sys/api/pojo/message/MessageSendDTO.java  | 7 +++++++
 .../sys/api/pojo/message/MessageSendToSocketDTO.java       | 7 +++++++
 .../kernel/sys/modular/message/factory/MessageFactory.java | 2 ++
 3 files changed, 16 insertions(+)

diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/pojo/message/MessageSendDTO.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/pojo/message/MessageSendDTO.java
index a0a22a068..020a4d326 100644
--- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/pojo/message/MessageSendDTO.java
+++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/pojo/message/MessageSendDTO.java
@@ -3,6 +3,7 @@ package cn.stylefeng.roses.kernel.sys.api.pojo.message;
 import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription;
 import lombok.Data;
 
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -68,4 +69,10 @@ public class MessageSendDTO {
     @ChineseDescription("业务类型(根据业务id和业务类型可以确定业务数据)")
     private String businessType;
 
+    /**
+     * 业务的详细信息自定义字段
+     */
+    @ChineseDescription("业务的详细信息自定义字段")
+    private Map<String, Object> businessDetail;
+
 }
diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/pojo/message/MessageSendToSocketDTO.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/pojo/message/MessageSendToSocketDTO.java
index ead95398e..bfd9ebf07 100644
--- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/pojo/message/MessageSendToSocketDTO.java
+++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/pojo/message/MessageSendToSocketDTO.java
@@ -4,6 +4,7 @@ import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.Map;
 
 /**
  * 发送到ws时候用的传输bean
@@ -73,6 +74,12 @@ public class MessageSendToSocketDTO {
     @ChineseDescription("业务类型(根据业务id和业务类型可以确定业务数据)")
     private String businessType;
 
+    /**
+     * 业务的详细信息自定义字段
+     */
+    @ChineseDescription("业务的详细信息自定义字段")
+    private Map<String, Object> businessDetail;
+
     /**
      * 消息发送时间
      */
diff --git a/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/message/factory/MessageFactory.java b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/message/factory/MessageFactory.java
index 2b450beb0..4e77d19c3 100644
--- a/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/message/factory/MessageFactory.java
+++ b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/message/factory/MessageFactory.java
@@ -51,6 +51,7 @@ public class MessageFactory {
             sysMessage.setBusinessType(messageSendDTO.getBusinessType());
             sysMessage.setReadFlag(ReadFlagEnum.NO_READ.getCode());
             sysMessage.setMessageSendTime(new Date());
+            sysMessage.setBusinessDetail(messageSendDTO.getBusinessDetail());
             sysMessages.add(sysMessage);
         }
 
@@ -84,6 +85,7 @@ public class MessageFactory {
             dto.setBusinessId(sysMessage.getBusinessId());
             dto.setBusinessType(sysMessage.getBusinessType());
             dto.setMessageSendTime(sysMessage.getMessageSendTime());
+            dto.setBusinessDetail(sysMessage.getBusinessDetail());
             messageSendToSocketDTOS.add(dto);
         }