Merge branch 'wyp/0310-fix' of Server/long-article-recommend into master

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

@@ -2098,15 +2098,18 @@ public class DataDashboardService {
         Map<String, List<LongArticleCrawlerVideo>> crawlerVideoMap = crawlerVideoList.stream()
                 .collect(Collectors.groupingBy(LongArticleCrawlerVideo::getContentId));
         List<String> contentIds = auditList.stream().map(LongArticleTitleAudit::getContentId).collect(Collectors.toList());
-        List<ContentPoolTypeDTO> poolTypeDTOS = aigcBaseMapper.getContentPoolType(contentIds);
+        List<ContentPoolTypeDTO> poolTypeDTOS = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(contentIds)) {
+            poolTypeDTOS = aigcBaseMapper.getContentPoolType(contentIds);
+        }
         Map<String, ContentPoolTypeDTO> poolTypeMap = poolTypeDTOS.stream().collect(Collectors.toMap(ContentPoolTypeDTO::getContentId, o -> o));
         Map<String, VideoAuditExport> map = new HashMap<>();
-        waitingAuditPoolTypeMap.keySet().forEach(key -> {
+        for (ContentPoolEnum contentPool : ContentPoolEnum.values()) {
             VideoAuditExport videoAuditExport = new VideoAuditExport();
             videoAuditExport.setDateStr(dateStr);
-            videoAuditExport.setPoolType(key);
-            map.put(key, videoAuditExport);
-        });
+            videoAuditExport.setPoolType(contentPool.getContentPool());
+            map.put(contentPool.getContentPool(), videoAuditExport);
+        }
         List<PublishSingleVideoSource> videoPoolAuditList = videoPoolRepository.getByVideoPoolAuditTimestampBetween(
                 timestamp, timestamp + 86400000);
         Map<Integer, List<PublishSingleVideoSource>> videoPoolAuditMap = videoPoolAuditList.stream()
@@ -2468,7 +2471,8 @@ public class DataDashboardService {
             result.add(item);
         }
         // 视频
-        List<VideoPoolPlatformEnum> videoPoolType = Arrays.asList(VideoPoolPlatformEnum.GZH, VideoPoolPlatformEnum.HkSP, VideoPoolPlatformEnum.SPH);
+        List<VideoPoolPlatformEnum> videoPoolType = Arrays.asList(VideoPoolPlatformEnum.GZH, VideoPoolPlatformEnum.HkSP,
+                VideoPoolPlatformEnum.SPH, VideoPoolPlatformEnum.TOUTIAO);
         for (VideoPoolPlatformEnum videoType : videoPoolType) {
             List<PublishSingleVideoSource> videoPoolCrawlerCount = videoPoolRepository.getByCrawlerTimestampBetweenAndPlatformAndBadStatus(
                     start / 1000, end / 1000, videoType.getPlatform(), ArticleVideoBadStatusEnum.TITLE_DEFAULT_STATUS.getCode());