WANGKANG 9 сар өмнө
parent
commit
6c5611045e

+ 5 - 0
taais-modules/taais-biz/src/main/java/com/taais/biz/controller/AlgorithmModelTrackController.java

@@ -106,4 +106,9 @@ public class AlgorithmModelTrackController extends BaseController {
         }
         return CommonResult.success();
     }
+
+    @GetMapping("/enums")
+    public CommonResult<List<Object>> enums() {
+        return CommonResult.success(algorithmModelTrackService.enums());
+    }
 }

+ 2 - 0
taais-modules/taais-biz/src/main/java/com/taais/biz/domain/ToInfrared.java

@@ -98,4 +98,6 @@ public class ToInfrared extends BaseEntity {
     private String outputPath;
     private String zipFilePath;
 
+    private Long algorithmModelId;
+
 }

+ 7 - 7
taais-modules/taais-biz/src/main/java/com/taais/biz/domain/bo/ToInfraredBo.java

@@ -19,7 +19,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = ToInfrared.class, reverseConvertGenerate = false)
-public class ToInfraredBo extends BaseEntity{
+public class ToInfraredBo extends BaseEntity {
     /**
      * ID
      */
@@ -33,11 +33,11 @@ public class ToInfraredBo extends BaseEntity{
 
     /**
      * 状态
-        0:未开始
-        1:进行中
-        2:完成
-        3:失败
-        4:中断
+     * 0:未开始
+     * 1:进行中
+     * 2:完成
+     * 3:失败
+     * 4:中断
      */
     private String status;
 
@@ -89,5 +89,5 @@ public class ToInfraredBo extends BaseEntity{
      */
     private String outputPath;
 
-
+    private Long algorithmModelId;
 }

+ 1 - 0
taais-modules/taais-biz/src/main/java/com/taais/biz/domain/vo/AlgorithmModelTrackVo.java

@@ -64,4 +64,5 @@ private static final long serialVersionUID = 1L;
     private String system;
 
     private String algorithmType;
+    private String parameterConfig;
 }

+ 63 - 39
taais-modules/taais-biz/src/main/java/com/taais/biz/domain/vo/ToInfraredVo.java

@@ -42,54 +42,78 @@ public class ToInfraredVo extends BaseEntity implements Serializable {
     @ExcelProperty(value = "任务名称")
     private String name;
 
-    /** 状态
-     0:未开始
-     1:进行中
-     2:完成
-     3:失败
-     4:中断 */
+    /**
+     * 状态
+     * 0:未开始
+     * 1:进行中
+     * 2:完成
+     * 3:失败
+     * 4:中断
+     */
     @ExcelProperty(value = "状态 ")
-        private String status;
+    private String status;
 
-        /** 开始时间 */
-        @ExcelProperty(value = "开始时间")
-        private Date startTime;
+    /**
+     * 开始时间
+     */
+    @ExcelProperty(value = "开始时间")
+    private Date startTime;
 
-        /** 结束时间 */
-        @ExcelProperty(value = "结束时间")
-        private Date endTime;
+    /**
+     * 结束时间
+     */
+    @ExcelProperty(value = "结束时间")
+    private Date endTime;
 
-        /** 耗时 */
-        @ExcelProperty(value = "耗时")
-        private Long costSecond;
+    /**
+     * 耗时
+     */
+    @ExcelProperty(value = "耗时")
+    private Long costSecond;
 
-        /** 日志 */
-        @ExcelProperty(value = "日志")
-        private String log;
+    /**
+     * 日志
+     */
+    @ExcelProperty(value = "日志")
+    private String log;
 
-        /** 备注 */
-        @ExcelProperty(value = "备注")
-        private String remarks;
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remarks;
 
-        /** $column.columnComment */
-        @ExcelProperty(value = "${column.columnComment}")
-        private Integer delFlag;
+    /**
+     * $column.columnComment
+     */
+    @ExcelProperty(value = "${column.columnComment}")
+    private Integer delFlag;
 
-        /** $column.columnComment */
-        @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class)
-        @ExcelDictFormat(readConverterExp = "$column.readConverterExp()")
-        private String url;
+    /**
+     * $column.columnComment
+     */
+    @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "$column.readConverterExp()")
+    private String url;
 
-        /** $column.columnComment */
-        @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class)
-        @ExcelDictFormat(readConverterExp = "$column.readConverterExp()")
-        private Long inputOssId;
+    /**
+     * $column.columnComment
+     */
+    @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "$column.readConverterExp()")
+    private Long inputOssId;
 
