feat: 后端注释轨迹优化

taais-modules/taais-biz/src/main/java/com/taais/biz/domain/vo/TrackSequenceVo.java

@@ -1,6 +1,7 @@
 package com.taais.biz.domain.vo;
 
 import java.util.Date;
+
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.taais.biz.domain.TrackSequence;
@@ -9,8 +10,10 @@ import com.taais.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import java.io.Serial;
 import java.io.Serializable;
+
 import com.taais.common.orm.core.domain.BaseEntity;
 
 /**
@@ -25,71 +28,104 @@ import com.taais.common.orm.core.domain.BaseEntity;
 @AutoMapper(target = TrackSequence.class)
 public class TrackSequenceVo extends BaseEntity implements Serializable {
 
-@Serial
-private static final long serialVersionUID = 1L;
+    @Serial
+    private static final long serialVersionUID = 1L;
 
-    /** ID */
+    /**
+     * ID
+     */
     @ExcelProperty(value = "ID")
     private Long id;
 
-    /** 任务名称 */
+    /**
+     * 任务名称
+     */
     @ExcelProperty(value = "任务名称")
     private String name;
 
-    /** 状态
-0：未开始
-1：进行中
-2：完成
-3：失败
-4：中断 */
+    /**
+     * 状态
+     * 0：未开始
+     * 1：进行中
+     * 2：完成
+     * 3：失败
+     * 4：中断
+     */
     @ExcelProperty(value = "状态")
     private String status;
 
-    /** 开始时间 */
+    /**
+     * 开始时间
+     */
     @ExcelProperty(value = "开始时间")
     private Date startTime;
 
-    /** 结束时间 */
+    /**
+     * 结束时间
+     */
     @ExcelProperty(value = "结束时间")
     private Date endTime;
 
-    /** 耗时 */
+    /**
+     * 耗时
+     */
     @ExcelProperty(value = "耗时")
     private Long costSecond;
 
-    /** 日志 */
+    /**
+     * 日志
+     */
     @ExcelProperty(value = "日志")
     private String log;
 
-    /** 备注 */
+    /**
+     * 备注
+     */
     @ExcelProperty(value = "备注")
     private String remarks;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @ExcelProperty(value = "${column.columnComment}")
     private Integer delFlag;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class)
     @ExcelDictFormat(readConverterExp = "$column.readConverterExp()")
     private String url;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class)
     @ExcelDictFormat(readConverterExp = "$column.readConverterExp()")
     private Long inputOssId;
 
-    /** 输入路径 */
+    /**
+     * 输入路径
+     */
     @ExcelProperty(value = "输入路径")
     private String inputPath;
 
-    /** 输出路径 */
+    /**
+     * 输出路径
+     */
     @ExcelProperty(value = "输出路径")
     private String outputPath;
 
-    /** zip文件输出路径 */
+    /**
+     * zip文件输出路径
+     */
     @ExcelProperty(value = "zip文件输出路径")
     private String zipFilePath;
 
     private Long algorithmModelId;
+
+    private String type;
+    private String subsystem;
+    private String algorithmName;
+    private String modelName;
 }

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

@@ -136,11 +136,13 @@ public class TargetDetectionServiceImpl extends BaseServiceImpl<TargetDetectionM
         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());
+            if (ObjectUtil.isNotNull(model)) {
+                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);
     }

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

@@ -138,11 +138,13 @@ public class ToInfraredServiceImpl extends BaseServiceImpl<ToInfraredMapper, ToI
         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());
+            if (ObjectUtil.isNotNull(model)) {
+                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);
     }

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

@@ -12,6 +12,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.utils.ZipUtils;
 import com.taais.common.core.config.TaaisConfig;
@@ -134,6 +136,17 @@ public class TrackSequenceServiceImpl extends BaseServiceImpl<TrackSequenceMappe
     public PageResult<TrackSequenceVo> selectPage(TrackSequenceBo trackSequenceBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(trackSequenceBo);
         Page<TrackSequenceVo> page = this.pageAs(PageQuery.build(), queryWrapper, TrackSequenceVo.class);
+        page.getRecords().forEach(entity -> {
+            Long modelId = entity.getAlgorithmModelId();
+            AlgorithmModelTrackVo model = algorithmModelTrackService.selectById(modelId);
+            if (ObjectUtil.isNotNull(model)) {
+                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);
     }
 
@@ -244,9 +257,9 @@ public class TrackSequenceServiceImpl extends BaseServiceImpl<TrackSequenceMappe
         StartToInfraredTask startToInfraredTask = new StartToInfraredTask();
         startToInfraredTask.setBizId(trackSequence.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(trackSequence.getInputPath());