update VideoPostService#publishVideoFile

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/controller/VideoPostController.java

@@ -39,9 +39,9 @@ public class VideoPostController {
     @AuthUser
     @Operation(summary = "发布视频文件", description = "N")
     @PostMapping("/publish/file")
-    public String addVideoFile(@RequestBody @Validated VideoFilePublish videoFilePublish) {
-        Result result = videoPostService.publishVideoFile(videoFilePublish);
-        return WebResult.result(result);
+    public String addVideoFile(@RequestBody @Validated VideoFilePublish videoFilePublish) throws Exception {
+        String videoId = videoPostService.publishVideoFile(videoFilePublish);
+        return WebResult.success(videoId);
     }
 
     @AuthUser

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/service/VideoPostService.java

@@ -13,7 +13,7 @@ import cn.reghao.tnb.content.app.vod.model.po.VideoStatistic;
  * @date 2023-10-08 15:34:48
  */
 public interface VideoPostService {
-    Result publishVideoFile(VideoFilePublish videoFilePublish);
+    String publishVideoFile(VideoFilePublish videoFilePublish) throws Exception;
     Result publishVideoPost(VideoPublishSbt videoPublishSbt);
     void saveVideo(VideoPost videoPost, VideoStatistic videoStatistic, String tags);
     void updateVideoScope(VideoScopeUpdate videoScopeUpdate);

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/service/impl/VideoPostServiceImpl.java

@@ -64,34 +64,26 @@ public class VideoPostServiceImpl implements VideoPostService {
         this.videoCategoryPostMapper = videoCategoryPostMapper;
     }
 
-    public Result publishVideoFile(VideoFilePublish videoFilePublish) {
+    public String publishVideoFile(VideoFilePublish videoFilePublish) throws Exception {
         String title = videoFilePublish.getFilename();
         String videoFileId = videoFilePublish.getVideoFileId();
         int channelCode = videoFilePublish.getChannelCode();
-        Result result;
-        try {
-            VideoInfo videoInfo = ossService.getVideoInfo(channelCode, videoFileId);
-            if (!videoInfo.getFormatName().contains("mov,mp4")) {
-                long jobId = jobService.addConvertVideoJob(videoFileId, channelCode);
+        VideoInfo videoInfo = ossService.getVideoInfo(channelCode, videoFileId);
+        if (!videoInfo.getFormatName().contains("mov,mp4")) {
+            long jobId = jobService.addConvertVideoJob(videoFileId, channelCode);
                 /*Result result1 = fileService.convertVideo(videoFileId, channelCode);
                 if (result1.getCode() == ResultStatus.SUCCESS.getCode()) {
                     videoPost.setStatus(VideoStatus.converted.getCode());
                 } else {
                     log.error(result1.getMsg());
                 }*/
-            }
-
-            String videoId = idGenerator.getUuid();
-            VideoFile videoFile = new VideoFile(videoId, videoInfo, channelCode);
-            VideoPost videoPost = new VideoPost(videoId, title, videoFile);
-            videoRepository.saveVideo(videoFile, videoPost);
-            result = Result.success(videoId);
-        } catch (Exception e) {
-            String errMsg = String.format("视频文件 %s 在 oss 中不存在", videoFileId);
-            result = Result.fail(errMsg);
         }
 
-        return result;
+        String videoId = idGenerator.getUuid();
+        VideoFile videoFile = new VideoFile(videoId, videoInfo, channelCode);
+        VideoPost videoPost = new VideoPost(videoId, title, videoFile);
+        videoRepository.saveVideo(videoFile, videoPost);
+        return videoId;
     }
 
     public Result publishVideoPost(VideoPublishSbt videoPublishSbt) {