From 5ff8611344ab9428908ab19c3ce1e2ed1b989c88 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Tue, 16 Aug 2022 17:04:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yxt/messagecenter/api/message/AppMessageDto.java | 3 +++
 .../yxt/messagecenter/biz/message/MessageService.java    | 9 ++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/message-center-api/src/main/java/com/yxt/messagecenter/api/message/AppMessageDto.java b/message-center-api/src/main/java/com/yxt/messagecenter/api/message/AppMessageDto.java
index 229d546..81de814 100644
--- a/message-center-api/src/main/java/com/yxt/messagecenter/api/message/AppMessageDto.java
+++ b/message-center-api/src/main/java/com/yxt/messagecenter/api/message/AppMessageDto.java
@@ -65,4 +65,7 @@ public class AppMessageDto implements Dto {
 
     @ApiModelProperty("推送的消息打开的action（APP），推送参数对应class_name")
     private String msgTargetUri;
+
+    @ApiModelProperty("推送taskId")
+    private String taskId;
 }
diff --git a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/message/MessageService.java b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/message/MessageService.java
index 83140e1..a2d0cb9 100644
--- a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/message/MessageService.java
+++ b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/message/MessageService.java
@@ -167,7 +167,11 @@ public class MessageService extends MybatisBaseService<MessageMapper, Message> {
         if (StringUtils.isBlank(dto.getSid())) { // 新增
             Message message = new Message();
             dto.fillEntity(message);
-            message.setSid(UUID.randomUUID().toString());
+            if (StringUtils.isNotBlank(dto.getTaskId())) {
+                message.setSid(dto.getTaskId());
+            }else{
+                message.setSid(UUID.randomUUID().toString());
+            }
             Boolean flag = save(message);
             if (flag) {
                 return new ResultBean().success().setMsg("保存成功").setData(message.getSid());
@@ -204,6 +208,9 @@ public class MessageService extends MybatisBaseService<MessageMapper, Message> {
                 }
             }
         }
+        if (StringUtils.isNotBlank(dto.getTaskId())) {
+            messageDto.setTaskId(dto.getTaskId());
+        }
         messageDto.setMsgTitle(msgTitle);
         messageDto.setMsgContent(msgContent);
         messageDto.setMsgSource("审批中心");