wangyunpeng 3 hafta önce
ebeveyn
işleme
6dfc968162

+ 2 - 2
core/src/main/java/com/tzld/supply/api/SpiderApiService.java

@@ -112,7 +112,7 @@ public class SpiderApiService {
      * @return ContentSearchResponse.DataItem 响应对象
      */
     public List<ContentSearchResponse.DataItem> searchContentImage(String title) {
-        // 搜索内容图片
+        // todo 搜索内容图片
 
         return null;
     }
@@ -123,7 +123,7 @@ public class SpiderApiService {
      * @return ContentSearchResponse.DataItem 响应对象
      */
     public List<ContentSearchResponse.DataItem> searchContentVideo(String title) {
-        // 搜索内容视频
+        // todo 搜索内容视频
 
         return null;
     }

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

@@ -156,6 +156,7 @@ public class ContentMediaSearchJob {
             List<SpiderContentMedia> saveList = new ArrayList<>();
             Long now = System.currentTimeMillis();
             for (ContentSearchResponse.DataItem dataItem : dataItems) {
+                // todo 时长过滤
                 String fileName = String.format("video/%s_%d.mp4", content.getId(), System.currentTimeMillis());
                 String fileUrl = downloadAndSaveInOSS(fileName, dataItem.getUrl(), "video/mp4");
                 if (StringUtils.isBlank(fileUrl)) {

+ 38 - 2
core/src/main/java/com/tzld/supply/job/VideoVoiceGenerateJob.java → core/src/main/java/com/tzld/supply/job/VideoGenerateJob.java

@@ -30,7 +30,7 @@ import java.util.Random;
 
 @Slf4j
 @Component
-public class VideoVoiceGenerateJob {
+public class VideoGenerateJob {
 
     @Autowired
     private SpiderMapperExt spiderMapperExt;
@@ -45,6 +45,11 @@ public class VideoVoiceGenerateJob {
     @Autowired
     private AigcFFmpegApiService ffmpegApiService;
 
+    /**
+     * 生成音频
+     * @param param
+     * @return
+     */
     @XxlJob("videoVoiceGenerateJob")
     public ReturnT<String> videoVoiceGenerateJob(String param) {
         Long startTime = DateUtils.getTodayStart();
@@ -108,4 +113,35 @@ public class VideoVoiceGenerateJob {
         // 音频采样率
         private Integer sampleRate;
     }
-}
+
+    /**
+     * 视频素材生成
+     * 1. 图片转短视频
+     * 2. 视频剪切
+     * @param param
+     * @return
+     */
+    @XxlJob("videoMaterialGenerateJob")
+    public ReturnT<String> videoMaterialGenerateJob(String param) {
+        // image to short video
+        // video cut
+
+        return ReturnT.SUCCESS;
+    }
+
+    /**
+     * 视频生成
+     * 1. 视频素材拼接长视频
+     * 2. 添加音频
+     * @param param
+     * @return
+     */
+    @XxlJob("videoGenerateJob")
+    public ReturnT<String> videoGenerateJob(String param) {
+        // short video to long video
+        // add audio
+
+        return ReturnT.SUCCESS;
+    }
+
+}

+ 2 - 2
server/src/main/java/com/tzld/supply/controller/XxlJobController.java

@@ -20,7 +20,7 @@ public class XxlJobController {
     @Autowired
     private ContentMediaSearchJob contentMediaSearchJob;
     @Autowired
-    private VideoVoiceGenerateJob videoVoiceGenerateJob;
+    private VideoGenerateJob videoGenerateJob;
 
     @GetMapping("/spiderTaskJob")
     public CommonResponse<Void> spiderTaskJob() {
@@ -84,7 +84,7 @@ public class XxlJobController {
 
     @GetMapping("/videoVoiceGenerateJob")
     public CommonResponse<Void> videoVoiceGenerateJob(String dateStr) {
-        videoVoiceGenerateJob.videoVoiceGenerateJob(dateStr);
+        videoGenerateJob.videoVoiceGenerateJob(dateStr);
         return CommonResponse.success();
     }