dev

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

@@ -1,24 +1,23 @@
 package com.taais.biz.controller;
 
-import java.util.List;
-
-import lombok.RequiredArgsConstructor;
-import jakarta.servlet.http.HttpServletResponse;
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
+import com.taais.biz.domain.bo.AlgorithmBizProcessBo;
+import com.taais.biz.domain.vo.AlgorithmBizProcessVo;
+import com.taais.biz.service.IAlgorithmBizProcessService;
 import com.taais.common.core.core.domain.CommonResult;
+import com.taais.common.core.core.page.PageResult;
 import com.taais.common.excel.utils.ExcelUtil;
 import com.taais.common.log.annotation.Log;
 import com.taais.common.log.enums.BusinessType;
 import com.taais.common.web.annotation.RepeatSubmit;
 import com.taais.common.web.core.BaseController;
 import jakarta.annotation.Resource;
-import com.taais.biz.domain.vo.AlgorithmBizProcessVo;
-import com.taais.biz.domain.bo.AlgorithmBizProcessBo;
-import com.taais.biz.service.IAlgorithmBizProcessService;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 
-import com.taais.common.core.core.page.PageResult;
+import java.util.List;
 
 /**
  * 算法业务处理Controller
@@ -106,4 +105,9 @@ public class AlgorithmBizProcessController extends BaseController {
         }
         return CommonResult.success();
     }
+
+    @GetMapping("/getProcessBySubtaskId/{subtaskId}")
+    public CommonResult<List<AlgorithmBizProcessVo>> getProcessBySubtaskId(@PathVariable Long subtaskId) {
+        return CommonResult.success(algorithmBizProcessService.getProcessBySubtaskId(subtaskId));
+    }
 }

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

@@ -106,4 +106,9 @@ public class AlgorithmSubtaskController extends BaseController {
         }
         return CommonResult.success();
     }
+
+    @GetMapping("/getSubtaskByTaskId/{taskId}")
+    public CommonResult<List<AlgorithmSubtaskVo>> getSubtaskByTaskId(@PathVariable Long taskId) {
+        return CommonResult.success(algorithmSubtaskService.getSubtaskByTaskId(taskId));
+    }
 }

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

@@ -1,9 +1,12 @@
 package com.taais.biz.mapper;
 
 import com.mybatisflex.core.BaseMapper;
+import com.taais.biz.domain.vo.AlgorithmSubtaskVo;
 import org.apache.ibatis.annotations.Mapper;
 import com.taais.biz.domain.AlgorithmSubtask;
 
+import java.util.List;
+
 /**
  * 算法子任务Mapper接口
  *
@@ -13,4 +16,6 @@ import com.taais.biz.domain.AlgorithmSubtask;
 @Mapper
 public interface AlgorithmSubtaskMapper extends BaseMapper<AlgorithmSubtask> {
     AlgorithmSubtask getFirstNeedProcessSubtask(Long taskId);
+
+    List<AlgorithmSubtaskVo> getSubtaskByTaskId(Long taskId);
 }

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

@@ -65,4 +65,5 @@ public interface IAlgorithmSubtaskService extends IBaseService<AlgorithmSubtask>
 
     void subtaskRun(Long taskId);
 
+    List<AlgorithmSubtaskVo> getSubtaskByTaskId(Long taskId);
 }

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

@@ -8,11 +8,9 @@ import cn.hutool.core.util.ObjectUtil;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
 import com.taais.biz.constant.BizConstant;
-import com.taais.biz.controller.PublicController;
 import com.taais.biz.domain.dto.TaskResultDTO;
 import com.taais.common.core.utils.DateUtils;
 import com.taais.common.core.utils.MapstructUtils;
-import com.taais.common.core.utils.StringUtils;
 import com.taais.common.orm.core.page.PageQuery;
 import com.taais.common.core.core.page.PageResult;
 import com.taais.common.orm.core.service.impl.BaseServiceImpl;

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

@@ -179,6 +179,11 @@ public class AlgorithmSubtaskServiceImpl extends BaseServiceImpl<AlgorithmSubtas
         }
     }
 
+    @Override
+    public List<AlgorithmSubtaskVo> getSubtaskByTaskId(Long taskId) {
+        return mapper.getSubtaskByTaskId(taskId);
+    }
+
     private void bizProcess(List<AlgorithmBizProcessVo> bizProcessVoList) {
         Long algorithmId = null;
         Long modelId = null;

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

@@ -30,6 +30,6 @@
     </select>
 
     <select id="getProcessBySubtaskId" resultMap="AlgorithmBizProcessResultMap">
-        select * from algorithm_biz_process where sub_task_id = #{value}
+        select * from algorithm_biz_process where sub_task_id = #{value} order by index asc
     </select>
 </mapper>

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

@@ -25,5 +25,8 @@
 <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>
+<select id="getSubtaskByTaskId" parameterType="Long" resultMap="AlgorithmSubtaskResultMap">
+    select * from algorithm_subtask t where t.task_id = #{taskId} order by index asc
+</select>
 
 </mapper>