历史已发布过滤 同时过滤 群发+无限发表

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/filter/strategy/HistoryTitleStrategy.java

@@ -1,5 +1,6 @@
 package com.tzld.longarticle.recommend.server.service.recommend.filter.strategy;
 
+import com.tzld.longarticle.recommend.server.common.enums.recommend.ArticleTypeEnum;
 import com.tzld.longarticle.recommend.server.model.dto.Content;
 import com.tzld.longarticle.recommend.server.model.entity.crawler.Article;
 import com.tzld.longarticle.recommend.server.remote.ArticleListRemoteService;
@@ -42,6 +43,16 @@ public class HistoryTitleStrategy implements FilterStrategy {
         List<String> result = new ArrayList<>(param.getContents().size());
         List<Content> filterContents = new ArrayList<>();
         List<Article> allArticleList = articleListRemoteService.articleList(param.getGhId(), allIndex, param.getType());
+        // 群发/无限发表 同时检查两种类型的历史文章
+        if (ArticleTypeEnum.QUNFA.getVal().equals(param.getType())
+                || ArticleTypeEnum.WUXIANLIU.getVal().equals(param.getType())) {
+            String otherType = ArticleTypeEnum.QUNFA.getVal().equals(param.getType())
+                    ? ArticleTypeEnum.WUXIANLIU.getVal() : ArticleTypeEnum.QUNFA.getVal();
+            List<Article> otherTypeArticleList = articleListRemoteService.articleList(param.getGhId(), allIndex, otherType);
+            List<Article> mergedList = new ArrayList<>(allArticleList);
+            mergedList.addAll(otherTypeArticleList);
+            allArticleList = mergedList;
+        }
         List<String> allTitleList = allArticleList.stream().map(Article::getTitle).distinct().collect(Collectors.toList());
         Long publishTimestampFilter = DateUtils.getBeforeDayStart(historyTitleFilterFirstDay);
         List<String> firstSecondTitleList = allArticleList.stream()