-        /** 输入路径 */
-        @ExcelProperty(value = "输入路径")
-        private String inputPath;
+    /**
+     * 输入路径
+     */
+    @ExcelProperty(value = "输入路径")
+    private String inputPath;
+
+    /**
+     * 输出路径
+     */
+    @ExcelProperty(value = "输出路径")
+    private String outputPath;
 
-        /** 输出路径 */
-        @ExcelProperty(value = "输出路径")
-        private String outputPath;
+    private Long algorithmModelId;
 }

+ 1 - 0
taais-modules/taais-biz/src/main/java/com/taais/biz/service/IAlgorithmModelTrackService.java

@@ -63,4 +63,5 @@ public interface IAlgorithmModelTrackService extends IBaseService<AlgorithmModel
      */
     boolean deleteByIds(Long[] ids);
 
+    List<Object> enums();
 }

+ 28 - 1
taais-modules/taais-biz/src/main/java/com/taais/biz/service/impl/AlgorithmModelTrackServiceImpl.java

@@ -1,6 +1,8 @@
 package com.taais.biz.service.impl;
 
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 
 import cn.hutool.core.util.ObjectUtil;
@@ -83,8 +85,16 @@ public class AlgorithmModelTrackServiceImpl extends BaseServiceImpl<AlgorithmMod
      */
     @Override
     public AlgorithmModelTrackVo selectById(Long id) {
-        return this.getOneAs(query().where(ALGORITHM_MODEL_TRACK.ID.eq(id)), AlgorithmModelTrackVo.class);
+        AlgorithmModelTrackVo algorithmModelTrackVo =  this.getOneAs(query().where(ALGORITHM_MODEL_TRACK.ID.eq(id)), AlgorithmModelTrackVo.class);
 
+        Long algorithmId = algorithmModelTrackVo.getAlgorithmId();
+
+        AlgorithmConfigTrackVo algorithmConfigTrackVo = algorithmConfigTrackService.selectById(algorithmId);
+        String parameterConfig = algorithmConfigTrackVo.getParameterConfig();
+
+        algorithmModelTrackVo.setParameterConfig(parameterConfig);
+
+        return algorithmModelTrackVo;
     }
 
     /**
@@ -166,4 +176,21 @@ public class AlgorithmModelTrackServiceImpl extends BaseServiceImpl<AlgorithmMod
         return this.removeByIds(Arrays.asList(ids));
     }
 
+    @Override
+    public List<Object> enums() {
+        List<AlgorithmModelTrack> algorithmModelTracks = algorithmModelTrackMapper.selectAll();
+
+        List<Object> result = new ArrayList<>();
+
+        for (AlgorithmModelTrack algorithmModelTrack : algorithmModelTracks) {
+            HashMap<String, Object> map = new HashMap<>();
+            map.put("value", algorithmModelTrack.getId());
+            map.put("label", algorithmModelTrack.getModelName());
+
+            result.add(map);
+        }
+
+        return result;
+    }
+
 }

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

@@ -175,6 +175,8 @@ public class ToInfraredServiceImpl extends BaseServiceImpl<ToInfraredMapper, ToI
         toInfrared.setStatus(NOT_START);
         toInfrared.setRemarks(toInfraredBo.getRemarks());
 
+        toInfrared.setAlgorithmModelId(toInfraredBo.getAlgorithmModelId());
+
         return this.save(toInfrared);// 使用全局配置的雪花算法主键生成器生成ID值
     }