|
@@ -11,6 +11,8 @@ import com.mybatisflex.core.paginate.Page;
|
|
|
import com.mybatisflex.core.query.QueryWrapper;
|
|
|
import com.taais.biz.constant.BizConstant;
|
|
|
import com.taais.biz.domain.*;
|
|
|
+import com.taais.biz.domain.vo.AlgorithmConfigTrackVo;
|
|
|
+import com.taais.biz.domain.vo.AlgorithmModelTrackVo;
|
|
|
import com.taais.biz.domain.vo.StartToInfraredTask;
|
|
|
import com.taais.biz.mapper.ToInfraredMapper;
|
|
|
import com.taais.biz.utils.ZipUtils;
|
|
@@ -131,6 +133,15 @@ public class TargetDetectionServiceImpl extends BaseServiceImpl<TargetDetectionM
|
|
|
public PageResult<TargetDetectionVo> selectPage(TargetDetectionBo targetDetectionBo) {
|
|
|
QueryWrapper queryWrapper = buildQueryWrapper(targetDetectionBo);
|
|
|
Page<TargetDetectionVo> page = this.pageAs(PageQuery.build(), queryWrapper, TargetDetectionVo.class);
|
|
|
+ page.getRecords().forEach(entity -> {
|
|
|
+ Long modelId = entity.getAlgorithmModelId();
|
|
|
+ AlgorithmModelTrackVo model = algorithmModelTrackService.selectById(modelId);
|
|
|
+ AlgorithmConfigTrackVo config = algorithmConfigTrackService.selectById(model.getAlgorithmId());
|
|
|
+ entity.setType(config.getType());
|
|
|
+ entity.setSubsystem(config.getSubsystem());
|
|
|
+ entity.setAlgorithmName(config.getAlgorithmName());
|
|
|
+ entity.setModelName(model.getModelName());
|
|
|
+ });
|
|
|
return PageResult.build(page);
|
|
|
}
|
|
|
|
|
@@ -241,9 +252,9 @@ public class TargetDetectionServiceImpl extends BaseServiceImpl<TargetDetectionM
|
|
|
StartToInfraredTask startToInfraredTask = new StartToInfraredTask();
|
|
|
startToInfraredTask.setBizId(targetDetection.getId());
|
|
|
|
|
|
- // if (algorithmConfigTrack.getType() == AlgorithmType.TRAIN) {
|
|
|
- startToInfraredTask.setModel_path(algorithmModelTrack.getModelAddress());
|
|
|
- // }
|
|
|
+ if (algorithmConfigTrack.getType() == BizConstant.AlgorithmType.REASONING) {
|
|
|
+ startToInfraredTask.setModel_path(algorithmModelTrack.getModelAddress());
|
|
|
+ }
|
|
|
|
|
|
startToInfraredTask.setOtherParams(algorithmConfigTrack.getParameterConfig());
|
|
|
startToInfraredTask.setSource_dir(targetDetection.getInputPath());
|