From 5eea9f6cb7ad0fc3085c92e9858b1fc7abfc1ef1 Mon Sep 17 00:00:00 2001 From: luofu Date: Thu, 9 Nov 2023 18:02:04 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-1507):=20=E5=BE=85=E5=8A=9E=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 背景： https://jira.axzo.cn/browse/REQ-1507?goToView=1 修改： 1、待办详情分页查询接口定义； 影响： 无 --- .../im/channel/handler/YouMengHandler.java | 4 +- .../im/domain/dto/IMSendMessageDTO.java | 4 +- .../domain/dto/MessageTemplateRouterDTO.java | 17 +++---- .../domain/dto/RawMessageRouterDTO.java | 15 +++--- .../MessageTemplateSaveOrUpdateParam.java | 8 +-- .../msg/center/utils/MessageRouterUtil.java | 12 ++--- ...ageRouterDTO.java => ButtonRouterDTO.java} | 2 +- .../center/service/dto/DetailRouterDTO.java | 51 +++++++++++++++++++ ...ava => MessageButtonRouteStrategyDTO.java} | 3 +- ...ava => MessageDetailRouteStrategyDTO.java} | 2 +- .../response/GeneralMessageResponse.java | 4 +- .../response/PendingMessageResponse.java | 12 ++--- .../request/MessageTemplateCreateRequest.java | 8 +-- .../request/MessageTemplateUpdateRequest.java | 8 +-- .../MessageTemplateDetailResponse.java | 8 +-- 15 files changed, 103 insertions(+), 55 deletions(-) rename msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/{MessageRouterDTO.java => ButtonRouterDTO.java} (96%) create mode 100644 msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/DetailRouterDTO.java rename msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/{MessageRouterButtonDTO.java => MessageButtonRouteStrategyDTO.java} (96%) rename msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/{BizDetailShowStrategyDTO.java => MessageDetailRouteStrategyDTO.java} (92%) diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/im/channel/handler/YouMengHandler.java b/inside-notices/src/main/java/cn/axzo/msg/center/im/channel/handler/YouMengHandler.java index 26bf52e6..51a79ff3 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/im/channel/handler/YouMengHandler.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/im/channel/handler/YouMengHandler.java @@ -11,7 +11,7 @@ import cn.axzo.msg.center.im.domain.dto.IMSendMessageDTO; import cn.axzo.msg.center.im.domain.enums.IMChannelEnum; import cn.axzo.msg.center.im.domain.param.IMSendSingleMessageParam; import cn.axzo.msg.center.inside.notices.service.IYouMengMessageService; -import cn.axzo.msg.center.service.dto.MessageRouterDTO; +import cn.axzo.msg.center.service.dto.ButtonRouterDTO; import cn.axzo.msg.center.service.dto.PersonDTO; import cn.axzo.msg.center.service.enums.IdentityTypeEnum; import cn.azxo.framework.common.utils.StringUtils; @@ -85,7 +85,7 @@ public class YouMengHandler implements IMChannelHandler { private JSONObject buildMessageExt2(IMSendMessageDTO message) { final JSONObject extra = new JSONObject(); - Collection messageRouters = message.getRouters(); + Collection messageRouters = message.getRouters(); if (messageRouters.isEmpty()) { extra.put("ar", ""); extra.put("ir", ""); diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/im/domain/dto/IMSendMessageDTO.java b/inside-notices/src/main/java/cn/axzo/msg/center/im/domain/dto/IMSendMessageDTO.java index c9ed0216..72ef6bdf 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/im/domain/dto/IMSendMessageDTO.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/im/domain/dto/IMSendMessageDTO.java @@ -1,6 +1,6 @@ package cn.axzo.msg.center.im.domain.dto; -import cn.axzo.msg.center.service.dto.MessageRouterDTO; +import cn.axzo.msg.center.service.dto.ButtonRouterDTO; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import lombok.AllArgsConstructor; @@ -47,7 +47,7 @@ public class IMSendMessageDTO implements Serializable { /** * 消息路由列表 */ - private Collection routers; + private Collection routers; /** * 消息参数 key value */ diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/domain/dto/MessageTemplateRouterDTO.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/domain/dto/MessageTemplateRouterDTO.java index 1600d115..13bcf014 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/domain/dto/MessageTemplateRouterDTO.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/domain/dto/MessageTemplateRouterDTO.java @@ -4,11 +4,10 @@ import cn.axzo.basics.common.util.AssertUtil; import cn.axzo.msg.center.domain.entity.MessageRouteButton; import cn.axzo.msg.center.domain.entity.MessageRouteDetail; import cn.axzo.msg.center.domain.entity.MessageRouterConfig; -import cn.axzo.msg.center.service.dto.BizDetailShowStrategyDTO; -import cn.axzo.msg.center.service.dto.MessageRouterButtonDTO; +import cn.axzo.msg.center.service.dto.MessageDetailRouteStrategyDTO; +import cn.axzo.msg.center.service.dto.MessageButtonRouteStrategyDTO; import cn.axzo.msg.center.service.dto.MessageRouterTerminalDTO; import cn.axzo.msg.center.service.enums.BizDetailShowStrategyEnum; -import cn.axzo.msg.center.service.enums.ButtonStyleEnum; import cn.axzo.msg.center.service.enums.RouterButtonSourceEnum; import cn.axzo.msg.center.service.enums.RouterCategoryEnum; import cn.axzo.msg.center.service.enums.TerminalTypeEnum; @@ -113,7 +112,7 @@ public class MessageTemplateRouterDTO implements Serializable { .build(); } - public static MessageRouteDetailDTO from(BizDetailShowStrategyDTO bizDetailShowStrategy, String templateCode) { + public static MessageRouteDetailDTO from(MessageDetailRouteStrategyDTO bizDetailShowStrategy, String templateCode) { AssertUtil.notNull(bizDetailShowStrategy, "btnRouter can not be null"); AssertUtil.notEmpty(templateCode, "templateCode can not be empty"); @@ -143,11 +142,11 @@ public class MessageTemplateRouterDTO implements Serializable { .collect(Collectors.toList()); } - public BizDetailShowStrategyDTO toBizDetailShowStrategyDTO() { + public MessageDetailRouteStrategyDTO toBizDetailShowStrategyDTO() { List terminals = this.routerConfigs.stream() .map(e -> MessageRouterTerminalDTO.builder().terminalType(e.terminalType).url(e.url).build()) .collect(Collectors.toList()); - return BizDetailShowStrategyDTO.builder().showStrategy(this.showStrategy).terminals(terminals).build(); + return MessageDetailRouteStrategyDTO.builder().showStrategy(this.showStrategy).terminals(terminals).build(); } @Override @@ -221,7 +220,7 @@ public class MessageTemplateRouterDTO implements Serializable { .build(); } - public static MessageRouteButtonDTO from(MessageRouterButtonDTO btnRouter, String templateCode) { + public static MessageRouteButtonDTO from(MessageButtonRouteStrategyDTO btnRouter, String templateCode) { AssertUtil.notNull(btnRouter, "btnRouter can not be null"); AssertUtil.notEmpty(templateCode, "templateCode can not be empty"); @@ -269,12 +268,12 @@ public class MessageTemplateRouterDTO implements Serializable { return CollectionUtils.isNotEmpty(routerConfigs); } - public MessageRouterButtonDTO toMessageRouterButton() { + public MessageButtonRouteStrategyDTO toMessageRouterButton() { List terminals = CollectionUtils.isEmpty(this.routerConfigs) ? Collections.emptyList() : this.routerConfigs.stream() .map(e -> MessageRouterTerminalDTO.builder().terminalType(e.terminalType).url(e.url).build()) .collect(Collectors.toList()); - return MessageRouterButtonDTO.builder() + return MessageButtonRouteStrategyDTO.builder() .desc(this.name) .category(this.category) .identityCode(this.btnCode) diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/domain/dto/RawMessageRouterDTO.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/domain/dto/RawMessageRouterDTO.java index 78f5cd37..0ae33852 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/domain/dto/RawMessageRouterDTO.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/domain/dto/RawMessageRouterDTO.java @@ -1,9 +1,8 @@ package cn.axzo.msg.center.message.domain.dto; import cn.axzo.msg.center.domain.entity.MessageTemplateRouter; -import cn.axzo.msg.center.service.dto.BizDetailShowStrategyDTO; -import cn.axzo.msg.center.service.dto.MessageRouterButtonDTO; -import cn.axzo.msg.center.service.dto.MessageRouterDTO; +import cn.axzo.msg.center.service.dto.MessageButtonRouteStrategyDTO; +import cn.axzo.msg.center.service.dto.ButtonRouterDTO; import cn.axzo.msg.center.service.dto.MessageRouterTerminalDTO; import cn.axzo.msg.center.service.enums.ButtonStyleEnum; import cn.axzo.msg.center.service.enums.RouterCategoryEnum; @@ -61,7 +60,7 @@ public class RawMessageRouterDTO implements Serializable { private List style; - public static RawMessageRouterDTO from(MessageRouterButtonDTO router, String templateCode) { + public static RawMessageRouterDTO from(MessageButtonRouteStrategyDTO router, String templateCode) { return RawMessageRouterDTO.builder() .desc(router.getDesc()) .category(router.getCategory()) @@ -71,8 +70,8 @@ public class RawMessageRouterDTO implements Serializable { .build(); } - public MessageRouterButtonDTO toMessageRouterButton() { - return MessageRouterButtonDTO.builder() + public MessageButtonRouteStrategyDTO toMessageRouterButton() { + return MessageButtonRouteStrategyDTO.builder() .desc(this.desc) .category(this.category) .terminals(this.terminals) @@ -86,9 +85,9 @@ public class RawMessageRouterDTO implements Serializable { .collect(Collectors.toList()); } - public MessageRouterDTO toMessageRouter(TerminalTypeEnum terminalType) { + public ButtonRouterDTO toMessageRouter(TerminalTypeEnum terminalType) { MessageRouterTerminalDTO terminal = MessageRouterUtil.select(this, terminalType); - return MessageRouterDTO.builder() + return ButtonRouterDTO.builder() .desc(this.desc) .category(this.category) .style(this.style) diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/domain/param/MessageTemplateSaveOrUpdateParam.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/domain/param/MessageTemplateSaveOrUpdateParam.java index 6bd5cd99..d83f478f 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/domain/param/MessageTemplateSaveOrUpdateParam.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/domain/param/MessageTemplateSaveOrUpdateParam.java @@ -1,9 +1,9 @@ package cn.axzo.msg.center.message.domain.param; import cn.axzo.msg.center.common.exception.ServiceException; -import cn.axzo.msg.center.service.dto.BizDetailShowStrategyDTO; +import cn.axzo.msg.center.service.dto.MessageDetailRouteStrategyDTO; import cn.axzo.msg.center.service.dto.MessageCardContentItemDTO; -import cn.axzo.msg.center.service.dto.MessageRouterButtonDTO; +import cn.axzo.msg.center.service.dto.MessageButtonRouteStrategyDTO; import cn.axzo.msg.center.service.enums.MessageCategoryEnum; import cn.axzo.msg.center.service.enums.PushTerminalEnum; import cn.axzo.msg.center.service.template.request.MessageTemplateCreateRequest; @@ -87,11 +87,11 @@ public class MessageTemplateSaveOrUpdateParam implements Serializable { /** * 业务详情展示策略 */ - private BizDetailShowStrategyDTO bizDetailShowStrategy; + private MessageDetailRouteStrategyDTO bizDetailShowStrategy; /** * 路由策略列表 */ - private List routers; + private List routers; public static MessageTemplateSaveOrUpdateParam from(MessageTemplateCreateRequest request) { MessageCategoryEnum category = MessageTemplateCategoryUtil 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 8e79be51..7bcb0e24 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 @@ -6,9 +6,9 @@ import cn.axzo.msg.center.message.domain.dto.MessageTemplateRouterDTO; import cn.axzo.msg.center.message.domain.dto.MessageTemplateRouterDTO.MessageRouteButtonDTO; import cn.axzo.msg.center.message.domain.dto.MessageTemplateRouterDTO.MessageRouteDetailDTO; import cn.axzo.msg.center.message.domain.dto.RawMessageRouterDTO; -import cn.axzo.msg.center.service.dto.BizDetailShowStrategyDTO; -import cn.axzo.msg.center.service.dto.MessageRouterButtonDTO; -import cn.axzo.msg.center.service.dto.MessageRouterDTO; +import cn.axzo.msg.center.service.dto.MessageDetailRouteStrategyDTO; +import cn.axzo.msg.center.service.dto.MessageButtonRouteStrategyDTO; +import cn.axzo.msg.center.service.dto.ButtonRouterDTO; import cn.axzo.msg.center.service.dto.MessageRouterTerminalDTO; import cn.axzo.msg.center.service.enums.ButtonStyleEnum; import cn.axzo.msg.center.service.enums.RouterCategoryEnum; @@ -51,7 +51,7 @@ public final class MessageRouterUtil { * @param msgTemplateRouter 模板路由配置 * @return 业务展示详情策略 */ - public static Optional fetchBizDetailShowStrategy(MessageTemplateRouterDTO msgTemplateRouter) { + public static Optional fetchBizDetailShowStrategy(MessageTemplateRouterDTO msgTemplateRouter) { if (Objects.isNull(msgTemplateRouter)) { return Optional.empty(); } @@ -65,7 +65,7 @@ public final class MessageRouterUtil { * @param msgTemplateRouter 模板路由配置 * @return 业务按钮路由策略 */ - public static List fetchMessageRouterButtons(MessageTemplateRouterDTO msgTemplateRouter) { + public static List fetchMessageRouterButtons(MessageTemplateRouterDTO msgTemplateRouter) { if (Objects.isNull(msgTemplateRouter)) { return Collections.emptyList(); } @@ -125,7 +125,7 @@ public final class MessageRouterUtil { * @param router 路由信息 * @param routerParam 路由参数 */ - public static void parseRouteUrl(MessageRouterDTO router, String routerParam) { + public static void parseRouteUrl(ButtonRouterDTO router, String routerParam) { // 路由参数有效 if (isRouterParamValid(routerParam)) { // 替换原始URL中的参数变量 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/ButtonRouterDTO.java similarity index 96% rename from msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/MessageRouterDTO.java rename to msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/ButtonRouterDTO.java index 85576af1..e9464d7a 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/ButtonRouterDTO.java @@ -25,7 +25,7 @@ import java.util.List; @Builder @NoArgsConstructor @AllArgsConstructor -public class MessageRouterDTO implements Serializable { +public class ButtonRouterDTO implements Serializable { private static final long serialVersionUID = 1326971022827041566L; diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/DetailRouterDTO.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/DetailRouterDTO.java new file mode 100644 index 00000000..94ba34d2 --- /dev/null +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/DetailRouterDTO.java @@ -0,0 +1,51 @@ +package cn.axzo.msg.center.service.dto; + +import cn.axzo.msg.center.service.enums.BizDetailShowStrategyEnum; +import cn.axzo.msg.center.service.enums.TerminalTypeEnum; +import com.alibaba.fastjson.JSON; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +import java.io.Serializable; + +/** + * @author cold_blade + * @date 2023/11/9 + * @version 1.0 + */ +@Setter +@Getter +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class DetailRouterDTO implements Serializable { + + private static final long serialVersionUID = -6069254958617169824L; + + /** + * 展示策略 + */ + private BizDetailShowStrategyEnum showStrategy; + /** + * 页面地址 + */ + private String url; + /** + * 页面地址所属应用端(如果是API接口地址,请忽略改字段值) + * WEB: web端页面 + * MINI_PROGRAM: 安心筑小程序端页面 + * IOS: 原生IOS端页面 + * ANDROID: 原生Android端页面 + * WEB_VIEW: H5页面 + * WECHAT_MINI_PROGRAM: 微信小程序页面 + */ + private TerminalTypeEnum terminalType; + + @Override + public String toString() { + return JSON.toJSONString(this); + } +} diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/MessageRouterButtonDTO.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/MessageButtonRouteStrategyDTO.java similarity index 96% rename from msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/MessageRouterButtonDTO.java rename to msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/MessageButtonRouteStrategyDTO.java index 9a9bda2f..22dc6d93 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/MessageRouterButtonDTO.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/MessageButtonRouteStrategyDTO.java @@ -13,7 +13,6 @@ import org.apache.commons.collections.CollectionUtils; import java.io.Serializable; import java.util.List; -import java.util.Optional; /** * @description @@ -27,7 +26,7 @@ import java.util.Optional; @Builder @NoArgsConstructor @AllArgsConstructor -public class MessageRouterButtonDTO implements Serializable { +public class MessageButtonRouteStrategyDTO implements Serializable { private static final long serialVersionUID = -9083376003614521781L; diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/BizDetailShowStrategyDTO.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/MessageDetailRouteStrategyDTO.java similarity index 92% rename from msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/BizDetailShowStrategyDTO.java rename to msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/MessageDetailRouteStrategyDTO.java index e4863ff8..194375f1 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/BizDetailShowStrategyDTO.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/MessageDetailRouteStrategyDTO.java @@ -21,7 +21,7 @@ import java.util.List; @Builder @NoArgsConstructor @AllArgsConstructor -public class BizDetailShowStrategyDTO implements Serializable { +public class MessageDetailRouteStrategyDTO implements Serializable { private static final long serialVersionUID = -3496745332397525305L; diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/general/response/GeneralMessageResponse.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/general/response/GeneralMessageResponse.java index b5c8150c..120d1c23 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/service/general/response/GeneralMessageResponse.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/general/response/GeneralMessageResponse.java @@ -1,7 +1,7 @@ package cn.axzo.msg.center.service.general.response; import cn.axzo.msg.center.service.dto.IdentityDTO; -import cn.axzo.msg.center.service.dto.MessageRouterDTO; +import cn.axzo.msg.center.service.dto.ButtonRouterDTO; import cn.axzo.msg.center.service.enums.OrganizationTypeEnum; import cn.axzo.msg.center.service.enums.PushTerminalEnum; import com.alibaba.fastjson.JSON; @@ -98,7 +98,7 @@ public class GeneralMessageResponse implements Serializable { /** * 路由信息,可为空 */ - private List routers; + private List routers; /** * 参数及其对应的值的JSON串 */ 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 90f88a9f..c6d941a0 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 @@ -1,9 +1,9 @@ package cn.axzo.msg.center.service.pending.response; -import cn.axzo.msg.center.service.dto.BizDetailShowStrategyDTO; +import cn.axzo.msg.center.service.dto.ButtonRouterDTO; +import cn.axzo.msg.center.service.dto.DetailRouterDTO; import cn.axzo.msg.center.service.dto.IdentityDTO; import cn.axzo.msg.center.service.dto.MessageCardContentItemDTO; -import cn.axzo.msg.center.service.dto.MessageRouterButtonDTO; import cn.axzo.msg.center.service.enums.BizCategoryEnum; import com.alibaba.fastjson.JSON; import lombok.AllArgsConstructor; @@ -96,13 +96,13 @@ public class PendingMessageResponse implements Serializable { */ private Long deadlineTimestamp; /** - * 业务详情路由策略 + * 业务详情路由 */ - private BizDetailShowStrategyDTO detailShowStrategy; + private DetailRouterDTO detailRouter; /** - * 按钮路由策略 + * 按钮路由 */ - private List routeButtons; + private List buttonRouters; /** * 业务终态的印章图片地址 */ diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/template/request/MessageTemplateCreateRequest.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/template/request/MessageTemplateCreateRequest.java index c69d0750..4b796493 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/service/template/request/MessageTemplateCreateRequest.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/template/request/MessageTemplateCreateRequest.java @@ -1,8 +1,8 @@ package cn.axzo.msg.center.service.template.request; -import cn.axzo.msg.center.service.dto.BizDetailShowStrategyDTO; +import cn.axzo.msg.center.service.dto.MessageDetailRouteStrategyDTO; import cn.axzo.msg.center.service.dto.MessageCardContentItemDTO; -import cn.axzo.msg.center.service.dto.MessageRouterButtonDTO; +import cn.axzo.msg.center.service.dto.MessageButtonRouteStrategyDTO; import cn.axzo.msg.center.service.enums.MessageCategoryEnum; import cn.axzo.msg.center.service.enums.MessageGroupCategoryEnum; import cn.axzo.msg.center.service.enums.PushTerminalEnum; @@ -88,11 +88,11 @@ public class MessageTemplateCreateRequest implements Serializable { /** * 详情展示策略 */ - private BizDetailShowStrategyDTO detailStrategy; + private MessageDetailRouteStrategyDTO detailStrategy; /** * 路由策略列表 */ - private List routers; + private List routers; @Override public String toString() { diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/template/request/MessageTemplateUpdateRequest.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/template/request/MessageTemplateUpdateRequest.java index 95611796..f3cceb38 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/service/template/request/MessageTemplateUpdateRequest.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/template/request/MessageTemplateUpdateRequest.java @@ -1,8 +1,8 @@ package cn.axzo.msg.center.service.template.request; import cn.axzo.msg.center.service.dto.MessageCardContentItemDTO; -import cn.axzo.msg.center.service.dto.BizDetailShowStrategyDTO; -import cn.axzo.msg.center.service.dto.MessageRouterButtonDTO; +import cn.axzo.msg.center.service.dto.MessageDetailRouteStrategyDTO; +import cn.axzo.msg.center.service.dto.MessageButtonRouteStrategyDTO; import cn.axzo.msg.center.service.enums.PushTerminalEnum; import com.alibaba.fastjson.JSON; import lombok.Getter; @@ -73,11 +73,11 @@ public class MessageTemplateUpdateRequest implements Serializable { /** * 详情展示策略 */ - private BizDetailShowStrategyDTO detailStrategy; + private MessageDetailRouteStrategyDTO detailStrategy; /** * 路由策略列表 */ - private List routers; + private List routers; @Override public String toString() { diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/template/response/MessageTemplateDetailResponse.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/template/response/MessageTemplateDetailResponse.java index 69e9f009..6fecbdce 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/service/template/response/MessageTemplateDetailResponse.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/template/response/MessageTemplateDetailResponse.java @@ -1,8 +1,8 @@ package cn.axzo.msg.center.service.template.response; -import cn.axzo.msg.center.service.dto.BizDetailShowStrategyDTO; +import cn.axzo.msg.center.service.dto.MessageDetailRouteStrategyDTO; import cn.axzo.msg.center.service.dto.MessageCardContentItemDTO; -import cn.axzo.msg.center.service.dto.MessageRouterButtonDTO; +import cn.axzo.msg.center.service.dto.MessageButtonRouteStrategyDTO; import cn.axzo.msg.center.service.enums.MessageCategoryEnum; import cn.axzo.msg.center.service.enums.MessageGroupCategoryEnum; import cn.axzo.msg.center.service.enums.PushTerminalEnum; @@ -79,11 +79,11 @@ public class MessageTemplateDetailResponse implements Serializable { /** * 详情展示策略 */ - private BizDetailShowStrategyDTO detailStrategy; + private MessageDetailRouteStrategyDTO detailStrategy; /** * 路由策略列表 */ - private List routers; + private List routers; /** * 模板创建时间戳 */