From b37d4c782f0cf2d4dad19d5067198a2ad6c7bb71 Mon Sep 17 00:00:00 2001
From: luofu <luofu@axzo.cn>
Date: Sat, 11 Nov 2023 17:34:54 +0800
Subject: [PATCH] =?UTF-8?q?feat(REQ-1507):=20=E6=B6=88=E6=81=AF=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E8=B7=AF=E7=94=B1=E4=BF=AE=E6=94=B9=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

背景：
  https://jira.axzo.cn/browse/REQ-1507?goToView=1

修改：

1、消息模板路由修改逻辑调整；

影响：
  无
---
 .../impl/MessageTemplateNewServiceImpl.java   |  2 ++
 .../dto/MessageButtonRouteStrategyDTO.java    | 21 +++++--------------
 2 files changed, 7 insertions(+), 16 deletions(-)

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 9c358def..81b75654 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
@@ -18,6 +18,7 @@ import cn.axzo.msg.center.message.service.MessageTemplateGroupService;
 import cn.axzo.msg.center.message.service.MessageTemplateNewService;
 import cn.axzo.msg.center.message.service.MessageTemplateRouterService;
 import cn.axzo.msg.center.service.dto.MessageBaseTemplateDTO;
+import cn.axzo.msg.center.service.dto.MessageButtonRouteStrategyDTO;
 import cn.axzo.msg.center.service.dto.MessageCardContentItemDTO;
 import cn.axzo.msg.center.service.enums.PushTerminalEnum;
 import cn.axzo.msg.center.service.enums.StatusEnum;
@@ -419,6 +420,7 @@ public class MessageTemplateNewServiceImpl implements MessageTemplateNewService
         }
         if (CollectionUtils.isNotEmpty(param.getRouters())) {
             List<MessageRouteButtonDTO> btnRouters = param.getRouters().stream()
+                    .filter(MessageButtonRouteStrategyDTO::isValid)
                     .map(e -> MessageRouteButtonDTO.from(e, templateCode))
                     .collect(Collectors.toList());
             templateRouter.setRouteButtons(btnRouters);
diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/MessageButtonRouteStrategyDTO.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/MessageButtonRouteStrategyDTO.java
index 22dc6d93..fb31c430 100644
--- a/msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/MessageButtonRouteStrategyDTO.java
+++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/MessageButtonRouteStrategyDTO.java
@@ -10,6 +10,7 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.io.Serializable;
 import java.util.List;
@@ -66,23 +67,11 @@ public class MessageButtonRouteStrategyDTO implements Serializable {
     private String apiUrl;
 
     public boolean isValid() {
-        if (CollectionUtils.isEmpty(terminals)) {
-            return false;
+        if (RouterCategoryEnum.ACTION.equals(category)) {
+            return StringUtils.isNotBlank(apiUrl);
         }
-        if (RouterCategoryEnum.ACTION.equals(category) && terminals.size() > 1) {
-            return false;
-        }
-        return terminals.stream().allMatch(MessageRouterTerminalDTO::isValid);
-    }
-
-    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);
+        return CollectionUtils.isNotEmpty(terminals)
+                && terminals.stream().allMatch(MessageRouterTerminalDTO::isValid);
     }
 
     @Override