Sfoglia il codice sorgente

feat: 目标检测domain文件修改

WANGKANG 5 mesi fa
parent
commit
04f3e11487

+ 3 - 1
taais-modules/taais-biz/src/main/java/com/taais/biz/domain/TargetDetection.java

@@ -81,5 +81,7 @@ private static final long serialVersionUID = 1L;
     /** 模型的id */
     private Long algorithmModelId;
 
-
+    private String algorithmParameters;
+    private Long algorithmId;
+    private String logPath;
 }

+ 28 - 10
taais-modules/taais-biz/src/main/java/com/taais/biz/domain/bo/TargetDetectionBo.java

@@ -4,14 +4,19 @@
 
 package com.taais.biz.domain.bo;
 
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.taais.biz.domain.TargetDetection;
+import com.taais.common.orm.core.domain.BaseEntity;
 import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import jakarta.validation.constraints.*;
+
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.taais.common.orm.core.domain.BaseEntity;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * 目标检测业务对象 target_detection
@@ -22,7 +27,7 @@ import com.taais.common.orm.core.domain.BaseEntity;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = TargetDetection.class, reverseConvertGenerate = false)
-public class TargetDetectionBo extends BaseEntity{
+public class TargetDetectionBo extends BaseEntity {
     /**
      * ID
      */
@@ -36,12 +41,12 @@ public class TargetDetectionBo extends BaseEntity{
 
     /**
      * 状态
-        0:未开始
-        1:进行中
-        2:完成
-        3:失败
-        4:中断
-             */
+     * 0:未开始
+     * 1:进行中
+     * 2:完成
+     * 3:失败
+     * 4:中断
+     */
     private String status;
 
     /**
@@ -102,4 +107,17 @@ public class TargetDetectionBo extends BaseEntity{
      */
     @NotNull(message = "模型的id不能为空")
     private Long algorithmModelId;
+
+    private String algorithmParameters;
+    @NotNull(message = "算法不能为空")
+    private Long algorithmId;
+    private String logPath;
+
+    // 将其他参数存入Map
+    private Map<String, Object> otherParams = new HashMap<>();
+
+    @JsonAnySetter
+    public void addOtherParam(String name, Object value) {
+        this.otherParams.put(name, value);
+    }
 }

+ 8 - 6
taais-modules/taais-biz/src/main/java/com/taais/biz/domain/vo/TargetDetectionImportVo.java

@@ -1,17 +1,14 @@
 package com.taais.biz.domain.vo;
 
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.taais.common.excel.annotation.ExcelDictFormat;
 import com.taais.common.excel.convert.ExcelDictConvert;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serial;
 import java.io.Serializable;
-
-import lombok.NoArgsConstructor;
+import java.util.Date;
 
 /**
  * 目标检测导入视图对象 target_detection
@@ -119,5 +116,10 @@ public class TargetDetectionImportVo implements Serializable {
     @ExcelProperty(value = "模型的id")
     private Long algorithmModelId;
 
-
+    @ExcelProperty(value = "算法参数")
+    private String algorithmParameters;
+    @ExcelProperty(value = "算法id")
+    private Long algorithmId;
+    @ExcelProperty(value = "日志路径")
+    private String logPath;
 }

+ 10 - 6
taais-modules/taais-biz/src/main/java/com/taais/biz/domain/vo/TargetDetectionVo.java

@@ -1,21 +1,18 @@
 package com.taais.biz.domain.vo;
 
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.taais.biz.domain.TargetDetection;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.taais.biz.domain.TargetDetection;
 import com.taais.common.excel.annotation.ExcelDictFormat;
 import com.taais.common.excel.convert.ExcelDictConvert;
+import com.taais.common.orm.core.domain.BaseEntity;
 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;
+import java.util.Date;
 
 /**
  * 目标检测视图对象 target_detection
@@ -133,4 +130,11 @@ public class TargetDetectionVo extends BaseEntity implements Serializable {
     private String subsystem;
     private String algorithmName;
     private String modelName;
+
+    @ExcelProperty(value = "算法参数")
+    private String algorithmParameters;
+    @ExcelProperty(value = "算法id")
+    private Long algorithmId;
+    @ExcelProperty(value = "日志路径")
+    private String logPath;
 }