Merge branch 'wyp/0305-dataFix' of Server/long-article-recommend into master

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/repository/longArticle/PublishSingleVideoSourceRepository.java

@@ -18,7 +18,7 @@ public interface PublishSingleVideoSourceRepository extends JpaRepository<Publis
 
     List<PublishSingleVideoSource> getByCrawlerTimestampBetween(Long start, Long end);
 
-    List<PublishSingleVideoSource> getByCrawlerTimestampBetweenAndPlatform(Long start, Long end, String platform);
+    List<PublishSingleVideoSource> getByCrawlerTimestampBetweenAndPlatformAndBadStatus(Long start, Long end, String platform, Integer badStatus);
 
     List<PublishSingleVideoSource> getByAuditTimestampBetween(Long start, Long end);
 

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

@@ -11,6 +11,7 @@ import com.tzld.longarticle.recommend.server.common.enums.aigc.ChannelEnum;
 import com.tzld.longarticle.recommend.server.common.enums.aigc.ProduceContentAuditStatusEnum;
 import com.tzld.longarticle.recommend.server.common.enums.aigc.PublishPlanInputSourceTypesEnum;
 import com.tzld.longarticle.recommend.server.common.enums.longArticle.ArticleVideoAuditStatusEnum;
+import com.tzld.longarticle.recommend.server.common.enums.longArticle.ArticleVideoBadStatusEnum;
 import com.tzld.longarticle.recommend.server.common.enums.longArticle.VideoPoolPlatformEnum;
 import com.tzld.longarticle.recommend.server.common.enums.recommend.AccountBusinessTypeEnum;
 import com.tzld.longarticle.recommend.server.common.enums.recommend.ArticleTypeEnum;
@@ -2469,8 +2470,8 @@ public class DataDashboardService {
         // 视频
         List<VideoPoolPlatformEnum> videoPoolType = Arrays.asList(VideoPoolPlatformEnum.GZH, VideoPoolPlatformEnum.HkSP, VideoPoolPlatformEnum.SPH);
         for (VideoPoolPlatformEnum videoType : videoPoolType) {
-            List<PublishSingleVideoSource> videoPoolCrawlerCount = videoPoolRepository.getByCrawlerTimestampBetweenAndPlatform(
-                    start / 1000, end / 1000, videoType.getPlatform());
+            List<PublishSingleVideoSource> videoPoolCrawlerCount = videoPoolRepository.getByCrawlerTimestampBetweenAndPlatformAndBadStatus(
+                    start / 1000, end / 1000, videoType.getPlatform(), ArticleVideoBadStatusEnum.TITLE_DEFAULT_STATUS.getCode());
             List<PublishSingleVideoSource> videoPoolPQAuditCount = videoPoolRepository.getByAuditTimestampBetweenAndPlatform(
                     start / 1000, end / 1000, videoType.getPlatform());
             List<PublishSingleVideoSource> videoPoolAuditList = videoPoolRepository.getByVideoPoolAuditTimestampBetweenAndPlatform(

long-article-recommend-service/src/test/java/com/tzld/longarticle/recommend/server/DataDashboardTest.java

@@ -59,7 +59,7 @@ public class DataDashboardTest {
 
     @Test
     public void contentGroupFunnelExport() {
-        List<String> dateStrList = DateUtils.getBeforeDays(null, null, 40);
+        List<String> dateStrList = DateUtils.getBeforeDays(null, null, 7);
         dataDashboardService.contentGroupFunnelExport(dateStrList);
     }