Merge branch 'wyp/1216-videoPoolFilter' of Server/long-article-recommend into master

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

@@ -98,6 +98,7 @@ public class FilterService {
         strategies.add(ServiceBeanFactory.getBean(DeDuplicationStrategy.class));
         strategies.add(ServiceBeanFactory.getBean(KeywordStrategy.class));
         strategies.add(ServiceBeanFactory.getBean(ArticlePromotionStrategy.class));
+        strategies.add(ServiceBeanFactory.getBean(VideoPoolBadAuditStrategy.class));
         if (param.getScene().equals(FWH_COLD_START)) {
             strategies.add(ServiceBeanFactory.getBean(HistoryTitleForFwhColdStartStrategy.class));
         } else {

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

@@ -41,6 +41,7 @@ public class LowScoreStrategy implements FilterStrategy {
             }
             long publishCount = content.getHisPublishArticleList().stream().filter(ContentHisPublishArticle::isInnerAccount).count();
             if (publishCount == 0) {
+                filterResult.getContentIds().add(content.getId());
                 continue;
             }
             int hisViewCount = content.getHisPublishArticleList().stream().filter(ContentHisPublishArticle::isInnerAccount)

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

@@ -0,0 +1,59 @@
+package com.tzld.longarticle.recommend.server.service.recommend.filter.strategy;
+
+import com.tzld.longarticle.recommend.server.common.enums.aigc.PublishPlanInputSourceTypesEnum;
+import com.tzld.longarticle.recommend.server.model.dto.Content;
+import com.tzld.longarticle.recommend.server.model.entity.longArticle.PublishSingleVideoSource;
+import com.tzld.longarticle.recommend.server.repository.longArticle.PublishSingleVideoSourceRepository;
+import com.tzld.longarticle.recommend.server.service.recommend.filter.FilterParam;
+import com.tzld.longarticle.recommend.server.service.recommend.filter.FilterResult;
+import com.tzld.longarticle.recommend.server.service.recommend.filter.FilterStrategy;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+@Component
+@Slf4j
+public class VideoPoolBadAuditStrategy implements FilterStrategy {
+
+    @Autowired
+    private PublishSingleVideoSourceRepository publishSingleVideoSourceRepository;
+
+    @Override
+    public FilterResult filter(FilterParam param) {
+        FilterResult filterResult = new FilterResult();
+        List<String> result = new ArrayList<>(param.getContents().size());
+        List<Content> filterContents = new ArrayList<>();
+        List<String> videoPoolContentSourceIds = param.getContents().stream().map(Content::getSourceId).collect(Collectors.toList());
+        List<PublishSingleVideoSource> videoPoolList = publishSingleVideoSourceRepository.getByContentTraceIdIn(videoPoolContentSourceIds);
+        Map<String, PublishSingleVideoSource> videoPoolMap = videoPoolList.stream().collect(Collectors.toMap(PublishSingleVideoSource::getContentTraceId, o -> o));
+        for (Content content : param.getContents()) {
+            if (!PublishPlanInputSourceTypesEnum.longArticleVideoPoolSource.getVal().equals(content.getSourceType())) {
+                result.add(content.getId());
+                continue;
+            }
+            PublishSingleVideoSource videoPool = videoPoolMap.get(content.getSourceId());
+            if (Objects.isNull(videoPool)) {
+                content.setFilterReason("视频内容池不存在");
+                filterContents.add(content);
+            } else if (videoPool.getBadStatus() != 0) {
+                content.setFilterReason("视频内容池已退场");
+                filterContents.add(content);
+            } else if (videoPool.getAuditStatus() != 1) {
+                content.setFilterReason("视频内容池审核不通过");
+                filterContents.add(content);
+            } else {
+                result.add(content.getId());
+            }
+        }
+        filterResult.setContentIds(result);
+        filterResult.setFilterContent(filterContents);
+        return filterResult;
+    }
+
+}

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/web/ControllerAspect.java

@@ -20,7 +20,7 @@ import java.util.concurrent.TimeUnit;
 @Slf4j
 public class ControllerAspect {
 
-    @Around("execution(* com.tzld.longarticle.recommend.server.web.*Controller.*(..))")
+    @Around("execution(* com.tzld.longarticle.recommend.server.web..*Controller.*(..))")
     public Object around(ProceedingJoinPoint pjp) throws Throwable {
         TraceUtils.setMDC();