dev

script/sql/postgresql/update_task_and_subtask.sql

@@ -1,17 +1,51 @@
-DROP PROCEDURE IF EXISTS update_task_and_subtask(bigint,character varying);
 CREATE OR REPLACE PROCEDURE update_task_and_subtask(
-    p_biz_id BIGINT,
-    p_bizType VARCHAR
+    IN p_biz_id INT,
+    IN p_bizType VARCHAR
 )
 LANGUAGE plpgsql
 AS $$
-DECLARE
-    v_task_id BIGINT;
-    v_subtask_id BIGINT;
 BEGIN
-    -- 根据业务ID和业务类型获取任务ID
-EXCEPTION
-    WHEN OTHERS THEN
-        RAISE EXCEPTION 'Error occurred: % (%). Please check the input and database state.', SQLERRM, SQLSTATE;
+    IF p_bizType = 'dataProcess' THEN
+        -- 检查 subtask 状态 --失败场景暂时不更新上层任务
+        -- PERFORM 1 FROM algorithm_biz_process WHERE subtaskId = p_biz_id AND status = '3';
+        -- IF FOUND THEN
+            -- 如果有一个状态是3(失败)，更新 algorithm_subtask 表为3(失败)
+        --    UPDATE algorithm_subtask
+        --    SET status = 3
+        --    WHERE id = p_biz_id;
+        -- ELSE
+            -- 如果algorithm_biz_process所有状态都是2(成功)，更新 algorithm_subtask 表为2(成功)
+            PERFORM 1 FROM algorithm_biz_process WHERE status <> '2' AND sub_task_id = ( SELECT sub_task_id FROM algorithm_biz_process WHERE id = p_biz_id) ;
+            IF NOT FOUND THEN
+                UPDATE algorithm_subtask
+                SET status = '2'
+                WHERE id = ( SELECT sub_task_id FROM algorithm_biz_process WHERE id = p_biz_id);
+            END IF;
+            -- 如果algorithm_subtask表所有状态都是2(成功)，更新 algorithm_task 表为2(成功)
+            PERFORM 1 FROM algorithm_subtask WHERE status <> '2' AND task_id = (select task_id FROM algorithm_subtask WHERE id = (SELECT sub_task_id FROM algorithm_biz_process WHERE id = p_biz_id));
+            IF NOT FOUND THEN
+                UPDATE algorithm_task
+                SET status = '2'
+                WHERE id =  (SELECT task_id FROM algorithm_subtask WHERE id = (SELECT sub_task_id FROM algorithm_biz_process WHERE id = p_biz_id));
+            END IF;
+
+        --END IF;
+    ELSIF p_bizType = 'dataBizProcess' THEN
+        -- 如果algorithm_data_process所有状态都是2(成功)，更新 algorithm_subtask 表为2(成功)
+        PERFORM 1 FROM algorithm_data_process WHERE status <> '2' AND sub_task_id = ( SELECT sub_task_id FROM algorithm_biz_process WHERE id = p_biz_id);
+        IF NOT FOUND THEN
+            UPDATE algorithm_subtask
+            SET status = '2'
+            WHERE id = ( SELECT sub_task_id FROM algorithm_biz_process WHERE id = p_biz_id);
+        END IF;
+        -- 如果algorithm_subtask表所有状态都是2(成功)，更新 algorithm_task 表为2(成功)
+        PERFORM 1 FROM algorithm_subtask WHERE status <> '2' AND task_id = (SELECT task_id FROM algorithm_subtask WHERE id = (SELECT sub_task_id FROM algorithm_data_process WHERE id = p_biz_id));
+        IF NOT FOUND THEN
+            UPDATE algorithm_task
+            SET status = '2'
+            WHERE id =  (SELECT task_id FROM algorithm_subtask WHERE id = (SELECT sub_task_id FROM algorithm_data_process WHERE id = p_biz_id));
+        END IF;
+    END IF;
 END;
 $$;
