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

inside-notices/src/main/java/cn/axzo/msg/center/message/domain/vo/GeneralMessagePushVO.java

@@ -88,6 +88,7 @@ public class GeneralMessagePushVO implements Serializable {
         List<CardButton> cardButtons = CollectionUtils.isEmpty(routerButtons) ? Collections.emptyList() :
                 routerButtons.stream()
                         .filter(e -> !RouterCategoryEnum.DETAIL.equals(e.getCategory()))
+                        .filter(MessageRouterButtonDTO::isShowOnCard)
                         .map(CardButton::from)
                         .collect(Collectors.toList());
         List<CardExtensionItem> cardExtension = CollectionUtils.isEmpty(cardContentItems) ? Collections.emptyList() :
@@ -158,6 +159,10 @@ public class GeneralMessagePushVO implements Serializable {
          * 按钮操作类型: JUMP - 页面跳转, ACTION - 接口调用
          */
         private String action;
+        /**
+         * 按钮样式
+         */
+        private Boolean isHighlight;
         /**
          * 按钮点击后的跳转地址
          */
@@ -167,6 +172,7 @@ public class GeneralMessagePushVO implements Serializable {
             return CardButton.builder()
                     .title(routerButton.getDesc())
                     .action(routerButton.getCategory().name())
+                    .isHighlight(routerButton.isHighlight())
                     .actionPaths(routerButton.getTerminals().stream()
                             .map(e -> new ButtonAction(e.getTerminalType().name(), e.getUrl()))
                             .collect(Collectors.toList())

inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/GeneralMessageServiceImpl.java

@@ -42,7 +42,8 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor
 public class GeneralMessageServiceImpl implements GeneralMessageService {
 
-    private final String orgIcon = "www.baidu.com";
+    // TODO:[cold_blade] [P2] 图片icon的最好配置在nacos上
+    private final String orgIcon = "https://axzo-pro.oss-cn-hangzhou.aliyuncs.com/rs_app/ic_org_icon.png";
 
     private final MessageApi messageApi;
     private final MessageTemplateNewService messageTemplateNewService;

msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/MessageRouterButtonDTO.java

@@ -8,6 +8,7 @@ import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import org.apache.commons.collections.CollectionUtils;
 
 import java.io.Serializable;
 import java.util.List;
@@ -50,6 +51,16 @@ public class MessageRouterButtonDTO implements Serializable {
      */
     private List<MessageRouterTerminalDTO> terminals;
 
+    public boolean isHighlight() {
+        return CollectionUtils.isNotEmpty(style)
+                && style.stream().anyMatch(ButtonStyleEnum.HIGH_LIGHT::equals);
+    }
+
+    public boolean isShowOnCard() {
+        return CollectionUtils.isNotEmpty(style)
+                && style.stream().anyMatch(ButtonStyleEnum.OVER_CARD::equals);
+    }
+
     @Override
     public String toString() {
         return JSON.toJSONString(this);