From 5bd013802a5628da0d6d773a19d1f4bb9dcde27b Mon Sep 17 00:00:00 2001
From: luofu <luofu@axzo.cn>
Date: Sun, 8 Oct 2023 09:51:21 +0800
Subject: [PATCH] =?UTF-8?q?feat(REQ-1309):=20=E4=BB=A3=E5=8A=9E=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E8=AF=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

背景：
  https://jira.axzo.cn/browse/REQ-1309?goToView=1

修改：
  代办分页查询调整

影响：
  无
---
 .../msg/center/message/domain/dto/PendingMessageDTO.java    | 6 ++++++
 .../java/cn/axzo/msg/center/utils/MessageRouterUtil.java    | 2 +-
 .../cn/axzo/msg/center/service/dto/MessageRouterDTO.java    | 4 ----
 .../service/pending/response/PendingMessageResponse.java    | 4 ++++
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/domain/dto/PendingMessageDTO.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/domain/dto/PendingMessageDTO.java
index 06d3cb8f..d073790c 100644
--- a/inside-notices/src/main/java/cn/axzo/msg/center/message/domain/dto/PendingMessageDTO.java
+++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/domain/dto/PendingMessageDTO.java
@@ -87,6 +87,10 @@ public class PendingMessageDTO implements Serializable {
      * 路由信息,可为空
      */
     private List<MessageRouterDTO> routers;
+    /**
+     * 参数及其对应的值的JSON串
+     */
+    private String routerParams;
 
     public static PendingMessageDTO from(PendingMessageRecord pendingMessageRecord) {
         // 代办发起者信息
@@ -117,6 +121,7 @@ public class PendingMessageDTO implements Serializable {
                 .bizCategory(pendingMessageRecord.getBizCategory())
                 .createTime(DateFormatUtil.toLocalDateTime(pendingMessageRecord.getCreateAt()))
                 .updateTime(DateFormatUtil.toLocalDateTime(pendingMessageRecord.getUpdateAt()))
+                .routerParams(pendingMessageRecord.getRouterParams())
                 .build();
     }
 
@@ -137,6 +142,7 @@ public class PendingMessageDTO implements Serializable {
                 .createTimestamp(DateFormatUtil.toTimestamp(this.createTime))
                 .updateTimestamp(DateFormatUtil.toTimestamp(this.updateTime))
                 .routers(this.routers)
+                .routerParams(this.routerParams)
                 .build();
     }
 
diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/utils/MessageRouterUtil.java b/inside-notices/src/main/java/cn/axzo/msg/center/utils/MessageRouterUtil.java
index c938fb9b..1ec2d748 100644
--- a/inside-notices/src/main/java/cn/axzo/msg/center/utils/MessageRouterUtil.java
+++ b/inside-notices/src/main/java/cn/axzo/msg/center/utils/MessageRouterUtil.java
@@ -81,7 +81,7 @@ public final class MessageRouterUtil {
                 && RouterCategoryEnum.JUMP.equals(router.getCategory())) {
             // 替换原始URL中的参数变量
             String routerUrl = PlaceholderResolver
-                    .getDefaultResolver().resolve(router.getUrl(), JSON.parseObject(routerParam));
+                    .getDefaultResolver().resolveByMap(router.getUrl(), JSON.parseObject(routerParam));
             router.setUrl(routerUrl);
         }
     }
diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/MessageRouterDTO.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/MessageRouterDTO.java
index 21026857..9afba13a 100644
--- a/msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/MessageRouterDTO.java
+++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/MessageRouterDTO.java
@@ -51,10 +51,6 @@ public class MessageRouterDTO implements Serializable {
      *     WECHAT_MINI_PROGRAM: 微信小程序页面
      */
     private TerminalTypeEnum terminalType;
-    /**
-     * 参数及其对应的值的JSON串
-     */
-    private String param;
 
     @Override
     public String toString() {
diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/PendingMessageResponse.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/PendingMessageResponse.java
index 07417bcb..643408cf 100644
--- a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/PendingMessageResponse.java
+++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/PendingMessageResponse.java
@@ -89,6 +89,10 @@ public class PendingMessageResponse implements Serializable {
      * 路由信息,可为空
      */
     private List<MessageRouterDTO> routers;
+    /**
+     * 参数及其对应的值的JSON串
+     */
+    private String routerParams;
 
     @Override
     public String toString() {