Explorar o código

feat:数据扩展

Eureka hai 8 meses
pai
achega
8d0a54f605

+ 49 - 0
taais-modules/taais-biz/src/main/java/com/taais/biz/domain/bo/DataAmplificationTaskBo.java

@@ -0,0 +1,49 @@
+package com.taais.biz.domain.bo;
+
+import com.taais.biz.domain.TargetIdentificationSubtask;
+import com.taais.common.orm.core.domain.BaseEntity;
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 目标识别子任务业务对象 target_identification_subtask
+ *
+ * @author Allen
+ * @date 2024-08-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = TargetIdentificationSubtask.class, reverseConvertGenerate = false)
+public class DataAmplificationTaskBo extends BaseEntity{
+    /**
+     * 主键ID
+     */
+    @NotNull(message = "主键ID不能为空")
+    private Long id;
+
+    // 任务id
+    private Long taskId;
+
+    /**
+     * 任务名称
+     */
+    @NotBlank(message = "任务名称不能为空")
+    private String name;
+
+    /**
+     * 任务状态
+     */
+    @NotBlank(message = "任务状态不能为空")
+    private String status;
+
+    /**
+     * 备注
+     */
+    @NotBlank(message = "备注不能为空")
+    private String remarks;
+
+
+}

+ 2 - 1
taais-modules/taais-biz/src/main/java/com/taais/biz/domain/dto/task/CreateTargetIdentificationTaskDto.java

@@ -1,5 +1,6 @@
 package com.taais.biz.domain.dto.task;
 
+import com.taais.biz.domain.dto.DataAmplifyDto;
 import lombok.Data;
 
 import java.util.List;
@@ -36,5 +37,5 @@ public class CreateTargetIdentificationTaskDto {
     private Boolean hasTrainAugmentation;
 
     // 训练扩增的超参
-    private String trainAugmentationParams;
+    private DataAmplifyDto trainAugmentationParams;
 }

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

@@ -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);
-            }
-        }
     }