wangyunpeng 3 giorni fa
parent
commit
4591095f70

+ 0 - 6
core/src/main/java/com/tzld/supply/job/ContentMediaSearchJob.java

@@ -48,9 +48,6 @@ public class ContentMediaSearchJob {
     @XxlJob("contentImageMediaSearchJob")
     public ReturnT<String> contentImageMediaSearchJob(String param) {
         Long startTime = DateUtils.getTodayStart();
-        if (StringUtils.isNotBlank(param)) {
-            startTime = DateUtils.getStartOfDay(param, "yyyyMMdd");
-        }
         Long endTime = startTime + 86400 * 1000;
         List<SpiderContent> contentList = new ArrayList<>();
         if (StringUtils.isNotBlank(param)) {
@@ -149,9 +146,6 @@ public class ContentMediaSearchJob {
     @XxlJob("contentVideoMediaSearchJob")
     public ReturnT<String> contentVideoMediaSearchJob(String param) {
         Long startTime = DateUtils.getTodayStart();
-        if (StringUtils.isNotBlank(param)) {
-            startTime = DateUtils.getStartOfDay(param, "yyyyMMdd");
-        }
         Long endTime = startTime + 86400 * 1000;
         List<SpiderContent> contentList = new ArrayList<>();
         if (StringUtils.isNotBlank(param)) {

+ 6 - 1
core/src/main/java/com/tzld/supply/job/VideoGenerateJob.java

@@ -405,7 +405,12 @@ public class VideoGenerateJob {
      */
     @XxlJob("videoGenerateJob")
     public ReturnT<String> videoGenerateJob(String param) {
-        List<ProduceVideo> produceList = getProcessingVideoList();
+        List<ProduceVideo> produceList = new ArrayList<>();
+        if (StringUtils.isNotBlank(param)) {
+            produceList.add(produceVideoMapper.selectByPrimaryKey(param));
+        } else {
+            produceList = getProcessingVideoList();
+        }
         if (CollectionUtil.isEmpty(produceList)) {
             return ReturnT.SUCCESS;
         }

+ 41 - 0
server/src/test/java/ProduceTest.java

@@ -0,0 +1,41 @@
+import com.tzld.supply.Application;
+import com.tzld.supply.dao.mapper.supply.spider.ProduceVideoMapper;
+import com.tzld.supply.job.ContentMediaSearchJob;
+import com.tzld.supply.job.VideoGenerateJob;
+import com.tzld.supply.model.po.supply.spider.ProduceVideo;
+import com.tzld.supply.model.po.supply.spider.ProduceVideoExample;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import java.util.List;
+
+@SpringBootTest(classes = Application.class)
+@Slf4j
+public class ProduceTest {
+
+    @Autowired
+    private ContentMediaSearchJob contentMediaSearchJob;
+    @Autowired
+    private VideoGenerateJob videoGenerateJob;
+    @Autowired
+    private ProduceVideoMapper produceVideoMapper;
+
+    @Test
+    public void test() {
+        String contentId = "25835";
+        contentMediaSearchJob.contentImageMediaSearchJob(contentId);
+        contentMediaSearchJob.contentVideoMediaSearchJob(contentId);
+        videoGenerateJob.videoVoiceGenerateJob(contentId);
+        ProduceVideoExample example = new ProduceVideoExample();
+        example.createCriteria().andContentIdEqualTo(Long.valueOf(contentId));
+        List<ProduceVideo> produceVideoList = produceVideoMapper.selectByExample(example);
+        if (produceVideoList.isEmpty()) {
+            return;
+        }
+        ProduceVideo produceVideo = produceVideoList.get(0);
+        videoGenerateJob.videoMaterialGenerateJob(produceVideo.getId());
+        videoGenerateJob.videoGenerateJob(produceVideo.getId());
+    }
+}