二级评估接口开发

pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/dto/assess/AssessTreeDTO.java

@@ -0,0 +1,20 @@
+package com.njcn.advance.pojo.dto.assess;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author: cdf
+ * @CreateTime: 2025-06-13
+ * @Description: 左侧树
+ */
+@Data
+public class AssessTreeDTO {
+
+    private String treeId;
+
+    private String treeName;
+
+    private List<AssessTreeDTO> children;
+}

pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/param/assess/AssessDicHarmonicCharacterQuery.java

@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
 
 /**
@@ -21,7 +22,7 @@ import java.math.BigDecimal;
 @Getter
 @Setter
 @TableName("assess_dic_harmonic_character")
-public class AssessDicHarmonicCharacterQuery extends BaseParam {
+public class AssessDicHarmonicCharacterQuery extends BaseParam implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/param/assess/AssessDicShockLoadQuery.java

@@ -10,6 +10,8 @@ import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.math.BigDecimal;
 
@@ -23,22 +25,22 @@ import java.math.BigDecimal;
  */
 @Getter
 @Setter
-@TableName("assess_dic_shock_load")
 @ApiModel(value = "AssessDicShockLoadQuery", description = "冲击负荷字典查询参数")
 public class AssessDicShockLoadQuery extends BaseParam implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "冲击负荷类型ID，例：d19c10178eeb4da2bca1df18a050524d", required = true)
-    private String inpactloadtypeId;
 
     @ApiModelProperty(value = "冲击负荷类型名称，例：电机", required = true)
+    @NotBlank(message = "冲击负荷类型名称不可为空")
     private String inpactloadtypeName;
 
     @ApiModelProperty(value = "冲击负荷启动方式，例：直接启动")
+    @NotBlank(message = "冲击负荷启动方式不可为空")
     private String inpactloadStartup;
 
     @ApiModelProperty(value = "冲击负荷启动容量倍数，例：4")
+    @NotNull(message = "冲击负荷启动容量倍数不可为空")
     private BigDecimal inpactloadMultiple;
 
     /**
@@ -50,6 +52,7 @@ public class AssessDicShockLoadQuery extends BaseParam implements Serializable {
     public static class UpdateAssessDicShockLoadQuery extends AssessDicShockLoadQuery {
 
         @ApiModelProperty(value = "冲击负荷类型ID（更新时必填），例：d19c10178eeb4da2bca1df18a050524d", required = true)
+        @NotBlank(message = "冲击负荷类型ID不可为空")
         private String inpactloadtypeId;
     }
 }

pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/param/assess/AssessUserQuery.java

@@ -14,6 +14,7 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * <p>
@@ -31,9 +32,13 @@ public class AssessUserQuery extends BaseParam implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "评估用户名称", required = true)
-    @NotBlank(message = "所属部门名称不可为空")
+    @NotBlank(message = "评估用户名称不可为空")
     private String assessName;
 
+    @ApiModelProperty(value = "所属部门id，例：南京市供电公司", required = true)
+    @NotBlank(message = "所属部门id不可为空")
+    private String deptId;
+
     @ApiModelProperty(value = "所属部门名称，例：南京市供电公司", required = true)
     @NotBlank(message = "所属部门名称不可为空")
     private String deptName;
@@ -66,6 +71,8 @@ public class AssessUserQuery extends BaseParam implements Serializable {
     @NotBlank(message = "变电站电压等级不可为空")
     private String powerstationScale;
 
+    private List<String> powerstationScaleList;
+
     @ApiModelProperty(value = "母线ID，例：0012030456")
     private String busId;
 
@@ -75,6 +82,8 @@ public class AssessUserQuery extends BaseParam implements Serializable {
     @ApiModelProperty(value = "母线电压等级，例：32。与PMS3.0内电压等级编码保持一致。")
     private String busScale;
 
+    private List<String> busScaleList;
+
     @ApiModelProperty(value = "线路ID，例：0012030456")
     private String lineId;
 

pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/po/assess/AssessUser.java

@@ -30,6 +30,17 @@ public class AssessUser extends BaseEntity implements Serializable  {
     @TableId(value = "assess_id",type = IdType.ASSIGN_UUID)
     private String assessId;
 
+
+    /**
+     * 部门id
+     */
+    private String deptId;
+
+    /**
+     * 评估用户名称
+     */
+    private String assessName;
+
     /**
      * 所属部门名称，例：南京市供电公司
      */