Explorar o código

feat: 完善接口

WANGKANG hai 10 meses
pai
achega
78228a0698

+ 3 - 3
taais-modules/taais-biz/src/main/java/com/taais/biz/controller/VideoStableController.java

@@ -42,9 +42,9 @@ public class VideoStableController extends BaseController {
         return videoStableService.getResult(videoStableStartResultBo);
     }
 
-    @PostMapping("/start")
-    public CommonResult start(@Valid @RequestBody VideoStableStartBo videoStableStartBo) {
-        return videoStableService.start(videoStableStartBo);
+    @GetMapping("/start/{id}")
+    public CommonResult start(@PathVariable("id") Long id) {
+        return videoStableService.start(id);
     }
 
     /**

+ 7 - 7
taais-modules/taais-biz/src/main/java/com/taais/biz/domain/VideoStable.java

@@ -87,17 +87,17 @@ public class VideoStable extends BaseEntity {
 
 
     @Builder.Default
-    int block_size = 50;
+    private Integer  block_size = 50;
     @Builder.Default
-    int radius = 500;
+    private Integer  radius = 500;
     @Builder.Default
-    int buffer_size = 200;
+    private Integer  buffer_size = 200;
     @Builder.Default
-    double cornerquality = 0.2;
+    private Double cornerquality = 0.2;
     @Builder.Default
-    int cornerminDistance = 5;
+    private Integer  cornerminDistance = 5;
     @Builder.Default
-    int lklevel = 3;
+    private Integer  lklevel = 3;
     @Builder.Default
-    int lkwinSiz = 15;
+    private Integer  lkwinSiz = 15;
 }

+ 13 - 20
taais-modules/taais-biz/src/main/java/com/taais/biz/domain/bo/VideoStableBo.java

@@ -2,9 +2,7 @@ package com.taais.biz.domain.bo;
 
 import com.taais.biz.domain.VideoStable;
 import io.github.linpeilie.annotations.AutoMapper;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import lombok.*;
 import jakarta.validation.constraints.*;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -20,23 +18,23 @@ import com.taais.common.orm.core.domain.BaseEntity;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = VideoStable.class, reverseConvertGenerate = false)
+@AllArgsConstructor
+@NoArgsConstructor
 public class VideoStableBo extends BaseEntity{
     /**
      * 主键ID
      */
-    @NotNull(message = "主键ID不能为空")
     private Long id;
 
     /**
      * 视频名称
      */
-    @NotBlank(message = "视频名称不能为空")
+    @NotBlank(message = "任务名称不能为空")
     private String name;
 
     /**
      * 任务状态 0未开始 1进行中 2已结束
      */
-    @NotBlank(message = "任务状态 0未开始 1进行中 2已结束不能为空")
     private String status;
 
     /**
@@ -54,47 +52,42 @@ public class VideoStableBo extends BaseEntity{
     /**
      * 开始时间
      */
-    @NotNull(message = "开始时间不能为空")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date startTime;
 
     /**
      * 结束时间
      */
-    @NotNull(message = "结束时间不能为空")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date endTime;
 
     /**
      * 耗时
      */
-    @NotNull(message = "耗时不能为空")
     private Long costSecond;
 
     /**
      * 日志
      */
-    @NotBlank(message = "日志不能为空")
     private String log;
 
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空")
     private String remarks;
 
     @Builder.Default
-    int block_size = 50;
+    private Integer  block_size = 50;
     @Builder.Default
-    int radius = 500;
+    private Integer  radius = 500;
     @Builder.Default
-    int buffer_size = 200;
+    private Integer  buffer_size = 200;
     @Builder.Default
-    double cornerquality = 0.2;
+    private Double cornerquality = 0.2;
     @Builder.Default
-    int cornerminDistance = 5;
+    private Integer  cornerminDistance = 5;
     @Builder.Default
-    int lklevel = 3;
+    private Integer  lklevel = 3;
     @Builder.Default
-    int lkwinSiz = 15;
+    private Integer  lkwinSiz = 15;
 }

+ 8 - 9
taais-modules/taais-biz/src/main/java/com/taais/biz/domain/bo/VideoStableStartBo.java

@@ -1,7 +1,6 @@
 package com.taais.biz.domain.bo;
 
-import com.taais.biz.domain.Video2image;
-import io.github.linpeilie.annotations.AutoMapper;
+
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
 
@@ -26,17 +25,17 @@ public class VideoStableStartBo {
     String out_path;
 
     @Builder.Default
-    int block_size = 50;
+    private Integer  block_size = 50;
     @Builder.Default
-    int radius = 500;
+    private Integer  radius = 500;
     @Builder.Default
-    int buffer_size = 200;
+    private Integer  buffer_size = 200;
     @Builder.Default
-    double cornerquality = 0.2;
+    private Double cornerquality = 0.2;
     @Builder.Default
-    int cornerminDistance = 5;
+    private Integer  cornerminDistance = 5;
     @Builder.Default
-    int lklevel = 3;
+    private Integer  lklevel = 3;
     @Builder.Default
-    int lkwinSiz = 15;
+    private Integer  lkwinSiz = 15;
 }