+

taais-extra/taais-powerjob-server/src/main/java/com/taais/powerjob/PowerJobServerApplication.java

@@ -21,5 +21,4 @@ public class PowerJobServerApplication {
         SpringApplication.run(tech.powerjob.server.PowerJobServerApplication.class, args);
         log.info("文档地址: https://www.yuque.com/powerjob/guidence/problem");
     }
-
 }

taais-modules/taais-biz/src/main/java/com/taais/biz/constant/BizConstant.java

@@ -20,6 +20,8 @@ public class BizConstant {
 
     public static final String TASK_FOLDER_PATH_TRAIL_RESULT= "/result/";
 
+    public static final String TASK_FOLDER_PATH_LOG= "log/";
+    public static final String TASK_FOLDER_LOG_PATH= TASK_FOLDER_PATH_LOG+"log.log";
     public static final String IMAGE = "image";
     public static final String LABEL = "label";
 

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

@@ -106,4 +106,10 @@ public class AlgorithmConfigController extends BaseController {
         }
         return CommonResult.success();
     }
+
+    @SaCheckPermission("ag:config:list")
+    @GetMapping("/getOption")
+    public CommonResult<List> getOption() {
+        return CommonResult.success(algorithmConfigService.getOption());
+    }
 }

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

@@ -139,6 +139,13 @@ public class AlgorithmTaskController extends BaseController {
         return CommonResult.success();
     }
 
