From d7a1917f1f2e9ef93e17d2bb3125fdb13a2fedcb Mon Sep 17 00:00:00 2001 From: lilong Date: Sat, 23 Mar 2024 10:12:02 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20REQ-2129=20=E6=B6=88=E6=81=AF=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E5=A2=9E=E5=8A=A0pushData=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/param/MessageTemplateSaveOrUpdateParam.java | 6 ++++++ .../message/service/impl/MessageTemplateNewServiceImpl.java | 2 ++ .../template/request/MessageTemplateCreateRequest.java | 3 +++ .../template/request/MessageTemplateUpdateRequest.java | 3 +++ .../template/response/MessageTemplateDetailResponse.java | 3 +++ .../template/response/MessageTemplatePageResponse.java | 3 +++ .../axzo/msg/center/domain/entity/MessageBaseTemplate.java | 6 ++++++ 7 files changed, 26 insertions(+) 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 f818b2e0..9b536b45 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 @@ -13,6 +13,8 @@ import cn.axzo.msg.center.utils.MessageTemplateCategoryUtil; import com.alibaba.fastjson.JSON; import java.io.Serializable; import java.util.List; + +import com.alibaba.fastjson.JSONObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; @@ -93,6 +95,8 @@ public class MessageTemplateSaveOrUpdateParam implements Serializable { */ private List routers; + private JSONObject pushData; + public static MessageTemplateSaveOrUpdateParam from(MessageTemplateCreateRequest request) { MessageCategoryEnum category = MessageTemplateCategoryUtil .checkAndReturnSubCategory(request.getCategory(), request.getSubCategory()) @@ -110,6 +114,7 @@ public class MessageTemplateSaveOrUpdateParam implements Serializable { .routers(request.getRouters()) .pushTerminals(request.getPushTerminals()) .bizDetailShowStrategy(request.getDetailStrategy()) + .pushData(request.getPushData()) .build(); } @@ -127,6 +132,7 @@ public class MessageTemplateSaveOrUpdateParam implements Serializable { .routers(request.getRouters()) .pushTerminals(request.getPushTerminals()) .bizDetailShowStrategy(request.getDetailStrategy()) + .pushData(request.getPushData()) .build(); } diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateNewServiceImpl.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateNewServiceImpl.java index 4a8a9905..2ad1969e 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateNewServiceImpl.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateNewServiceImpl.java @@ -336,6 +336,7 @@ public class MessageTemplateNewServiceImpl implements MessageTemplateNewService .set(MessageBaseTemplate::getContent, param.getContent()) .set(MessageBaseTemplate::getIcon, param.getIcon()) .set(MessageBaseTemplate::getMinAppVersion, param.getMinAppVersion()) + .set(Objects.nonNull(param.getPushData()), MessageBaseTemplate::getPushData, param.getPushData()) .update(); } @@ -446,6 +447,7 @@ public class MessageTemplateNewServiceImpl implements MessageTemplateNewService .minAppVersion(record.getMinAppVersion()) .createTimestamp(record.getCreateAt().getTime()) .updateTimestamp(record.getUpdateAt().getTime()) + .pushData(record.getPushData()) .build(); } 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 4b796493..169483cc 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 @@ -7,6 +7,7 @@ import cn.axzo.msg.center.service.enums.MessageCategoryEnum; import cn.axzo.msg.center.service.enums.MessageGroupCategoryEnum; import cn.axzo.msg.center.service.enums.PushTerminalEnum; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import lombok.Getter; import lombok.Setter; @@ -94,6 +95,8 @@ public class MessageTemplateCreateRequest implements Serializable { */ private List routers; + private JSONObject pushData; + @Override public String toString() { return JSON.toJSONString(this); 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 f3cceb38..84062583 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 @@ -5,6 +5,7 @@ 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 com.alibaba.fastjson.JSONObject; import lombok.Getter; import lombok.Setter; @@ -79,6 +80,8 @@ public class MessageTemplateUpdateRequest implements Serializable { */ private List routers; + private JSONObject pushData; + @Override public String toString() { return JSON.toJSONString(this); 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 6fecbdce..add65f88 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 @@ -7,6 +7,7 @@ import cn.axzo.msg.center.service.enums.MessageCategoryEnum; import cn.axzo.msg.center.service.enums.MessageGroupCategoryEnum; import cn.axzo.msg.center.service.enums.PushTerminalEnum; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; @@ -93,6 +94,8 @@ public class MessageTemplateDetailResponse implements Serializable { */ private Long updateTimestamp; + private JSONObject pushData; + @Override public String toString() { return JSON.toJSONString(this); diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/template/response/MessageTemplatePageResponse.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/template/response/MessageTemplatePageResponse.java index 42e350e2..7745c532 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/service/template/response/MessageTemplatePageResponse.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/template/response/MessageTemplatePageResponse.java @@ -3,6 +3,7 @@ package cn.axzo.msg.center.service.template.response; import cn.axzo.msg.center.service.enums.MessageCategoryEnum; import cn.axzo.msg.center.service.enums.StatusEnum; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import lombok.Getter; import lombok.Setter; @@ -54,6 +55,8 @@ public class MessageTemplatePageResponse implements Serializable { */ private StatusEnum status; + private JSONObject pushData; + @Override public String toString() { return JSON.toJSONString(this); diff --git a/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/MessageBaseTemplate.java b/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/MessageBaseTemplate.java index 7cce03e8..87c47854 100644 --- a/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/MessageBaseTemplate.java +++ b/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/MessageBaseTemplate.java @@ -4,7 +4,10 @@ import cn.axzo.msg.center.domain.persistence.BaseEntityExt; import cn.axzo.msg.center.service.enums.MessageCategoryEnum; import cn.axzo.msg.center.service.enums.StatusEnum; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler; import lombok.Getter; import lombok.Setter; @@ -75,6 +78,9 @@ public class MessageBaseTemplate extends BaseEntityExt impl */ private Long updaterId; + @TableField(typeHandler = FastjsonTypeHandler.class) + private JSONObject pushData; + @Override public String toString() { return JSON.toJSONString(this);