Merge branch 'dev-xym-update-cover' of Server/long-article-manage into master

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

@@ -316,6 +316,8 @@ public class ContentServiceImpl implements ContentService {
             example.createCriteria().andContentIdEqualTo(sourceId).andStatusEqualTo(1);
             List<AIVideoAbTest> aiVideoAbTests = aiVideoAbTestMapper.selectByExample(example);
             if (!CollectionUtils.isEmpty(aiVideoAbTests)) {
+                LongArticlesText kimiText = kimiService.getKimiText(sourceId);
+                String title = kimiText.getKimiTitle();
                 List<AIVideoAbTest> abTestList = new ArrayList<>();
                 AIVideoAbTest aiVideoAbTest = aiVideoAbTests.get(0);
                 abTestList.add(aiVideoAbTest);
@@ -325,9 +327,17 @@ public class ContentServiceImpl implements ContentService {
                     BeanUtils.copyProperties(aiVideoAbTest, newAiVideoAbTest);
                     abTestList.add(newAiVideoAbTest);
                 }
-                for (AIVideoAbTest aiVideoAbTest1 : abTestList) {
-                    LongArticlesText kimiText = kimiService.getKimiText(sourceId);
-                    String title = kimiText.getKimiTitle();
+                for (int i = 0; i < abTestList.size(); i++) {
+                    String videoCover;
+                    CrawlerVideo crawlerVideo = contentMiniVideos.get(i);
+                    PublishMiniprogram publishMiniprograms = publicContentService.getPublishMiniprograms(crawlerVideo.getId());
+                    if (publishMiniprograms != null) {
+                        videoCover = publishMiniprograms.getVideoCover();
+                    } else {
+                        VideoDetail videoDetail = videoService.publish(crawlerVideo.getVideoOssPath(), crawlerVideo.getUserId(), title);
+                        videoCover = videoDetail.getCoverImgPath();
+                    }
+                    AIVideoAbTest aiVideoAbTest1 = abTestList.get(i);
                     VideoDetail videoDetail = videoService.publish(aiVideoAbTest1.getVideoOssPath(), SINGLE_VIDEO_UID, title);
                     videoDetail.setCrawlerVideoId(aiVideoAbTest1.getId());
                     videoDetail.setKimiTitle(title);
@@ -335,6 +345,7 @@ public class ContentServiceImpl implements ContentService {
                     videoDetail.setVideoOss(aiVideoAbTest1.getVideoOssPath());
                     videoDetail.setSource("ai");
                     videoDetail.setTraceId(matchVideo.getTraceId());
+                    videoDetail.setCoverImgPath(videoCover);
                     videoDetails.add(videoDetail);
                 }
                 aiLogEvent(1, matchVideo.getGhId(), sourceId, DateUtil.getThatDayDateString());

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

@@ -6,6 +6,7 @@ import com.tzld.piaoquan.longarticle.model.dto.PublishArticleData;
 import com.tzld.piaoquan.longarticle.model.po.longarticle.*;
 import com.tzld.piaoquan.longarticle.service.remote.AigcService;
 import com.tzld.piaoquan.longarticle.utils.DateUtil;
+import com.tzld.piaoquan.longarticle.utils.page.Page;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -74,6 +75,18 @@ public class PublicContentServiceImpl {
         return publishMiniprograms;
     }
 
+    public PublishMiniprogram getPublishMiniprograms(Integer crawlerId) {
+        PublishMiniprogramExample publishMiniprogramExample = new PublishMiniprogramExample();
+        publishMiniprogramExample.createCriteria().andCrawlerVideoIdEqualTo(crawlerId);
+        publishMiniprogramExample.setPage(new Page<>(1, 1));
+        publishMiniprogramExample.setOrderByClause("create_time desc");
+        List<PublishMiniprogram> publishMiniprograms = publishMiniprogramMapper.selectByExample(publishMiniprogramExample);
+        if (!CollectionUtils.isEmpty(publishMiniprograms)) {
+            return publishMiniprograms.get(0);
+        }
+        return null;
+    }
+
     public void updatePublishContentTraceId(String traceId, Long publishContentId) {
         if (StringUtils.isEmpty(traceId)) {
             return;