+ 1 - 1
taais-modules/taais-biz/src/main/java/com/taais/biz/domain/vo/VideoStableImportVo.java

@@ -33,7 +33,7 @@ public class VideoStableImportVo implements Serializable
 
      /** 输入图片集路径 */
     @ExcelProperty(value = "输入图片集路径")
-    private String inputPath;
+    private String inPath;
 
      /** 去抖动的图片集路径 */
     @ExcelProperty(value = "去抖动的图片集路径")

+ 1 - 1
taais-modules/taais-biz/src/main/java/com/taais/biz/domain/vo/VideoStableVo.java

@@ -40,7 +40,7 @@ private static final long serialVersionUID = 1L;
 
     /** 输入图片集路径 */
     @ExcelProperty(value = "输入图片集路径")
-    private String inputPath;
+    private String inPath;
 
     /** 去抖动的图片集路径 */
     @ExcelProperty(value = "去抖动的图片集路径")

+ 1 - 1
taais-modules/taais-biz/src/main/java/com/taais/biz/service/IVideoStableService.java

@@ -66,7 +66,7 @@ public interface IVideoStableService extends IBaseService<VideoStable> {
      */
     boolean deleteByIds(Long[] ids);
 
-    CommonResult start(VideoStableStartBo videoStableStartBo);
+    CommonResult start(Long id);
 
     CommonResult getResult(VideoStableStartResultBo videoStableStartResultBo);
 }

+ 10 - 23
taais-modules/taais-biz/src/main/java/com/taais/biz/service/impl/VideoStableServiceImpl.java

@@ -62,8 +62,6 @@ public class VideoStableServiceImpl extends BaseServiceImpl<VideoStableMapper, V
         QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
         queryWrapper.and(VIDEO_STABLE.NAME.like
             (videoStableBo.getName()));
-        queryWrapper.and(VIDEO_STABLE.STATUS.eq
-            (videoStableBo.getStatus()));
         queryWrapper.and(VIDEO_STABLE.IN_PATH.eq
             (videoStableBo.getInPath()));
         queryWrapper.and(VIDEO_STABLE.OUT_PATH.eq
@@ -128,6 +126,7 @@ public class VideoStableServiceImpl extends BaseServiceImpl<VideoStableMapper, V
     @Override
     public boolean insert(VideoStableBo videoStableBo) {
         VideoStable videoStable = MapstructUtils.convert(videoStableBo, VideoStable.class);
+        videoStable.setStatus(BizConstant.VideoStatus.NOT_START);
 
         return this.save(videoStable);// 使用全局配置的雪花算法主键生成器生成ID值
     }
@@ -161,22 +160,8 @@ public class VideoStableServiceImpl extends BaseServiceImpl<VideoStableMapper, V
     }
 
     @Override
-    public CommonResult start(VideoStableStartBo videoStableStartBo) {
-        VideoStable videoStable = new VideoStable();
-        videoStable.setInPath(videoStableStartBo.getIn_path());
-        videoStable.setOutPath(videoStableStartBo.getOut_path());
-        videoStable.setBlock_size(videoStableStartBo.getBlock_size());
-        videoStable.setRadius(videoStable.getRadius());
-        videoStable.setBuffer_size(videoStableStartBo.getBuffer_size());
-        videoStable.setCornerquality(videoStable.getCornerquality());
-        videoStable.setCornerminDistance(videoStable.getCornerminDistance());
-        videoStable.setLklevel(videoStable.getLklevel());
-        videoStable.setLkwinSiz(videoStable.getLkwinSiz());
-
-        videoStable.setStatus(BizConstant.VideoStatus.RUNNING);
-
-        save(videoStable);
-        System.out.println(videoStable.getId());
+    public CommonResult start(Long id) {
+        VideoStable videoStable = getById(id);
 
         log.info("start video_stable_url: {}", video_stable_url);
         try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
@@ -186,11 +171,13 @@ public class VideoStableServiceImpl extends BaseServiceImpl<VideoStableMapper, V
             StringEntity entity = new StringEntity(JsonUtils.toJsonString(videoStable), "UTF-8");
             entity.setContentType("application/json");
             request.setEntity(entity);
-            try (CloseableHttpResponse response = httpClient.execute(request)) {
-                String responseBody = EntityUtils.toString(response.getEntity());
-                System.out.println(responseBody);
-                return CommonResult.success("start video_stable success");
-            }
+            CloseableHttpResponse response = httpClient.execute(request);
+            String responseBody = EntityUtils.toString(response.getEntity());
+            System.out.println(responseBody);
+
+            videoStable.setStatus(BizConstant.VideoStatus.RUNNING);
+            updateById(videoStable);
+            return CommonResult.success("start video_stable success");
         } catch (Exception e) {
             videoStable.setStatus(BizConstant.VideoStatus.FAILED);
             updateById(videoStable);