瀏覽代碼

feat: 子任务列表查看功能

WANGKANG 5 月之前
父節點
當前提交
58655f464c

+ 41 - 8
taais-modules/taais-biz/src/main/java/com/taais/biz/service/impl/AlgorithmTaskTrackServiceImpl.java

@@ -3,12 +3,15 @@ package com.taais.biz.service.impl;
 import cn.hutool.core.util.ObjectUtil;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
+import com.taais.biz.domain.AlgorithmModelTrack;
 import com.taais.biz.domain.AlgorithmTaskTrack;
 import com.taais.biz.domain.ToInfrared;
 import com.taais.biz.domain.TrackSequence;
 import com.taais.biz.domain.bo.AlgorithmTaskTrackBo;
 import com.taais.biz.domain.bo.ToInfraredBo;
 import com.taais.biz.domain.bo.TrackSequenceBo;
+import com.taais.biz.domain.vo.AlgorithmConfigTrackVo;
+import com.taais.biz.domain.vo.AlgorithmSubTaskTrackVo;
 import com.taais.biz.domain.vo.AlgorithmTaskTrackVo;
 import com.taais.biz.mapper.AlgorithmTaskTrackMapper;
 import com.taais.biz.service.IAlgorithmTaskTrackService;
@@ -22,16 +25,14 @@ import com.taais.common.orm.core.service.impl.BaseServiceImpl;
 import com.taais.system.domain.SysOss;
 import com.taais.system.service.impl.SysOssServiceImpl;
 import jakarta.annotation.Resource;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import static com.taais.biz.domain.table.AlgorithmTaskTrackTableDef.ALGORITHM_TASK_TRACK;
 
@@ -284,13 +285,45 @@ public class AlgorithmTaskTrackServiceImpl extends BaseServiceImpl<AlgorithmTask
         return this.removeByIds(Arrays.asList(ids));
     }
 
+    public AlgorithmSubTaskTrackVo setSubTaskVo(Long modelId, Long algorithmId, AlgorithmSubTaskTrackVo subTaskVo) {
+        if (ObjectUtil.isNotNull(modelId)) {
+            AlgorithmModelTrack model = algorithmModelTrackService.getById(modelId);
+            subTaskVo.setModelName(model.getModelName());
+        }
+
+        if (ObjectUtil.isNotNull(algorithmId)) {
+            AlgorithmConfigTrackVo config = algorithmConfigTrackService.selectById(algorithmId);
+            subTaskVo.setType(config.getType());
+            subTaskVo.setSubsystem(config.getSubsystem());
+            subTaskVo.setAlgorithmName(config.getAlgorithmName());
+        }
+
+        return subTaskVo;
+    }
+
     @Override
     public CommonResult listSubTask(Long id) {
         List<ToInfrared> toInfraredList = toInfraredService.getByParentTaskId(id);
         List<TrackSequence> trackSequenceList = trackSequenceService.getByParentTaskId(id);
-        Map<String, Object> result = new HashMap<>();
-        result.put("toInfraredList", toInfraredList);
-        result.put("trackSequenceList", trackSequenceList);
-        return CommonResult.success(result);
+
+        List<AlgorithmSubTaskTrackVo> subTaskVoList = new ArrayList<>();
+        if (ObjectUtil.isNotEmpty(toInfraredList)) {
+            for (ToInfrared toInfrared : toInfraredList) {
+                AlgorithmSubTaskTrackVo subTaskVo = new AlgorithmSubTaskTrackVo();
+                BeanUtils.copyProperties(toInfrared, subTaskVo);
+                subTaskVo = setSubTaskVo(toInfrared.getAlgorithmModelId(), toInfrared.getAlgorithmId(), subTaskVo);
+                subTaskVoList.add(subTaskVo);
+            }
+        }
+
+        if (ObjectUtil.isNotEmpty(trackSequenceList)) {
+            for (TrackSequence trackSequence : trackSequenceList) {
+                AlgorithmSubTaskTrackVo subTaskVo = new AlgorithmSubTaskTrackVo();
+                BeanUtils.copyProperties(trackSequence, subTaskVo);
+                subTaskVo = setSubTaskVo(trackSequence.getAlgorithmModelId(), trackSequence.getAlgorithmId(), subTaskVo);
+                subTaskVoList.add(subTaskVo);
+            }
+        }
+        return CommonResult.success(subTaskVoList);
     }
 }