Browse Source

fix:param transmission

unknown 10 months ago
parent
commit
1a1134a75b

+ 2 - 2
taais-admin/src/main/resources/application-dev.yml

@@ -15,9 +15,9 @@ spring:
       # 校验超时时间
       validationTimeout: 5000
       # 空闲连接存活最大时间,默认10分钟
-      idleTimeout: 600000
+      idleTimeout: 60000
       # 此属性控制池中连接的最长生命周期,值0表示无限生命周期,默认30分钟
-      maxLifetime: 1800000
+      maxLifetime: 60000
       # 多久检查一次连接的活性
       keepaliveTime: 30000
 mybatis-flex:

+ 9 - 4
taais-modules/taais-biz/src/main/java/com/taais/biz/controller/DataAugmentationController.java

@@ -12,10 +12,13 @@ import java.util.Map;
 import com.mybatisflex.core.query.QueryWrapper;
 import com.taais.biz.domain.DataAugmentation;
 import com.taais.biz.domain.bo.DataAugmentationBo;
+import com.taais.biz.domain.bo.VideoStableStartResultBo;
 import com.taais.biz.domain.vo.DataAugmentationVo;
+import com.taais.biz.service.IVideoStableService;
 import com.taais.common.core.service.OssService;
 import com.taais.system.domain.SysOss;
 import com.taais.system.service.ISysOssService;
+import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import cn.dev33.satoken.annotation.SaCheckPermission;
@@ -49,6 +52,8 @@ public class DataAugmentationController extends BaseController {
     private IDataAugmentationService dataAugmentationService;
     @Autowired
     private ISysOssService ossService;
+    @Autowired
+    private IVideoStableService videoStableService;
     @GetMapping("/compare/num/{task_id}")
 
     public CommonResult getCompareNum(@PathVariable("task_id") Long taskId) {
@@ -97,10 +102,10 @@ public class DataAugmentationController extends BaseController {
         }
     }
 
-    // @PostMapping("/get_result")
-    // public CommonResult getResult(@Valid @RequestBody dataAugmentationStartResultBo dataAugmentationStartResultBo) {
-    //     return dataAugmentationService.getResult(dataAugmentationStartResultBo);
-    // }
+     @PostMapping("/get_result")
+     public CommonResult getResult(@Valid @RequestBody VideoStableStartResultBo videoStableStartResultBo) {
+         return dataAugmentationService.getResult(videoStableStartResultBo);
+     }
 
     @GetMapping("/start/{id}")
     public CommonResult start(@PathVariable("id") Long id) {

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

@@ -95,10 +95,10 @@ public class VideoStableController extends BaseController {
         }
     }
 
-    // @PostMapping("/get_result")
-    // public CommonResult getResult(@Valid @RequestBody VideoStableStartResultBo videoStableStartResultBo) {
-    //     return videoStableService.getResult(videoStableStartResultBo);
-    // }
+     @PostMapping("/get_result")
+     public CommonResult getResult(@Valid @RequestBody VideoStableStartResultBo videoStableStartResultBo) {
+         return videoStableService.getResult(videoStableStartResultBo);
+     }
 
     @GetMapping("/start/{id}")
     public CommonResult start(@PathVariable("id") Long id) {

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

@@ -3,6 +3,7 @@ package com.taais.biz.service;
 import com.taais.biz.domain.DataAugmentation;
 import com.taais.biz.domain.bo.DataAugmentationBo;
 import com.taais.biz.domain.bo.DataAugmentationStartResultBo;
+import com.taais.biz.domain.bo.VideoStableStartResultBo;
 import com.taais.biz.domain.vo.DataAugmentationVo;
 import com.taais.common.core.core.domain.CommonResult;
 import com.taais.common.core.core.page.PageResult;
@@ -67,7 +68,7 @@ public interface IDataAugmentationService extends IBaseService<DataAugmentation>
 
     CommonResult start(Long id);
 
-    CommonResult getResult(DataAugmentationStartResultBo dataAugmentationStartResultBo);
+    CommonResult getResult(VideoStableStartResultBo videoStableStartResultBo);
 
     Object getCompareNum(Long taskId);
 

+ 13 - 3
taais-modules/taais-biz/src/main/java/com/taais/biz/service/impl/DataAugmentationServiceImpl.java

@@ -9,6 +9,7 @@ import com.taais.biz.domain.DataAugmentation;
 import com.taais.biz.domain.TransmissionObject;
 import com.taais.biz.domain.bo.DataAugmentationBo;
 import com.taais.biz.domain.bo.DataAugmentationStartResultBo;
+import com.taais.biz.domain.bo.VideoStableStartResultBo;
 import com.taais.biz.domain.vo.DataAugmentationVo;
 import com.taais.biz.mapper.DataAugmentationMapper;
 import com.taais.biz.service.IDataAugmentationService;
@@ -236,7 +237,13 @@ public class DataAugmentationServiceImpl extends BaseServiceImpl<DataAugmentatio
         Path logPath = path.resolveSibling(fileName_without_suffix + "_log");
         makeDir(inputPath.toString());
         makeDir(outputPath.toString());
-
+        makeDir(localPath.toString());
+//        String inputPath = "D:\\program\\taais\\duijie\\code\\" + fileName_without_suffix + "_images";
+//        String outputPath = "D:\\program\\taais\\duijie\\code\\" + fileName_without_suffix + "_output";
+//        String logPath = "D:\\program\\taais\\duijie\\code\\" + fileName_without_suffix + "_log";
+//        makeDir(inputPath);
+//        makeDir(outputPath);
+//        makeDir(logPath);
         ZipUtils.unzip(resourcePath, inputPath.toString());
         dataAugmentation.setLog(logPath.toString());
         dataAugmentation.setInputPath(inputPath.toString());
@@ -301,7 +308,7 @@ public class DataAugmentationServiceImpl extends BaseServiceImpl<DataAugmentatio
     }
 
     @Override
-    public CommonResult getResult(DataAugmentationStartResultBo dataAugmentationStartResultBo) {
+    public CommonResult getResult(VideoStableStartResultBo dataAugmentationStartResultBo) {
         Long id = dataAugmentationStartResultBo.getId();
         String status = dataAugmentationStartResultBo.getStatus();
         String msg = dataAugmentationStartResultBo.getMsg();
@@ -363,7 +370,10 @@ public class DataAugmentationServiceImpl extends BaseServiceImpl<DataAugmentatio
             return CommonResult.fail("未设置数据增强算法停止推理的url!请在数据字典中设置该算法的停止推理地址!");
         }
         String data_augmentation_stop_url = sysDictDataVos.get(0).getDictValue();
-        HttpResponseEntity responseEntity = sendPostMsg(data_augmentation_stop_url, null);
+        TransmissionObject transmissionObject = new TransmissionObject();
+        transmissionObject.setBizId(dataAugmentation.getId());
+        transmissionObject.setBizType(dataAugmentation.getTaskType());
+        HttpResponseEntity responseEntity = sendPostMsg(data_augmentation_stop_url, transmissionObject);
         if (ObjectUtil.isNotNull(responseEntity) && responseEntity.getStatus() == 200) {
             dataAugmentation.setStatus(BizConstant.VideoStatus.INTERRUPTED);
             updateById(dataAugmentation);