wangli/msg-center-plat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/REQ-1309' into 'dev'

Browse Source 
feat(REQ-1309): 代办分页查询调整

See merge request universal/infrastructure/backend/msg-center-plat!47
This commit is contained in:
罗福 2023-10-08 01:53:35 +00:00
commit 88ba0b85b3
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
inside-notices/src/main/java/cn/axzo/msg/center/message/domain/dto/PendingMessageDTO.java
View File

@ -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();
}

2
inside-notices/src/main/java/cn/axzo/msg/center/utils/MessageRouterUtil.java
View File

@ -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);
}
}

4
msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/MessageRouterDTO.java
View File

@ -51,10 +51,6 @@ public class MessageRouterDTO implements Serializable {
* WECHAT_MINI_PROGRAM: 微信小程序页面
*/
private TerminalTypeEnum terminalType;
/**
* 参数及其对应的值的JSON串
*/
private String param;
@Override
public String toString() {

4
msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/PendingMessageResponse.java
View File

@ -89,6 +89,10 @@ public class PendingMessageResponse implements Serializable {
* 路由信息,可为空
*/
private List<MessageRouterDTO> routers;
/**
* 参数及其对应的值的JSON串
*/
private String routerParams;
@Override
public String toString() {