|
@@ -12,6 +12,7 @@ import com.taais.biz.constant.BizConstant;
|
|
|
import com.taais.biz.domain.TargetIdentificationSubtask;
|
|
|
import com.taais.biz.domain.bo.TargetIdentificationSubtaskBo;
|
|
|
import com.taais.biz.domain.bo.TargetIdentificationSubtaskDetailsBo;
|
|
|
+import com.taais.biz.domain.dto.DataAmplifyDto;
|
|
|
import com.taais.biz.domain.dto.task.CreateTargetIdentificationTaskDto;
|
|
|
import com.taais.biz.domain.dto.task.TaskDto;
|
|
|
import com.taais.biz.domain.vo.AlgorithmModelVo;
|
|
@@ -507,9 +508,9 @@ public class TargetIdentificationTaskServiceImpl extends BaseServiceImpl<TargetI
|
|
|
}
|
|
|
|
|
|
private void createDataAmplifyTask(Long taskId, CreateTargetIdentificationTaskDto taskDto) {
|
|
|
- List<TaskDto> algTaskList = taskDto.getAlgTaskList();
|
|
|
- List<String> testBatchNumList = taskDto.getTestBatchNumList();
|
|
|
- if (testBatchNumList.isEmpty()) {
|
|
|
+
|
|
|
+ DataAmplifyDto dataAmplifyDto = taskDto.getTrainAugmentationParams();
|
|
|
+ if (StringUtils.isBlank(dataAmplifyDto.getBatchNum())) {
|
|
|
return;
|
|
|
}
|
|
|
TargetIdentificationSubtaskBo subtask = new TargetIdentificationSubtaskBo();
|
|
@@ -517,37 +518,9 @@ public class TargetIdentificationTaskServiceImpl extends BaseServiceImpl<TargetI
|
|
|
subtask.setStatus(BizConstant.TASK_STATUS_PENDING);
|
|
|
subtask.setTaskId(taskId);
|
|
|
subtask.setRemarks("DEFAULT_REMARK");
|
|
|
+ subtaskService.insertSubtask(subtask);
|
|
|
|
|
|
- TargetIdentificationSubtask savedTask = subtaskService.insertSubtask(subtask);
|
|
|
- subtask.setId(savedTask.getId());
|
|
|
- System.out.println("subtask is: " + subtask);
|
|
|
|
|
|
- for (TaskDto algTask : algTaskList) {
|
|
|
- // 通过算法id 获取算法配置
|
|
|
- Long algorithmId = algTask.getAlgorithmId();
|
|
|
- AlgorithmTaskConfigurationVo algorithmModelVo = algorithmTaskConfigurationService.selectById(algorithmId);
|
|
|
-
|
|
|
- String algUrl = algorithmModelVo.getTestUrl();
|
|
|
- String algName = algorithmModelVo.getName();
|
|
|
- List<String> params = List.of(algTask.getParams().split(";;;"));
|
|
|
-
|
|
|
- for (int i = 0; i < testBatchNumList.size(); i++) {
|
|
|
- String batchNum = testBatchNumList.get(i);
|
|
|
- TargetIdentificationSubtaskDetailsBo subtaskDetail = new TargetIdentificationSubtaskDetailsBo();
|
|
|
- // 通过算法id获取算法配置
|
|
|
- subtaskDetail.setSubtaskId(subtask.getId());
|
|
|
- subtaskDetail.setName(algName);
|
|
|
- subtaskDetail.setStatus(BizConstant.TASK_STATUS_PENDING);
|
|
|
- subtaskDetail.setAlgorithmId(algTask.getAlgorithmId());
|
|
|
- subtaskDetail.setType(algUrl);
|
|
|
- subtaskDetail.setDataBatchNums(batchNum);
|
|
|
- subtaskDetail.setParameters(params.get(2));
|
|
|
- String subtaskPath = "/" + UUID.randomUUID().toString().replace("-", "_");
|
|
|
- subtaskDetail.setPreprocessPath(subtaskPath);
|
|
|
- subtaskDetail.setResultPath(subtaskPath + "/result");
|
|
|
- subtaskDetail.setIndex((long) i);
|
|
|
- }
|
|
|
- }
|
|
|
}
|
|
|
|
|
|
|