+    @Log(title = "算法定时任务", businessType = BusinessType.INSERT)
+    @GetMapping("/taskRun")
+    public CommonResult<Void> taskRun() {
+        algorithmTaskService.taskRun();
+        return CommonResult.success();
+    }
+
     @SaCheckPermission("task:task:add")
     @PostMapping("/getImage")
     public CommonResult<PageResult<DataVo>> getImage(@Validated @RequestBody DataBo data) {

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

@@ -160,7 +160,6 @@ public class DataController extends BaseController {
             List<FileHeader> fileheaders = UnPackedUtil.unPackZip(zipOrRarTemp,dest);
             //添加解压目录
             for(FileHeader fileHeader : fileheaders) {
-
                 if (!fileHeader.isDirectory()) {
                     String fileHeaderName = fileHeader.getFileName();
                     String fileHeader_suffix = StringUtils.substring(fileHeaderName, fileHeaderName.lastIndexOf("."), fileHeaderName.length());

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

@@ -13,6 +13,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -31,7 +32,7 @@ public class PublicController extends BaseController {
     @Resource
     IAlgorithmBizProcessService bizProcessService;
     @PostMapping("/taskResult")
-    public CommonResult<Void> taskResult(TaskResultDTO resultDTO) {
+    public CommonResult<Void> taskResult(@RequestBody TaskResultDTO resultDTO) {
         String errorMsg = checkDTO(resultDTO);
         if(StringUtils.isNotEmpty(errorMsg)){
             return CommonResult.fail(errorMsg);

taais-modules/taais-biz/src/main/java/com/taais/biz/domain/dto/AlgorithmConfigParamDto.java

@@ -16,4 +16,6 @@ public class AlgorithmConfigParamDto {
     private boolean required;
     // 排序
     private int index;
+    // 提示
+    private String prompt;
 }

taais-modules/taais-biz/src/main/java/com/taais/biz/domain/dto/AlgorithmRequestDto.java

@@ -13,5 +13,6 @@ public class AlgorithmRequestDto {
     private Long bizId;
     private String sourcePath;
     private String resultPath;
+    private String logPath;
     private Map<String,String> otherParams;
 }

taais-modules/taais-biz/src/main/java/com/taais/biz/mapper/AlgorithmBizProcessMapper.java

@@ -1,10 +1,13 @@
 package com.taais.biz.mapper;
 
 import com.mybatisflex.core.BaseMapper;
+import com.taais.biz.domain.vo.AlgorithmBizProcessVo;
 import org.apache.ibatis.annotations.Mapper;
 import com.taais.biz.domain.AlgorithmBizProcess;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 算法业务处理Mapper接口
  *
@@ -15,4 +18,6 @@ import org.apache.ibatis.annotations.Param;
 public interface AlgorithmBizProcessMapper extends BaseMapper<AlgorithmBizProcess> {
 
     void updateTaskAndSubtask(@Param("bizId") Long bizId, @Param("bizType") String bizType);
+
+    List<AlgorithmBizProcessVo> getProcessBySubtaskId(Long subtaskId);
 }

taais-modules/taais-biz/src/main/java/com/taais/biz/mapper/AlgorithmConfigMapper.java

@@ -4,6 +4,8 @@ import com.mybatisflex.core.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import com.taais.biz.domain.AlgorithmConfig;
 
+import java.util.List;
+
 /**
  * 算法配置Mapper接口
  *
@@ -13,4 +15,5 @@ import com.taais.biz.domain.AlgorithmConfig;
 @Mapper
 public interface AlgorithmConfigMapper extends BaseMapper<AlgorithmConfig> {
 
+    List getOption();
 }

taais-modules/taais-biz/src/main/java/com/taais/biz/mapper/AlgorithmDataProcessMapper.java

@@ -1,9 +1,12 @@
 package com.taais.biz.mapper;
 
 import com.mybatisflex.core.BaseMapper;
+import com.taais.biz.domain.vo.AlgorithmDataProcessVo;
 import org.apache.ibatis.annotations.Mapper;
 import com.taais.biz.domain.AlgorithmDataProcess;
 
+import java.util.List;
+
 /**
  * 算法数据处理Mapper接口
  *
@@ -13,4 +16,5 @@ import com.taais.biz.domain.AlgorithmDataProcess;
 @Mapper
 public interface AlgorithmDataProcessMapper extends BaseMapper<AlgorithmDataProcess> {
 
+    List<AlgorithmDataProcessVo> getProcessBySubtaskId(Long subtaskId);
 }

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

@@ -63,4 +63,5 @@ public interface IAlgorithmConfigService extends IBaseService<AlgorithmConfig> {
      */
     boolean deleteByIds(Long[] ids);
 
+    List getOption();
 }

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

@@ -65,7 +65,7 @@ public interface IAlgorithmDataProcessService extends IBaseService<AlgorithmData
      */
     boolean deleteByIds(Long[] ids);
 
-    List<AlgorithmDataProcessVo> getProcessBySubtaskId(Long id);
+    List<AlgorithmDataProcessVo> getProcessBySubtaskId(Long subtaskId);
 
     String taskResult(TaskResultDTO resultDTO);
 }

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

@@ -139,8 +139,7 @@ public class AlgorithmBizProcessServiceImpl extends BaseServiceImpl<AlgorithmBiz
 
     @Override
     public List<AlgorithmBizProcessVo> getProcessBySubtaskId(Long subtaskId) {
-        // todo Allen
-        return null;
+        return mapper.getProcessBySubtaskId(subtaskId);
     }
 
     @Override
@@ -154,7 +153,6 @@ public class AlgorithmBizProcessServiceImpl extends BaseServiceImpl<AlgorithmBiz
         AlgorithmBizProcessBo algorithmBizProcess = MapstructUtils.convert(bizProcessVo, AlgorithmBizProcessBo.class);
         if (resultDTO.getStatus() == 1) {
             algorithmBizProcess.setStatus(BizConstant.TASK_STATUS_SUCCEED);
-
         } else if (resultDTO.getStatus() == 0) {
             algorithmBizProcess.setStatus(BizConstant.TASK_STATUS_FAILED);
         } else {

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

@@ -129,4 +129,9 @@ public class AlgorithmConfigServiceImpl extends BaseServiceImpl<AlgorithmConfigM
         return this.removeByIds(Arrays.asList(ids));
     }
 
+    @Override
+    public List getOption() {
+        return mapper.getOption();
+    }
+
 }

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

@@ -139,9 +139,8 @@ public class AlgorithmDataProcessServiceImpl extends BaseServiceImpl<AlgorithmDa
     }
 
     @Override
-    public List<AlgorithmDataProcessVo> getProcessBySubtaskId(Long id) {
-        // todo Allen
-        return null;
+    public List<AlgorithmDataProcessVo> getProcessBySubtaskId(Long subtaskId) {
+        return mapper.getProcessBySubtaskId(subtaskId);
     }
 
     @Override

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

@@ -210,6 +210,7 @@ public class AlgorithmSubtaskServiceImpl extends BaseServiceImpl<AlgorithmSubtas
             algorithmRequestDto.setBizId(bizProcessVo.getId());
             algorithmRequestDto.setSourcePath(preprocessPath);
             algorithmRequestDto.setResultPath(resultPath);
+            algorithmRequestDto.setResultPath(bizProcessVo.getLog());
             Gson gson = new Gson();
             Type listType = new TypeToken<List<AlgorithmConfigParamDto>>() {}.getType();
             if (StringUtils.isNotEmpty(parameters)) {
@@ -232,7 +233,7 @@ public class AlgorithmSubtaskServiceImpl extends BaseServiceImpl<AlgorithmSubtas
             } else {
                 httpResult = HttpUtils.sendPost(url, gson.toJson(algorithmRequestDto));
             }
-            // todo Allen process httpResult
+            // process httpResult
             log.info("httpResult:{}", httpResult);
             // update AlgorithmBizProcess
             AlgorithmBizProcess algorithmBizProcess = MapstructUtils.convert(bizProcessVo, AlgorithmBizProcess.class);
@@ -273,6 +274,7 @@ public class AlgorithmSubtaskServiceImpl extends BaseServiceImpl<AlgorithmSubtas
             algorithmRequestDto.setBizId(processVo.getId());
             algorithmRequestDto.setSourcePath(preprocessPath);
             algorithmRequestDto.setResultPath(resultPath);
+            algorithmRequestDto.setLogPath(processVo.getLog());
             Gson gson = new Gson();
             Type listType = new TypeToken<List<AlgorithmConfigParamDto>>() {}.getType();
             if (StringUtils.isNotEmpty(parameters)) {
@@ -289,7 +291,7 @@ public class AlgorithmSubtaskServiceImpl extends BaseServiceImpl<AlgorithmSubtas
             } else {
                 httpResult = HttpUtils.sendPost(url, gson.toJson(algorithmRequestDto));
             }
-            // todo Allen process httpResult
+            // process httpResult
             log.info("httpResult:{}", httpResult);
 
             // update AlgorithmDataProcess

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

@@ -183,7 +183,7 @@ public class AlgorithmTaskServiceImpl extends BaseServiceImpl<AlgorithmTaskMappe
         return null;
     }
 
-    // todo Allen task start
+    // task start
     @Override
     public void taskRun() {
         AlgorithmTask algorithmTask = algorithmTaskMapper.getLastTask();
@@ -250,8 +250,8 @@ public class AlgorithmTaskServiceImpl extends BaseServiceImpl<AlgorithmTaskMappe
         }
         // 11 如果有该，推理数据增强
         if (selectTask.contains(BizConstant.STEP11_REASONING_DATA_ENHANCEMENT)) {
-            reasoningDataFolderPathList = createReasoningDataEnhancementSubtask(algorithmTask, taskDto, reasoningDataFolderPathList);
         }
+        reasoningDataFolderPathList = createReasoningDataEnhancementSubtask(algorithmTask, taskDto, reasoningDataFolderPathList);
         // 12 如果有该，推理数据扩充
         if (selectTask.contains(BizConstant.STEP12_REASONING_DATA_EXPANSION)) {
             reasoningDataFolderPathList = createReasoningDataExpansionSubtask(algorithmTask, taskDto, reasoningDataFolderPathList);
@@ -284,6 +284,7 @@ public class AlgorithmTaskServiceImpl extends BaseServiceImpl<AlgorithmTaskMappe
                 String finallyParams = buildFinallyParams(dto.getParams(), testDataFolderPath, resultPath);
                 algorithmBizProcessBo.setResultPath(resultPath);
                 algorithmBizProcessBo.setParameters(finallyParams);
+                algorithmBizProcessBo.setLog(resultPath+BizConstant.TASK_FOLDER_LOG_PATH);
                 bizProcessService.update(algorithmBizProcessBo);
                 index++;
             }
@@ -311,6 +312,7 @@ public class AlgorithmTaskServiceImpl extends BaseServiceImpl<AlgorithmTaskMappe
                 + BizConstant.TASK_FOLDER_PATH_MID_TEST + BizConstant.TASK_FOLDER_PATH_TRAIL_EXPANSION + processBo.getId() + "/";
             String finallyParams = buildFinallyParams(taskDto.getTestDataExpansion().getParams(), testDataFolderPath, resultPath);
             processBo.setParameters(finallyParams);
+            processBo.setLog(resultPath+BizConstant.TASK_FOLDER_LOG_PATH);
             processService.update(processBo);
             returnList.add(resultPath);
             index++;
@@ -342,6 +344,7 @@ public class AlgorithmTaskServiceImpl extends BaseServiceImpl<AlgorithmTaskMappe
             String finallyParams = buildFinallyParams(taskDto.getTestDataEnhancement().getParams(), testDataFolderPath, resultPath);
             processBo.setParameters(finallyParams);
             processBo.setResultPath(resultPath);
+            processBo.setLog(resultPath+BizConstant.TASK_FOLDER_LOG_PATH);
             processService.update(processBo);
             returnList.add(resultPath);
             index++;
@@ -392,6 +395,7 @@ public class AlgorithmTaskServiceImpl extends BaseServiceImpl<AlgorithmTaskMappe
                 String finallyParams = buildFinallyParams(dto.getParams(), reasoningDataFolderPath, resultPath);
                 algorithmBizProcessBo.setResultPath(resultPath);
                 algorithmBizProcessBo.setParameters(finallyParams);
+                algorithmBizProcessBo.setLog(resultPath+BizConstant.TASK_FOLDER_LOG_PATH);
                 bizProcessService.update(algorithmBizProcessBo);
                 index++;
             }
@@ -419,6 +423,7 @@ public class AlgorithmTaskServiceImpl extends BaseServiceImpl<AlgorithmTaskMappe
                 + BizConstant.TASK_FOLDER_PATH_MID_REASONING + BizConstant.TASK_FOLDER_PATH_TRAIL_EXPANSION + processBo.getId() + "/";
             String finallyParams = buildFinallyParams(taskDto.getReasoningDataExpansion().getParams(), reasoningDataFolderPath, resultPath);
             processBo.setParameters(finallyParams);
+            processBo.setLog(resultPath+BizConstant.TASK_FOLDER_LOG_PATH);
             processService.update(processBo);
             returnList.add(resultPath);
             index++;
@@ -453,6 +458,7 @@ public class AlgorithmTaskServiceImpl extends BaseServiceImpl<AlgorithmTaskMappe
             String finallyParams = buildFinallyParams(taskDto.getReasoningDataEnhancement().getParams(), reasoningDataFolderPath, resultPath);
             processBo.setParameters(finallyParams);
             processBo.setResultPath(resultPath);
+            processBo.setLog(resultPath+BizConstant.TASK_FOLDER_LOG_PATH);
             processService.update(processBo);
             returnList.add(resultPath);
             index++;
@@ -506,6 +512,7 @@ public class AlgorithmTaskServiceImpl extends BaseServiceImpl<AlgorithmTaskMappe
             String finallyParams = buildFinallyParams(taskDto.getTrainDataEnhancement().getParams(), trainDataFolderPath, resultPath);
             processBo.setParameters(finallyParams);
             processBo.setResultPath(resultPath);
+            processBo.setLog(resultPath+BizConstant.TASK_FOLDER_LOG_PATH);
             processService.update(processBo);
             returnList.add(resultPath);
             index++;
@@ -536,6 +543,7 @@ public class AlgorithmTaskServiceImpl extends BaseServiceImpl<AlgorithmTaskMappe
                 String finallyParams = buildFinallyParams(dto.getParams(), trainDataFolderPath, resultPath);
                 algorithmBizProcessBo.setResultPath(resultPath);
                 algorithmBizProcessBo.setParameters(finallyParams);
+                algorithmBizProcessBo.setLog(resultPath+BizConstant.TASK_FOLDER_LOG_PATH);
                 bizProcessService.update(algorithmBizProcessBo);
                 index++;
             }
@@ -563,6 +571,7 @@ public class AlgorithmTaskServiceImpl extends BaseServiceImpl<AlgorithmTaskMappe
                 + BizConstant.TASK_FOLDER_PATH_MID_TRAIN + BizConstant.TASK_FOLDER_PATH_TRAIL_EXPANSION + processBo.getId() + "/";
             String finallyParams = buildFinallyParams(taskDto.getTrainDataExpansion().getParams(), trainDataFolderPath, resultPath);
             processBo.setParameters(finallyParams);
+            processBo.setLog(resultPath+BizConstant.TASK_FOLDER_LOG_PATH);
             processService.update(processBo);
             returnList.add(resultPath);
             index++;

taais-modules/taais-biz/src/main/resources/mapper/ag/AlgorithmConfigMapper.xml

@@ -4,4 +4,7 @@
     "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.taais.biz.mapper.AlgorithmConfigMapper">
 
+    <select id="getOption">
+        select id, algorithm_name as name from algorithm_config
+    </select>
 </mapper>

taais-modules/taais-biz/src/main/resources/mapper/task/AlgorithmBizProcessMapper.xml

@@ -3,7 +3,33 @@
     PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.taais.biz.mapper.AlgorithmBizProcessMapper">
+    <resultMap id="AlgorithmBizProcessResultMap" type="com.taais.biz.domain.vo.AlgorithmBizProcessVo">
+        <id property="id" column="id" />
+        <result property="subTaskId" column="sub_task_id" />
+        <result property="name" column="name" />
+        <result property="type" column="type" />
+        <result property="status" column="status" />
+        <result property="algorithmId" column="algorithm_id" />
+        <result property="parameters" column="parameters" />
+        <result property="preprocess_path" column="result_path" />
+        <result property="resultPath" column="result_path" />
+        <result property="index" column="index" />
+        <result property="startTime" column="start_time" />
+        <result property="endTime" column="end_time" />
+        <result property="cost_second" column="cost_second" />
+        <result property="log" column="log" />
+        <result property="createBy" column="create_by" />
+        <result property="createTime" column="create_time" />
+        <result property="updateBy" column="update_by" />
+        <result property="updateTime" column="update_time" />
+        <result property="remarks" column="remarks" />
+    </resultMap>
+
     <select id="updateTaskAndSubtask" statementType="CALLABLE">
-        {call update_task_and_subtask(#{bizId,jdbcType=INTEGER,mode=IN}, #{bizType,jdbcType=VARCHAR,mode=IN})}
+        {call update_task_and_subtask(#{bizId,jdbcType=INTEGER,mode=IN}, #{bizType,jdbcType=VARCHAR,mode=IN}, #{status,jdbcType=VARCHAR,mode=IN})}
+    </select>
+
+    <select id="getProcessBySubtaskId" resultMap="AlgorithmBizProcessResultMap">
+        select * from algorithm_biz_process where sub_task_id = #{value}
     </select>
 </mapper>

taais-modules/taais-biz/src/main/resources/mapper/task/AlgorithmDataProcessMapper.xml

@@ -3,5 +3,29 @@
     PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.taais.biz.mapper.AlgorithmDataProcessMapper">
+    <resultMap id="AlgorithmDataProcessResultMap" type="com.taais.biz.domain.vo.AlgorithmDataProcessVo">
+        <id property="id" column="id" />
+        <result property="subTaskId" column="sub_task_id" />
+        <result property="name" column="name" />
+        <result property="type" column="type" />
+        <result property="status" column="status" />
+        <result property="algorithmId" column="algorithm_id" />
+        <result property="parameters" column="parameters" />
+        <result property="preprocess_path" column="result_path" />
+        <result property="index" column="index" />
+        <result property="startTime" column="start_time" />
+        <result property="endTime" column="end_time" />
+        <result property="cost_second" column="cost_second" />
+        <result property="log" column="log" />
+        <result property="createBy" column="create_by" />
+        <result property="createTime" column="create_time" />
+        <result property="updateBy" column="update_by" />
+        <result property="updateTime" column="update_time" />
+        <result property="remarks" column="remarks" />
+    </resultMap>
+
+    <select id="getProcessBySubtaskId" resultMap="AlgorithmDataProcessResultMap">
+        select * from algorithm_data_process where sub_task_id = #{value}
+    </select>
 
 </mapper>

taais-modules/taais-biz/src/main/resources/mapper/task/AlgorithmSubtaskMapper.xml

@@ -3,8 +3,26 @@
     PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.taais.biz.mapper.AlgorithmSubtaskMapper">
+    <resultMap id="AlgorithmSubtaskResultMap" type="com.taais.biz.domain.AlgorithmSubtask">
+        <id property="id" column="id" />
+        <result property="taskId" column="task_id" />
+        <result property="name" column="name" />
+        <result property="type" column="type" />
+        <result property="status" column="status" />
+        <result property="parameters" column="parameters" />
+        <result property="startTime" column="start_time" />
+        <result property="endTime" column="end_time" />
+        <result property="costSecond" column="cost_second" />
+        <result property="log" column="log" />
+        <result property="index" column="index" />
+        <result property="createBy" column="create_by" />
+        <result property="createTime" column="create_time" />
+        <result property="updateBy" column="update_by" />
+        <result property="updateTime" column="update_time" />
+        <result property="remarks" column="remarks" />
+    </resultMap>
 
-<select id="getFirstNeedProcessSubtask" parameterType="Long" resultType="com.taais.biz.domain.AlgorithmSubtask">
+<select id="getFirstNeedProcessSubtask" parameterType="Long" resultMap="AlgorithmSubtaskResultMap">
     select * from algorithm_subtask t where t.task_id = #{id} and t.status = '1' order by t.index asc limit 1
 </select>
 

taais-modules/taais-biz/src/main/resources/mapper/task/AlgorithmTaskMapper.xml

@@ -3,7 +3,21 @@
     PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.taais.biz.mapper.AlgorithmTaskMapper">
-<select id="AlgorithmTaskMapper" resultType="com.taais.biz.domain.AlgorithmTask">
+    <resultMap id="AlgorithmTaskResultMap" type="com.taais.biz.domain.AlgorithmTask">
+        <id property="id" column="id" />
+        <result property="name" column="name" />
+        <result property="status" column="status" />
+        <result property="startTime" column="start_time" />
+        <result property="endTime" column="end_time" />
+        <result property="costSecond" column="cost_second" />
+        <result property="log" column="log" />
+        <result property="createBy" column="create_by" />
+        <result property="createTime" column="create_time" />
+        <result property="updateBy" column="update_by" />
+        <result property="updateTime" column="update_time" />
+        <result property="remarks" column="remarks" />
+    </resultMap>
+<select id="getLastTask" resultMap="AlgorithmTaskResultMap">
     select * from algorithm_task t where t.status = "1" and order by t.id asc limit 1
 </select>
 </mapper>