From 8eb94e575013f19f6e7f1420f9d691c24e066fcb Mon Sep 17 00:00:00 2001 From: yanglin Date: Tue, 8 Oct 2024 10:45:04 +0800 Subject: [PATCH] =?UTF-8?q?REQ-3045:=20=E6=B7=BB=E5=8A=A0=E4=B8=80?= =?UTF-8?q?=E4=BA=9B=E5=9F=BA=E7=A1=80=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../center/service/domain/CardUrlConfig.java | 6 ++--- .../center/service/domain}/GroupConfig.java | 2 +- .../service/domain/MobileUrlConfig.java | 15 ++++++++++++ .../msg/center/service/domain/UrlConfig.java | 23 +++++++++++++++++++ .../msg/center/service/domain/url/AppUrl.java | 18 +++++++++++++++ .../domain/url/WebPageOpenStrategy.java | 21 +++++++++++++++++ .../msg/center/service/domain/url/WebUrl.java | 23 +++++++++++++++++++ ...Strategy.java => CardUrlOpenStrategy.java} | 2 +- .../entity/MessageTemplateButtonV3.java | 4 ++-- .../domain/entity/MessageTemplateGroupV3.java | 2 +- .../domain/entity/MessageTemplateV3.java | 12 +++++----- .../domain/entity/jsondomain/LinksConfig.java | 12 ---------- 12 files changed, 114 insertions(+), 26 deletions(-) rename msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/jsondomain/CardLinkConfig.java => msg-center-api/src/main/java/cn/axzo/msg/center/service/domain/CardUrlConfig.java (51%) rename {msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/jsondomain => msg-center-api/src/main/java/cn/axzo/msg/center/service/domain}/GroupConfig.java (69%) create mode 100644 msg-center-api/src/main/java/cn/axzo/msg/center/service/domain/MobileUrlConfig.java create mode 100644 msg-center-api/src/main/java/cn/axzo/msg/center/service/domain/UrlConfig.java create mode 100644 msg-center-api/src/main/java/cn/axzo/msg/center/service/domain/url/AppUrl.java create mode 100644 msg-center-api/src/main/java/cn/axzo/msg/center/service/domain/url/WebPageOpenStrategy.java create mode 100644 msg-center-api/src/main/java/cn/axzo/msg/center/service/domain/url/WebUrl.java rename msg-center-api/src/main/java/cn/axzo/msg/center/service/enums/{CardLinkStrategy.java => CardUrlOpenStrategy.java} (91%) delete mode 100644 msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/jsondomain/LinksConfig.java diff --git a/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/jsondomain/CardLinkConfig.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/domain/CardUrlConfig.java similarity index 51% rename from msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/jsondomain/CardLinkConfig.java rename to msg-center-api/src/main/java/cn/axzo/msg/center/service/domain/CardUrlConfig.java index d1b720ac..31a78378 100644 --- a/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/jsondomain/CardLinkConfig.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/domain/CardUrlConfig.java @@ -1,4 +1,4 @@ -package cn.axzo.msg.center.domain.entity.jsondomain; +package cn.axzo.msg.center.service.domain; import lombok.Getter; import lombok.Setter; @@ -8,11 +8,11 @@ import lombok.Setter; */ @Setter @Getter -public class CardLinkConfig { +public class CardUrlConfig { /** * 链接配置 */ - private LinksConfig linksConfig; + private UrlConfig urlConfig; } \ No newline at end of file diff --git a/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/jsondomain/GroupConfig.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/domain/GroupConfig.java similarity index 69% rename from msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/jsondomain/GroupConfig.java rename to msg-center-api/src/main/java/cn/axzo/msg/center/service/domain/GroupConfig.java index 31875e50..adc8048b 100644 --- a/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/jsondomain/GroupConfig.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/domain/GroupConfig.java @@ -1,4 +1,4 @@ -package cn.axzo.msg.center.domain.entity.jsondomain; +package cn.axzo.msg.center.service.domain; import lombok.Getter; import lombok.Setter; diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/domain/MobileUrlConfig.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/domain/MobileUrlConfig.java new file mode 100644 index 00000000..c0587bc1 --- /dev/null +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/domain/MobileUrlConfig.java @@ -0,0 +1,15 @@ +package cn.axzo.msg.center.service.domain; + +import cn.axzo.msg.center.service.domain.url.AppUrl; +import lombok.Getter; +import lombok.Setter; + +/** + * @author yanglin + */ +@Setter +@Getter +public class MobileUrlConfig { + private AppUrl ios; + private AppUrl android; +} \ No newline at end of file diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/domain/UrlConfig.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/domain/UrlConfig.java new file mode 100644 index 00000000..c87d08ae --- /dev/null +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/domain/UrlConfig.java @@ -0,0 +1,23 @@ +package cn.axzo.msg.center.service.domain; + +import cn.axzo.msg.center.service.domain.url.WebUrl; +import lombok.Getter; +import lombok.Setter; + +/** + * @author yanglin + */ +@Setter +@Getter +public class UrlConfig { + // PC(OMS) + private WebUrl pcOms; + // PC(CMS) + private WebUrl pcCms; + // 监管平台 + private WebUrl pcGaGeneral; + // APP(工人端) + private MobileUrlConfig appWorker; + // APP(管理端) + private MobileUrlConfig appManager; +} \ No newline at end of file diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/domain/url/AppUrl.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/domain/url/AppUrl.java new file mode 100644 index 00000000..5755c2f2 --- /dev/null +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/domain/url/AppUrl.java @@ -0,0 +1,18 @@ +package cn.axzo.msg.center.service.domain.url; + +import lombok.Getter; +import lombok.Setter; + +/** + * @author yanglin + */ +@Setter +@Getter +public class AppUrl { + + /** + * url地址 + */ + private String url; + +} diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/domain/url/WebPageOpenStrategy.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/domain/url/WebPageOpenStrategy.java new file mode 100644 index 00000000..79ccda3b --- /dev/null +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/domain/url/WebPageOpenStrategy.java @@ -0,0 +1,21 @@ +package cn.axzo.msg.center.service.domain.url; + +import lombok.AccessLevel; +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * @author yanglin + */ +@Getter +@AllArgsConstructor(access = AccessLevel.PRIVATE) +public enum WebPageOpenStrategy { + + NEW_PAGE("新页面打开"), + CURRENT_PAGE("当前页面打开"), + DRAWER("抽屉") + + ; + + private final String desc; +} diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/domain/url/WebUrl.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/domain/url/WebUrl.java new file mode 100644 index 00000000..7c02c478 --- /dev/null +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/domain/url/WebUrl.java @@ -0,0 +1,23 @@ +package cn.axzo.msg.center.service.domain.url; + +import lombok.Getter; +import lombok.Setter; + +/** + * @author yanglin + */ +@Setter +@Getter +public class WebUrl { + + /** + * 网页打开方式. NEW_PAGE: 新页面打开, CURRENT_PAGE: 当前页面打开, DRAWER: 抽屉 + */ + private WebPageOpenStrategy openStrategy; + + /** + * url地址 + */ + private String url; + +} diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/enums/CardLinkStrategy.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/enums/CardUrlOpenStrategy.java similarity index 91% rename from msg-center-api/src/main/java/cn/axzo/msg/center/service/enums/CardLinkStrategy.java rename to msg-center-api/src/main/java/cn/axzo/msg/center/service/enums/CardUrlOpenStrategy.java index ecbdbfd2..fa95508a 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/service/enums/CardLinkStrategy.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/enums/CardUrlOpenStrategy.java @@ -9,7 +9,7 @@ import lombok.Getter; */ @Getter @AllArgsConstructor(access = AccessLevel.PRIVATE) -public enum CardLinkStrategy { +public enum CardUrlOpenStrategy { NONE("无跳转"), OPEN_TODO_DETAIL("打开待办详情"), diff --git a/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/MessageTemplateButtonV3.java b/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/MessageTemplateButtonV3.java index b28274c0..171091b0 100644 --- a/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/MessageTemplateButtonV3.java +++ b/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/MessageTemplateButtonV3.java @@ -1,6 +1,6 @@ package cn.axzo.msg.center.domain.entity; -import cn.axzo.msg.center.domain.entity.jsondomain.LinksConfig; +import cn.axzo.msg.center.service.domain.UrlConfig; import cn.axzo.msg.center.service.enums.PresetButtonType; import cn.axzo.msg.center.service.enums.RouterButtonSourceEnum; import com.alibaba.fastjson.JSONArray; @@ -41,7 +41,7 @@ public class MessageTemplateButtonV3 extends BaseEntityWithOperator private String content; /** - * 消息详情样式. BIZ_COMMON: 业务待办能用, FLOW_COMMON: 审批待办能用, 其它动态配置的 + * 消息详情样式. BIZ_COMMON: 业务待办能用, FLOW_COMMON: 审批待办能用, 其它动态配置的 */ private String detailStyleCode; @@ -74,12 +73,13 @@ public class MessageTemplateV3 extends BaseEntityWithOperator /** * 卡片跳转方式. NONE: 无跳转, OPEN_TODO_DETAIL: 打开待办详情, OPEN_CUSTOM_PAGE: 打开指定页面 */ - private CardLinkStrategy cardLinkStrategy; + private CardUrlOpenStrategy cardUrlOpenStrategy; /** * 卡片跳转配置. 在links的基础上再包一层, 避免以后卡片增加自己的配置 */ - private CardLinkConfig cardLinkConfig; + @TableField(typeHandler = FastjsonTypeHandler.class) + private CardUrlConfig cardUrConfig; /** * IM发送优先级 diff --git a/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/jsondomain/LinksConfig.java b/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/jsondomain/LinksConfig.java deleted file mode 100644 index e0931fe8..00000000 --- a/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/jsondomain/LinksConfig.java +++ /dev/null @@ -1,12 +0,0 @@ -package cn.axzo.msg.center.domain.entity.jsondomain; - -import lombok.Getter; -import lombok.Setter; - -/** - * @author yanglin - */ -@Setter -@Getter -public class LinksConfig { -} \ No newline at end of file