Merge branch 'master' into dev-xym-settings

long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/impl/ContentServiceImpl.java

@@ -218,14 +218,14 @@ public class ContentServiceImpl implements ContentService {
     public List<VideoDetail> getPublishVideoDetail(PublishContent publishContent, PlanAccount planAccount, MatchVideo matchVideo) {
         List<CrawlerVideo> contentMiniVideos = getContentMiniVideo(publishContent, planAccount);
         log.info("getPublishVideoDetail contentMiniVideos={}", contentMiniVideos);
-        if (contentMiniVideos.size() < 2) {
-            publicContentService.delPublishContent(publishContent);
+        if (CollectionUtils.isEmpty(contentMiniVideos)) {
+            LarkRobotUtil.sendMessage("文章获取小程序为空 publishContent.getSourceId=" + publishContent.getSourceId());
             return new ArrayList<>();
         }
         List<VideoDetail> videoDetails = publishVideo(contentMiniVideos, matchVideo);
         log.info("getPublishVideoDetail videoDetails={}", videoDetails);
-        if (videoDetails.size() < 2) {
-            publicContentService.delPublishContent(publishContent);
+        if (CollectionUtils.isEmpty(videoDetails)) {
+            LarkRobotUtil.sendMessage("发布后小程序为空 publishContent.getSourceId=" + publishContent.getSourceId());
             return new ArrayList<>();
         }
         return videoDetails;
@@ -289,27 +289,9 @@ public class ContentServiceImpl implements ContentService {
             example.setOrderByClause("score desc");
             example.createCriteria().andDownloadStatusEqualTo(2).andContentIdEqualTo(publishContent.getSourceId());
             List<CrawlerVideo> crawlerVideoList = crawlerVideoMapper.selectByExample(example);
-            List<CrawlerVideo> videoList;
-            switch (publishContent.getContentPoolType()) {
-                case "autoArticlePoolLevel4":
-                    // 冷启层，全量做
-                    videoList = shuffleList(crawlerVideoList).subList(0, Math.min(crawlerVideoList.size(), 3));
-                    break;
-                case "autoArticlePoolLevel3":
-                    //次条，只针对具体账号做
-                    if (ghIdMap.containsKey(planAccount.getGhId())) {
-                        videoList = shuffleList(crawlerVideoList).subList(0, Math.min(crawlerVideoList.size(), 3));
-                    } else {
-                        videoList = crawlerVideoList.subList(0, Math.min(crawlerVideoList.size(), 3));
-                    }
-                    break;
-                case "autoArticlePoolLevel1":
-                    // 头条，先不做
-                    videoList = crawlerVideoList.subList(0, Math.min(crawlerVideoList.size(), 3));
-                    break;
-                default:
-                    videoList = crawlerVideoList.subList(0, Math.min(crawlerVideoList.size(), 3));
-                    break;
+            List<CrawlerVideo> videoList = new ArrayList<>();
+            if (!CollectionUtils.isEmpty(crawlerVideoList)) {
+                videoList.add(crawlerVideoList.get(0));
             }
             log.info("getContentMiniVideo videoList={}", videoList);
             return videoList;
@@ -319,11 +301,4 @@ public class ContentServiceImpl implements ContentService {
         return new ArrayList<>();
     }
 
-    private <T> List<T> shuffleList(List<T> oriList) {
-        // 使用 ArrayList 创建副本
-        List<T> shuffledList = new ArrayList<>(oriList);
-        Collections.shuffle(shuffledList); // 随机打乱列表
-        return shuffledList;
-    }
-
 }

long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/impl/CoreServiceImpl.java

@@ -622,6 +622,9 @@ public class CoreServiceImpl implements CoreService {
                 if (Objects.equals(publishContent.getSourceType(), SourceTypesEnum.longArticleVideoPoolSource.getVal())) {
                     List<VideoDetail> videoDetails = contentService.getOnlyMiniPublishVideoDetail(publishContent);
                     log.info("publishContentId={}, videoDetails={}", publishContent.getId(), videoDetails);
+                    if (CollectionUtils.isEmpty(videoDetails)) {
+                        continue;
+                    }
                     publishMiniprogramList = getPublishMiniprogramList(videoDetails, planAccount, publishContent);
                     if (CollectionUtils.isEmpty(publishMiniprogramList)) {
                         continue;
@@ -633,8 +636,11 @@ public class CoreServiceImpl implements CoreService {
                     }
                     List<VideoDetail> videoDetails = contentService.getPublishVideoDetail(publishContent, planAccount, matchVideo);
                     log.info("publishContentId={}, videoDetails={}", publishContent.getId(), videoDetails);
+                    if (CollectionUtils.isEmpty(videoDetails)) {
+                        continue;
+                    }
                     publishMiniprogramList = getPublishMiniprogramList(videoDetails, planAccount, publishContent);
-                    if (CollectionUtils.isEmpty(publishMiniprogramList) || publishMiniprogramList.size() < 2) {
+                    if (CollectionUtils.isEmpty(publishMiniprogramList)) {
                         continue;
                     }
                     contentService.updateMatchContent(publishContent, publishMiniprogramList, matchVideo);
@@ -669,11 +675,11 @@ public class CoreServiceImpl implements CoreService {
         if (CollectionUtils.isEmpty(publishMiniprogramList)) {
             return null;
         }
-        if (!Objects.equals(publishContent.getSourceType(), SourceTypesEnum.longArticleVideoPoolSource.getVal())) {
-            if (publishMiniprogramList.size() < 2) {
-                return null;
-            }
-        }
+//        if (!Objects.equals(publishContent.getSourceType(), SourceTypesEnum.longArticleVideoPoolSource.getVal())) {
+//            if (publishMiniprogramList.size() < 2) {
+//                return null;
+//            }
+//        }
         for (PublishMiniprogram publishMiniprogram : publishMiniprogramList) {
             //插入rootSource
             rootSourceService.addRootSource(publishMiniprogram, planAccount, publishContent);

long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/impl/PublicContentServiceImpl.java

@@ -85,17 +85,6 @@ public class PublicContentServiceImpl {
         publishContentMapper.updateByPrimaryKeySelective(publishContent);
     }
 
-    public void delPublishContent(PublishContent publishContent) {
-        log.info("delPublishContent publishContent={}", publishContent);
-        MatchMiniprogramStatusParam statusParam = new MatchMiniprogramStatusParam();
-        statusParam.setStatus(3);
-        statusParam.setPublishContentId(publishContent.getPublishContentId());
-        statusParam.setErrorMsg("小程序视频数量不足");
-        aigcService.updateMatchMiniprogramStatus(statusParam);
-        //更新为失败
-        updatePublishContentStatus(3, publishContent.getId(), "小程序数量不足");
-    }
-
     public void updatePublishContentStatus(Integer status, Long publishContentId, String reason) {
         PublishContent publishContent = new PublishContent();
         publishContent.setStatus(status);