添加一个接收不包含视频文件的 VideoFileSbt 对象的临时接口

src/main/java/cn/reghao/dfs/store/controller/MediaUploadController.java

@@ -12,10 +12,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.MediaType;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.constraints.NotNull;
@@ -103,4 +100,12 @@ public class MediaUploadController {
         VideoFile videoFile = videoService.process(filePartRet.getFileId(), pathUrl);
         return WebBody.success(new VideoFileRet(uploadId, videoFile));
     }
+
+    @ApiOperation(value = "上传视频分片文件")
+    @PostMapping(value = "/video1", produces = MediaType.APPLICATION_JSON_VALUE)
+    @Deprecated
+    public String uploadVideoFile1(@RequestBody @Validated VideoFileSbt videoFileSbt) {
+        VideoFile videoFile = videoService.process1(videoFileSbt);
+        return WebBody.success(new VideoFileRet("uploadId", videoFile));
+    }
 }

src/main/java/cn/reghao/dfs/store/controller/SpiderFileController.java

@@ -1,55 +0,0 @@
-package cn.reghao.dfs.store.controller;
-
-import cn.reghao.dfs.store.model.dto.UploadingFile;
-import cn.reghao.dfs.store.service.FileUploadService;
-import cn.reghao.jutil.jdk.result.WebBody;
-import cn.reghao.dfs.store.db.mapper.FileUserMapper;
-import cn.reghao.dfs.store.model.dto.UploadedFile;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.validation.constraints.NotNull;
-import java.io.InputStream;
-import java.util.Objects;
-
-/**
- * @author reghao
- * @date 2020-03-11 16:10:16
- */
-@Slf4j
-@RestController
-@RequestMapping("/api/file/upload/spider")
-@Deprecated
-public class SpiderFileController {
-    private final FileUploadService fileUploadService;
-    private final FileUserMapper fileUserMapper;
-
-    public SpiderFileController(FileUploadService fileUploadService, FileUserMapper fileUserMapper) {
-        this.fileUploadService = fileUploadService;
-        this.fileUserMapper = fileUserMapper;
-    }
-
-    @ApiOperation(value = "上传文件")
-    @PostMapping(value = "/file", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String uploadFile(@NotNull MultipartFile file, String username) throws Exception {
-        String filename = file.getOriginalFilename();
-        long size = file.getSize();
-        String contentType = Objects.requireNonNull(file.getContentType());
-        InputStream inputStream = file.getInputStream();
-
-        if (contentType.startsWith("image") || contentType.startsWith("video")) {
-            String userId = fileUserMapper.findUserIdByUsername(username);
-            if (userId == null) {
-                return WebBody.failWithMsg(username + " 不存在");
-            }
-
-            UploadingFile uploadingFile = new UploadingFile(filename, size, contentType, inputStream);
-            UploadedFile uploadedFile = fileUploadService.put(uploadingFile/*, userId*/);
-            return WebBody.success(uploadedFile);
-        }
-        return WebBody.failWithMsg("content-type 错误");
-    }
-}

src/main/java/cn/reghao/dfs/store/model/dto/VideoFileSbt.java

@@ -0,0 +1,28 @@
+package cn.reghao.dfs.store.model.dto;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * 视频文件
+ *
+ * @author reghao
+ * @date 2021-11-22 10:21:15
+ */
+@NoArgsConstructor
+@Getter
+public class VideoFileSbt {
+    @NotBlank
+    private String videoFileId;
+    @NotNull
+    private Boolean horizontal;
+    @NotNull
+    private Integer duration;
+    @NotBlank
+    private String coverUrl;
+    @NotBlank
+    private String coverUrlOriginal;
+}

src/main/java/cn/reghao/dfs/store/model/po/VideoFile.java

@@ -1,5 +1,6 @@
 package cn.reghao.dfs.store.model.po;
 
+import cn.reghao.dfs.store.model.dto.VideoFileSbt;
 import cn.reghao.jutil.jdk.db.BaseObject;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -25,4 +26,13 @@ public class VideoFile extends BaseObject<Integer> {
     public VideoFile(String videoFileId) {
         this.videoFileId = videoFileId;
     }
+
+    @Deprecated
+    public VideoFile(VideoFileSbt videoFileSbt) {
+        this.videoFileId = videoFileSbt.getVideoFileId();
+        this.horizontal = videoFileSbt.getHorizontal();
+        this.duration = videoFileSbt.getDuration();
+        this.coverUrl = videoFileSbt.getCoverUrl();
+        this.coverUrlOriginal = videoFileSbt.getCoverUrlOriginal();
+    }
 }

src/main/java/cn/reghao/dfs/store/service/media/VideoFileService.java

@@ -3,6 +3,7 @@ package cn.reghao.dfs.store.service.media;
 import cn.reghao.dfs.store.db.mapper.VideoUrlMapper;
 import cn.reghao.dfs.store.model.constant.VideoUrlType;
 import cn.reghao.dfs.store.model.dto.UploadingFile;
+import cn.reghao.dfs.store.model.dto.VideoFileSbt;
 import cn.reghao.dfs.store.model.po.ImageFile;
 import cn.reghao.dfs.store.model.po.ImageUrl;
 import cn.reghao.dfs.store.model.po.VideoUrl;
@@ -67,6 +68,14 @@ public class VideoFileService {
         return videoFile;
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    @Deprecated
+    public VideoFile process1(VideoFileSbt videoFileSbt) {
+        VideoFile videoFile = new VideoFile(videoFileSbt);
+        videoFileMapper.save(videoFile);
+        return videoFile;
+    }
+
     /**
      * 设置视频属性
      *