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

Merge branch 'feature/REQ-1507' of axzsource.com:universal/infrastructure/backend/msg-center-plat into dev

Browse Source
This commit is contained in:
luofu 2023-11-13 10:55:15 +08:00
commit 0ba4c7593a
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,6 +13,7 @@ import cn.axzo.msg.center.service.enums.RouterCategoryEnum;
import cn.axzo.msg.center.service.enums.TerminalTypeEnum;
import cn.axzo.msg.center.utils.MessageRouterUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.AllArgsConstructor;
import lombok.Builder;
@ -194,7 +195,7 @@ public class MessageTemplateRouterDTO implements Serializable {
/**
* 按钮style配置
*/
private JSONObject style;
private JSONArray style;
/**
* 按钮优先级，数值越大优先级越低
*/
@ -203,7 +204,6 @@ public class MessageTemplateRouterDTO implements Serializable {
public static MessageRouteButtonDTO from(MessageRouteButton routeButton,
List<MessageRouterConfig> routerConfigs) {
AssertUtil.notNull(routeButton, "msgRouteDetail can not be null");
AssertUtil.notEmpty(routerConfigs, "routerConfigs can not be empty");
List<MessageRouterConfigDTO> configs = CollectionUtils.isEmpty(routerConfigs) ? Collections.emptyList() :
routerConfigs.stream().map(MessageRouterConfigDTO::from).collect(Collectors.toList());
@ -224,8 +224,8 @@ public class MessageTemplateRouterDTO implements Serializable {
AssertUtil.notNull(btnRouter, "btnRouter can not be null");
AssertUtil.notEmpty(templateCode, "templateCode can not be empty");
JSONObject style = CollectionUtils.isEmpty(btnRouter.getStyle()) ? null
: JSON.parseObject(JSON.toJSONString(btnRouter.getStyle()));
JSONArray style = CollectionUtils.isEmpty(btnRouter.getStyle()) ? null
: JSON.parseArray(JSON.toJSONString(btnRouter.getStyle()));
List<MessageRouterConfigDTO> routerConfigs = CollectionUtils.isEmpty(btnRouter.getTerminals()) ? null :
btnRouter.getTerminals().stream()
.map(e -> MessageRouterConfigDTO.builder().url(e.getUrl()).terminalType(e.getTerminalType()).build())

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

@ -14,6 +14,7 @@ import cn.axzo.msg.center.service.enums.ButtonStyleEnum;
import cn.axzo.msg.center.service.enums.RouterCategoryEnum;
import cn.axzo.msg.center.service.enums.TerminalTypeEnum;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
@ -116,7 +117,7 @@ public final class MessageRouterUtil {
* @param styleObj 按钮style对象
* @return 按钮style列表
*/
public static List<ButtonStyleEnum> parseButtonStyle(JSONObject styleObj) {
public static List<ButtonStyleEnum> parseButtonStyle(JSONArray styleObj) {
if (Objects.isNull(styleObj)) {
return Collections.emptyList();
}

5
msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/MessageRouteButton.java
View File

@ -1,11 +1,10 @@
package cn.axzo.msg.center.domain.entity;
import cn.axzo.msg.center.domain.persistence.BaseEntityExt;
import cn.axzo.msg.center.service.enums.MessageCategoryEnum;
import cn.axzo.msg.center.service.enums.RouterButtonSourceEnum;
import cn.axzo.msg.center.service.enums.RouterCategoryEnum;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
@ -62,7 +61,7 @@ public class MessageRouteButton extends BaseEntityExt<MessageRouteButton> implem
* 按钮style配置
*/
@TableField(typeHandler = FastjsonTypeHandler.class)
private JSONObject style;
private JSONArray style;
/**
* 按钮优先级，数值越大优先级越低
*/