Bläddra i källkod

Merge branch 'dev_lsk_b12' into develop

allen 6 månader sedan
förälder
incheckning
2cb19c6430

+ 0 - 5
taais-modules/taais-biz/src/main/java/com/taais/biz/domain/dto/DataAmplifyDto.java

@@ -21,22 +21,17 @@ import java.util.Map;
 @Accessors(chain = true)
 public class DataAmplifyDto {
 
-    @NotBlank(message = "id不能为空")
     private String id;
 
-    @NotBlank(message = "批次不能为空")
     private String batchNum;
 
-    @NotBlank(message = "任务名称")
     private String taskName;
 
-    @NotBlank(message = "扩充方式不能为空")
     private String augmentationType;
 
     private String inputImagePath;
 
     private String outputImagePath;
 
-    @NotEmpty(message = "扩充算法配置不能为空")
     private List<Map<String, String>> otherParams;
 }

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

@@ -203,6 +203,9 @@ public class VideoStableServiceImpl extends BaseServiceImpl<VideoStableMapper, V
         return this.removeByIds(Arrays.asList(ids));
     }
 
+    @Resource
+    private CommonAlgorithmConfigServiceImpl algorithmConfigService;
+
     @Override
     public CommonResult start(Long id) {
         VideoStable videoStable = getById(id);
@@ -235,7 +238,9 @@ public class VideoStableServiceImpl extends BaseServiceImpl<VideoStableMapper, V
 
         videoStable.setLogPath(videoStable.getOutputPath() + File.separator + getLogFileName(videoStable));
 
-        HttpResponseEntity responseEntity = sendPostMsg(video_stable_start_url, videoStable);
+        String url = algorithmConfigService.getByAlgorithmName("电子稳相").getStartApi();
+
+        HttpResponseEntity responseEntity = sendPostMsg(url, videoStable);
         if (ObjectUtil.isNotNull(responseEntity) && responseEntity.getStatus() == 200) {
             return CommonResult.success("任务开始成功,请等待完成");
         } else {
@@ -329,7 +334,10 @@ public class VideoStableServiceImpl extends BaseServiceImpl<VideoStableMapper, V
         VideoStable videoStable = getById(id);
 
         videoStable.setLogPath(videoStable.getOutputPath() + File.separator + getLogFileName(videoStable));
-        HttpResponseEntity responseEntity = sendPostMsg(video_stable_stop_url, videoStable);
+
+        String url = algorithmConfigService.getByAlgorithmName("电子稳相").getTerminateApi();
+
+        HttpResponseEntity responseEntity = sendPostMsg(url, videoStable);
         if (ObjectUtil.isNotNull(responseEntity) && responseEntity.getStatus() == 200) {
             videoStable.setStatus(BizConstant.VideoStatus.INTERRUPTED);
             updateById(videoStable);