add: 算法参数修改

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

@@ -11,11 +11,11 @@ spring:
       # 最小空闲线程数量
       minimum-idle: 2
       # 配置获取连接等待超时的时间
-      connectionTimeout: 30000
+      connectionTimeout: 300000
       # 校验超时时间
-      validationTimeout: 5000
+      validationTimeout: 50000
       # 空闲连接存活最大时间，默认10分钟
-      idleTimeout: 600000
+      idleTimeout: 6000000
       # 此属性控制池中连接的最长生命周期，值0表示无限生命周期，默认30分钟
       maxLifetime: 1800000
       # 多久检查一次连接的活性

taais-common/taais-common-json/src/main/java/com/taais/common/json/utils/JsonUtils.java

@@ -15,6 +15,7 @@ import lombok.NoArgsConstructor;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * JSON 工具类
@@ -99,7 +100,7 @@ public class JsonUtils {
         }
     }
 
-    public static <T> List<T> parseArray(String text, Class<T> clazz) {
+    public static <T> List<T> parseArray(String text, Class<Map> clazz) {
         if (StringUtils.isEmpty(text)) {
             return new ArrayList<>();
         }

taais-modules/taais-biz/src/main/java/com/taais/biz/controller/DataController.java

@@ -249,4 +249,9 @@ public class DataController extends BaseController {
     public CommonResult<Boolean> dataAmplify(@RequestBody DataAmplifyDto dataAmplifyDto) {
         return dataService.dataAmplify(dataAmplifyDto);
     }
+
+    @PostMapping("/amplifyForData")
+    public CommonResult<Boolean> amplifyForData(@RequestParam("id") String id) {
+        return dataService.amplifyForData(id);
+    }
 }

taais-modules/taais-biz/src/main/java/com/taais/biz/service/IDataService.java

@@ -103,4 +103,6 @@ public interface IDataService extends IBaseService<Data> {
      * @return {@link List }<{@link String }>
      */
     List<DataSelectVo>  getFormSelects(String field);
+
+    CommonResult<Boolean> amplifyForData(String id);
 }

taais-modules/taais-biz/src/main/java/com/taais/biz/service/impl/DataServiceImpl.java

@@ -54,6 +54,7 @@ import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
 
 import static com.taais.biz.domain.table.DataTableDef.DATA;
 
@@ -495,6 +496,12 @@ public class DataServiceImpl extends BaseServiceImpl<DataMapper, Data> implement
             String formattedDate = currentDate.format(formatter);
             filePath = filePath + File.separator + formattedDate;
             String finalFilePath = filePath;
+            Map<String, String> otherParams = new HashMap<>();
+            for (Map<String, String> param : dataAmplifyDto.getOtherParams()) {
+                otherParams.put(param.get("agName"), param.get("defaultValue"));
+            }
+            Map<String, String> param = dataAmplifyDto.getOtherParams()
+                .stream().collect(Collectors.toMap(item -> item.get("agName"), item -> item.get("defaultValue")));
             dataListInfo.forEach(dataInfo -> {
                 try {
                     boolean success = true;
@@ -513,8 +520,8 @@ public class DataServiceImpl extends BaseServiceImpl<DataMapper, Data> implement
                         log.info("创建文件目录: {}", desc.mkdirs());
                     }
                     bodyJson.put("outputImagePath", outputImagePath);
-                    bodyJson.put("otherParams", dataAmplifyDto.getOtherParams().get(0));
-                    String logPath = profile + "/task/" + dataAmplifyDto.getId() + "_log.log";
+                    bodyJson.put("otherParams", otherParams);
+                    String logPath = profile + "/task/log/" + dataAmplifyDto.getId() + "_log.log";
                     System.out.println("logPath===>" + logPath);
                     bodyJson.put("logPath", logPath);
                     //实际请求接口，接口未提供，暂且注释

taais-modules/taais-biz/src/main/java/com/taais/biz/service/impl/TargetIdentificationTaskServiceImpl.java

@@ -520,15 +520,15 @@ public class TargetIdentificationTaskServiceImpl extends BaseServiceImpl<TargetI
             subtask.setStatus(BizConstant.TASK_STATUS_PENDING);
             subtask.setTaskId(taskId);
             subtask.setRemarks("DEFAULT_REMARK");
-            subtaskService.insertSubtask(subtask);
+            TargetIdentificationSubtask insertSubtask = subtaskService.insertSubtask(subtask);
 
-            // todo 创建数据扩增数据
             DataAmplifyDto amplifyDto = taskDto.getTrainAugmentationParams();
             DataAmplificationTaskBo dataAmplificationTaskBo = new DataAmplificationTaskBo();
-            dataAmplificationTaskBo.setSubTaskId(subtask.getId());
+            dataAmplificationTaskBo.setSubTaskId(insertSubtask.getId());
             dataAmplificationTaskBo.setName(amplifyDto.getTaskName());
             dataAmplificationTaskBo.setStatus(BizConstant.TASK_STATUS_PENDING);
             dataAmplificationTaskBo.setDataBatchNums(batchNumber);
+            dataAmplificationTaskBo.setAugmentationType(amplifyDto.getAugmentationType());
             dataAmplificationTaskBo.setParameters(JsonUtils.toJsonString(amplifyDto.getOtherParams()));
             dataAmplificationTaskBo.setDelFlag(0);
             dataAmplificationTaskService.insert(dataAmplificationTaskBo);