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

feat: REQ-2129 消息模板增加pushData配置

Browse Source
This commit is contained in:
lilong 2024-03-23 10:12:02 +08:00
parent 3d65a4f1ee
commit d7a1917f1f
7 changed files with 26 additions and 0 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/param/MessageTemplateSaveOrUpdateParam.java
View File

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

2
inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateNewServiceImpl.java
View File

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

3
msg-center-api/src/main/java/cn/axzo/msg/center/service/template/request/MessageTemplateCreateRequest.java
View File

@ -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<MessageButtonRouteStrategyDTO> routers;
private JSONObject pushData;
@Override
public String toString() {
return JSON.toJSONString(this);

3
msg-center-api/src/main/java/cn/axzo/msg/center/service/template/request/MessageTemplateUpdateRequest.java
View File

@ -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<MessageButtonRouteStrategyDTO> routers;
private JSONObject pushData;
@Override
public String toString() {
return JSON.toJSONString(this);

3
msg-center-api/src/main/java/cn/axzo/msg/center/service/template/response/MessageTemplateDetailResponse.java
View File

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

3
msg-center-api/src/main/java/cn/axzo/msg/center/service/template/response/MessageTemplatePageResponse.java
View File

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

6
msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/MessageBaseTemplate.java
View File

@ -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<MessageBaseTemplate> impl
*/
private Long updaterId;
@TableField(typeHandler = FastjsonTypeHandler.class)
private JSONObject pushData;
@Override
public String toString() {
return JSON.toJSONString(this);