二级评估接口开发

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;
+
     /**
      * 所属部门名称，例：南京市供电公司
      */

pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/assess/AssessCapacitorParamController.java

@@ -94,8 +94,8 @@ public class AssessCapacitorParamController extends BaseController {
     @ApiOperation("删除评估电容器参数")
     @ApiImplicitParam(name = "capacitorId", value = "电容器组ID", required = true, type = "String")
     @PostMapping("/delete")
-    public HttpResult<Boolean> delete(@RequestParam("capacitorId") String capacitorId) {
+    public HttpResult<Boolean> delete(@RequestBody List<String> capacitorId) {
-        boolean result = assessCapacitorParamService.removeById(capacitorId);
+        boolean result = assessCapacitorParamService.removeByIds(capacitorId);
         return HttpResultUtil.assembleResult(CommonResponseEnum.SUCCESS.getCode(), result,
                 CommonResponseEnum.SUCCESS.getMessage());
     }

pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/assess/AssessDicCableTypeController.java

@@ -1,5 +1,6 @@
 package com.njcn.advance.controller.assess;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -57,8 +58,8 @@ public class AssessDicCableTypeController extends BaseController {
                 PageFactory.getPageSize(query)
         );
         LambdaQueryWrapper<AssessDicCableType> wrapper = Wrappers.<AssessDicCableType>lambdaQuery()
-                .like(query.getLinetypeName() != null, AssessDicCableType::getLinetypeName, query.getLinetypeName())
+                .like(StrUtil.isNotBlank(query.getSearchValue()), AssessDicCableType::getLinetypeName, query.getSearchValue())
-                .eq(query.getLinetypeType() != null, AssessDicCableType::getLinetypeType, query.getLinetypeType());
+                .eq(StrUtil.isNotBlank(query.getLinetypeType()), AssessDicCableType::getLinetypeType, query.getLinetypeType());
         Page<AssessDicCableType> pageData = assessDicCableTypeService.page(pageParam, wrapper);
         return HttpResultUtil.assembleResult(CommonResponseEnum.SUCCESS.getCode(), pageData,
                 CommonResponseEnum.SUCCESS.getMessage());
@@ -92,8 +93,8 @@ public class AssessDicCableTypeController extends BaseController {
     @ApiOperation("删除线缆类型字典")
     @ApiImplicitParam(name = "linetypeId", value = "线路线缆类型ID", required = true, type = "String")
     @PostMapping("/delete")
-    public HttpResult<Boolean> delete(@RequestParam("linetypeId") String linetypeId) {
+    public HttpResult<Boolean> delete(@RequestBody  List<String> linetypeId) {
-        boolean result = assessDicCableTypeService.removeById(linetypeId);
+        boolean result = assessDicCableTypeService.removeByIds(linetypeId);
         return HttpResultUtil.assembleResult(CommonResponseEnum.SUCCESS.getCode(), result,
                 CommonResponseEnum.SUCCESS.getMessage());
     }

pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/assess/AssessDicHarmonicCharacterController.java

@@ -1,5 +1,6 @@
 package com.njcn.advance.controller.assess;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -56,7 +57,7 @@ public class AssessDicHarmonicCharacterController extends BaseController {
                 PageFactory.getPageSize(query)
         );
         LambdaQueryWrapper<AssessDicHarmonicCharacter> wrapper = Wrappers.<AssessDicHarmonicCharacter>lambdaQuery()
-                .like(query.getHarmName() != null, AssessDicHarmonicCharacter::getHarmName, query.getHarmName());
+                .like(StrUtil.isNotBlank(query.getSearchValue()), AssessDicHarmonicCharacter::getHarmName, query.getSearchValue());
         Page<AssessDicHarmonicCharacter> pageData = assessDicHarmonicCharacterService.page(pageParam, wrapper);
         return HttpResultUtil.assembleResult(CommonResponseEnum.SUCCESS.getCode(), pageData,
                 CommonResponseEnum.SUCCESS.getMessage());
@@ -90,8 +91,8 @@ public class AssessDicHarmonicCharacterController extends BaseController {
     @ApiOperation("删除谐波源特性字典")
     @ApiImplicitParam(name = "harmId", value = "谐波源特性字典ID", required = true, type = "String")
     @PostMapping("/delete")
-    public HttpResult<Boolean> delete(@RequestParam("harmId") String harmId) {
+    public HttpResult<Boolean> delete(@RequestBody List<String> harmId) {
-        boolean result = assessDicHarmonicCharacterService.removeById(harmId);
+        boolean result = assessDicHarmonicCharacterService.removeByIds(harmId);
         return HttpResultUtil.assembleResult(CommonResponseEnum.SUCCESS.getCode(), result,
                 CommonResponseEnum.SUCCESS.getMessage());
     }

pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/assess/AssessDicShockLoadController.java

@@ -1,5 +1,6 @@
 package com.njcn.advance.controller.assess;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -57,8 +58,8 @@ public class AssessDicShockLoadController extends BaseController {
                 PageFactory.getPageSize(query)
         );
         LambdaQueryWrapper<AssessDicShockLoad> wrapper = Wrappers.<AssessDicShockLoad>lambdaQuery()
-                .like(query.getInpactloadtypeName() != null, AssessDicShockLoad::getInpactloadtypeName, query.getInpactloadtypeName())
+                .like(StrUtil.isNotBlank(query.getSearchValue()), AssessDicShockLoad::getInpactloadtypeName, query.getSearchValue())
-                .eq(query.getInpactloadStartup() != null, AssessDicShockLoad::getInpactloadStartup, query.getInpactloadStartup());
+                .eq(StrUtil.isNotBlank(query.getInpactloadStartup()), AssessDicShockLoad::getInpactloadStartup, query.getInpactloadStartup());
         Page<AssessDicShockLoad> pageData = assessDicShockLoadService.page(pageParam, wrapper);
         return HttpResultUtil.assembleResult(CommonResponseEnum.SUCCESS.getCode(), pageData,
                 CommonResponseEnum.SUCCESS.getMessage());
@@ -92,8 +93,8 @@ public class AssessDicShockLoadController extends BaseController {
     @ApiOperation("删除冲击负荷字典")
     @ApiImplicitParam(name = "inpactloadtypeId", value = "冲击负荷类型ID", required = true, type = "String")
     @PostMapping("/delete")
-    public HttpResult<Boolean> delete(@RequestParam("inpactloadtypeId") String inpactloadtypeId) {
+    public HttpResult<Boolean> delete(@RequestBody List<String> inpactloadtypeId) {
-        boolean result = assessDicShockLoadService.removeById(inpactloadtypeId);
+        boolean result = assessDicShockLoadService.removeByIds(inpactloadtypeId);
         return HttpResultUtil.assembleResult(CommonResponseEnum.SUCCESS.getCode(), result,
                 CommonResponseEnum.SUCCESS.getMessage());
     }

pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/assess/AssessDicTransformerController.java

@@ -1,5 +1,6 @@
 package com.njcn.advance.controller.assess;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -58,9 +59,8 @@ public class AssessDicTransformerController extends BaseController {
                 PageFactory.getPageSize(query)
         );
         LambdaQueryWrapper<AssessDicTransformer> wrapper = Wrappers.<AssessDicTransformer>lambdaQuery()
-                .like(query.getTranstypeName() != null, AssessDicTransformer::getTranstypeName, query.getTranstypeName())
+                .like(StrUtil.isNotBlank(query.getSearchValue()), AssessDicTransformer::getTranstypeName, query.getSearchValue())
-                .eq(query.getTranshighScale() != null, AssessDicTransformer::getTranshighScale, query.getTranshighScale())
+                .orderByDesc(AssessDicTransformer::getCreateTime);
-                .eq(query.getTranslowScale() != null, AssessDicTransformer::getTranslowScale, query.getTranslowScale());
         Page<AssessDicTransformer> pageData = assessDicTransformerService.page(pageParam, wrapper);
         return HttpResultUtil.assembleResult(CommonResponseEnum.SUCCESS.getCode(), pageData,
                 CommonResponseEnum.SUCCESS.getMessage());
@@ -94,8 +94,8 @@ public class AssessDicTransformerController extends BaseController {
     @ApiOperation("删除变压器参数字典")
     @ApiImplicitParam(name = "transtypeId", value = "变压器类型ID", required = true, type = "String")
     @PostMapping("/delete")
-    public HttpResult<Boolean> delete(@RequestParam("transtypeId") String transtypeId) {
+    public HttpResult<Boolean> delete(@RequestBody List<String> transtypeId) {
-        boolean result = assessDicTransformerService.removeById(transtypeId);
+        boolean result = assessDicTransformerService.removeByIds(transtypeId);
         return HttpResultUtil.assembleResult(CommonResponseEnum.SUCCESS.getCode(), result,
                 CommonResponseEnum.SUCCESS.getMessage());
     }

pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/assess/AssessLoadParamController.java

@@ -92,8 +92,8 @@ public class AssessLoadParamController extends BaseController {
     @ApiOperation("删除评估用户负荷参数")
     @ApiImplicitParam(name = "loadId", value = "用户负荷ID", required = true, type = "String")
     @PostMapping("/delete")
-    public HttpResult<Boolean> delete(@RequestParam("loadId") String loadId) {
+    public HttpResult<Boolean> delete(@RequestBody List<String> loadId) {
-        boolean result = assessLoadParamService.removeById(loadId);
+        boolean result = assessLoadParamService.removeByIds(loadId);
         return HttpResultUtil.assembleResult(CommonResponseEnum.SUCCESS.getCode(), result,
                 CommonResponseEnum.SUCCESS.getMessage());
     }

pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/assess/AssessShockLoadParamController.java

@@ -94,8 +94,8 @@ public class AssessShockLoadParamController extends BaseController {
     @ApiOperation("删除评估用户冲击负荷参数")
     @ApiImplicitParam(name = "inpactloadId", value = "冲击负荷ID", required = true, type = "String")
     @PostMapping("/delete")
-    public HttpResult<Boolean> delete(@RequestParam("inpactloadId") String inpactloadId) {
+    public HttpResult<Boolean> delete(@RequestBody List<String> inpactloadId) {
-        boolean result = assessShockLoadParamService.removeById(inpactloadId);
+        boolean result = assessShockLoadParamService.removeByIds(inpactloadId);
         return HttpResultUtil.assembleResult(CommonResponseEnum.SUCCESS.getCode(), result,
                 CommonResponseEnum.SUCCESS.getMessage());
     }

pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/assess/AssessTransformerParamController.java

@@ -94,8 +94,8 @@ public class AssessTransformerParamController extends BaseController {
     @ApiOperation("删除评估变压器参数")
     @ApiImplicitParam(name = "transId", value = "变压器ID", required = true, type = "String")
     @PostMapping("/delete")
-    public HttpResult<Boolean> delete(@RequestParam("transId") String transId) {
+    public HttpResult<Boolean> delete(@RequestBody List<String> transId) {
-        boolean result = assessTransformerParamService.removeById(transId);
+        boolean result = assessTransformerParamService.removeByIds(transId);
         return HttpResultUtil.assembleResult(CommonResponseEnum.SUCCESS.getCode(), result,
                 CommonResponseEnum.SUCCESS.getMessage());
     }

pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/assess/AssessUserController.java

@@ -1,6 +1,7 @@
 package com.njcn.advance.controller.assess;
 
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -52,11 +53,7 @@ public class AssessUserController extends BaseController {
     @ApiOperation("分页查询评估用户")
     @PostMapping("/page")
     public HttpResult<Page<AssessUser>> page(@RequestBody AssessUserQuery assessUserQuery) {
-        Page<AssessUser> pageParam = new Page<>(PageFactory.getPageNum(assessUserQuery), PageFactory.getPageSize(assessUserQuery));
+        Page<AssessUser> pageData = assessUserService.page(assessUserQuery);
-        LambdaQueryWrapper<AssessUser> wrapper = Wrappers.<AssessUser>lambdaQuery()
-                .like(assessUserQuery.getDeptName() != null, AssessUser::getDeptName, assessUserQuery.getDeptName())
-                .like(assessUserQuery.getUserScale() != null, AssessUser::getUserScale, assessUserQuery.getUserScale());
-        Page<AssessUser> pageData = assessUserService.page(pageParam, wrapper);
         return HttpResultUtil.assembleResult(CommonResponseEnum.SUCCESS.getCode(), pageData,CommonResponseEnum.SUCCESS.getMessage());
     }
 
@@ -70,9 +67,13 @@ public class AssessUserController extends BaseController {
 
     @ApiOperation("新增评估用户")
     @PostMapping("add")
-    public HttpResult<Boolean> add(@RequestBody @Validated AssessUserQuery assessUser) {
+    public HttpResult<String> add(@RequestBody @Validated AssessUserQuery assessUser) {
-        boolean result = assessUserService.add(assessUser);
+        String result = assessUserService.add(assessUser);
+        if(StrUtil.isNotBlank(result)){
             return HttpResultUtil.assembleResult(CommonResponseEnum.SUCCESS.getCode(), result,CommonResponseEnum.SUCCESS.getMessage());
+        }else {
+            return HttpResultUtil.assembleResult(CommonResponseEnum.FAIL.getCode(), null,CommonResponseEnum.FAIL.getMessage());
+        }
     }
 
     @ApiOperation("修改评估用户")

pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/assess/AssessWindLoadParamController.java

@@ -92,8 +92,8 @@ public class AssessWindLoadParamController extends BaseController {
     @ApiOperation("删除风电场类负荷参数")
     @ApiImplicitParam(name = "windgeneratorId", value = "风力发电机ID", required = true, type = "String")
     @PostMapping("/delete")
-    public HttpResult<Boolean> delete(@RequestParam("windgeneratorId") String windgeneratorId) {
+    public HttpResult<Boolean> delete(@RequestBody List<String> windgeneratorId) {
-        boolean result = assessWindLoadParamService.removeById(windgeneratorId);
+        boolean result = assessWindLoadParamService.removeByIds(windgeneratorId);
         return HttpResultUtil.assembleResult(CommonResponseEnum.SUCCESS.getCode(), result,
                 CommonResponseEnum.SUCCESS.getMessage());
     }

pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/assess/SecondaryEvaluationController.java

@@ -2,6 +2,7 @@ package com.njcn.advance.controller.assess;
 
 import com.njcn.advance.pojo.carrycapacity.param.CarryCapacityQueryDataParam;
 import com.njcn.advance.pojo.carrycapacity.vo.CarryCapacityDataVO;
+import com.njcn.advance.pojo.dto.assess.AssessTreeDTO;
 import com.njcn.advance.service.assess.SecondaryEvaluationService;
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.enums.common.LogEnum;
@@ -17,6 +18,8 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.List;
+
 /**
  * Description:
  * Date: 2025/06/06  下午 2:43【需求编号】
@@ -39,4 +42,15 @@ public class SecondaryEvaluationController extends BaseController {
         secondaryEvaluationService.evaluation(assessId,file);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,true , methodDescribe);
     }
+
+
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/evaluationTree")
+    @ApiOperation("评估-树")
+    public HttpResult<Boolean> evaluationTree(@RequestParam("deptId")String deptId) {
+        String methodDescribe = getMethodDescribe("evaluationTree");
+        List<AssessTreeDTO> tree =  secondaryEvaluationService.evaluationTree(deptId);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,true , methodDescribe);
+    }
 }

pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/IAssessUserService.java

@@ -1,5 +1,6 @@
 package com.njcn.advance.service.assess;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.advance.pojo.param.assess.AssessUserQuery;
 import com.njcn.advance.pojo.po.assess.AssessUser;
@@ -15,6 +16,13 @@ import java.util.List;
  * @since 2025-06-06
  */
 public interface IAssessUserService extends IService<AssessUser> {
+
+    /**
+     * 根据评估ID查询用户信息
+
+     */
+    Page<AssessUser> page(AssessUserQuery assessUserQuery);
+
     /**
      * 根据评估ID查询用户信息
      *
@@ -29,7 +37,7 @@ public interface IAssessUserService extends IService<AssessUser> {
      * @param assessUserQuery 评估用户
      * @return 是否插入成功
      */
-    boolean add(AssessUserQuery assessUserQuery);
+    String add(AssessUserQuery assessUserQuery);
 
     /**
      * 批量更新评估用户数据

pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/SecondaryEvaluationService.java

@@ -1,7 +1,10 @@
 package com.njcn.advance.service.assess;
 
+import com.njcn.advance.pojo.dto.assess.AssessTreeDTO;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.List;
+
 /**
  * Description:
  * Date: 2025/06/06  下午 3:22【需求编号】
@@ -11,4 +14,6 @@ import org.springframework.web.multipart.MultipartFile;
  */
 public interface SecondaryEvaluationService {
     void evaluation(String assessId, MultipartFile file);
+
+    List<AssessTreeDTO> evaluationTree(String deptId);
 }

pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/AssessUserServiceImpl.java

@@ -1,11 +1,20 @@
 package com.njcn.advance.service.assess.impl;
 
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.advance.mapper.assess.AssessUserMapper;
 import com.njcn.advance.pojo.param.assess.AssessUserQuery;
 import com.njcn.advance.pojo.po.assess.AssessUser;
 import com.njcn.advance.service.assess.IAssessUserService;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.web.factory.PageFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
@@ -23,17 +32,32 @@ import java.util.List;
 @Service
 public class AssessUserServiceImpl extends ServiceImpl<AssessUserMapper, AssessUser> implements IAssessUserService {
 
+    @Override
+    public Page<AssessUser> page(AssessUserQuery assessUserQuery) {
+        Page<AssessUser> pageParam = new Page<>(PageFactory.getPageNum(assessUserQuery), PageFactory.getPageSize(assessUserQuery));
+        LambdaQueryWrapper<AssessUser> wrapper = Wrappers.<AssessUser>lambdaQuery()
+                .eq(StrUtil.isNotBlank(assessUserQuery.getDeptName()), AssessUser::getDeptName, assessUserQuery.getDeptName())
+                .in(CollUtil.isNotEmpty(assessUserQuery.getBusScaleList()),AssessUser::getBusId,assessUserQuery.getBusScaleList())
+                .in(CollUtil.isNotEmpty(assessUserQuery.getPowerstationScaleList()),AssessUser::getPowerstationScale,assessUserQuery.getPowerstationScaleList())
+                .like(StrUtil.isNotBlank(assessUserQuery.getSearchValue()), AssessUser::getAssessName, assessUserQuery.getSearchValue())
+                .like(StrUtil.isNotBlank(assessUserQuery.getSearchValue()), AssessUser::getPowerstationName, assessUserQuery.getSearchValue());
+        Page<AssessUser> pageData = this.page(pageParam, wrapper);
+        return pageData;
+
+    }
+
     @Override
     public AssessUser getByAssessId(String assessId) {
         return this.getById(assessId);
     }
 
     @Override
-    public boolean add(AssessUserQuery assessUserQuery) {
+    public String add(AssessUserQuery assessUserQuery) {
         AssessUser assessUser = new AssessUser();
         BeanUtils.copyProperties(assessUserQuery,assessUser);
+        assessUser.setAssessId(IdUtil.simpleUUID());
         this.save(assessUser);
-        return true;
+        return assessUser.getAssessId();
     }
 
     @Override

pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/SecondaryEvaluationServiceImpl.java

@@ -1,5 +1,7 @@
 package com.njcn.advance.service.assess.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.njcn.advance.pojo.dto.assess.AssessTreeDTO;
 import com.njcn.advance.pojo.dto.assess.HarmonicsIAndZDTO;
 import com.njcn.advance.pojo.po.assess.*;
 import com.njcn.advance.service.assess.*;
@@ -11,6 +13,7 @@ import com.njcn.device.biz.utils.COverlimitUtil;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.enums.DicDataTypeEnum;
 import com.njcn.system.pojo.po.DictData;
+import com.njcn.user.api.DeptFeignClient;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.math3.complex.Complex;
 import org.springframework.stereotype.Service;
@@ -52,6 +55,9 @@ public class SecondaryEvaluationServiceImpl implements SecondaryEvaluationServic
     private final IAssessDicShockLoadService iAssessDicShockLoadService;
 
     private final IAssessWindLoadParamService iAssessWindLoadParamService;
+
+    private final DeptFeignClient deptFeignClient;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void evaluation(String assessId, MultipartFile file) {
@@ -218,7 +224,6 @@ public class SecondaryEvaluationServiceImpl implements SecondaryEvaluationServic
         Double[] uph = new Double[49];
 
 
-
         if (Objects.nonNull(assessTransformerParam)) {
             Double m = transUh / transUl;
             for (int h = 0; h < 49; h++) {
@@ -454,6 +459,29 @@ public class SecondaryEvaluationServiceImpl implements SecondaryEvaluationServic
         iAssessOverlimitService.saveOrUpdate(assessOverlimit);
     }
 
+    @Override
+    public List<AssessTreeDTO> evaluationTree(String deptId) {
+        List<AssessTreeDTO> result = new ArrayList<>();
+        List<String> deptIds = deptFeignClient.getDepSonIdtByDeptId(deptId).getData();
+        List<AssessUser> assessUserList = iAssessUserService.list(new LambdaQueryWrapper<AssessUser>().in(AssessUser::getDeptId, deptIds));
+        Map<String, List<AssessUser>> listMap = assessUserList.stream().collect(Collectors.groupingBy(AssessUser::getDeptName));
+        listMap.forEach((deptName, list) -> {
+            AssessTreeDTO assessTreeDTO = new AssessTreeDTO();
+            assessTreeDTO.setTreeId(list.get(0).getDeptId());
+            assessTreeDTO.setTreeName(deptName);
+            List<AssessTreeDTO> childrenList = new ArrayList<>();
+            list.forEach(it -> {
+                AssessTreeDTO children = new AssessTreeDTO();
+                children.setTreeId(it.getAssessId());
+                children.setTreeName(it.getAssessName());
+                childrenList.add(children);
+            });
+            assessTreeDTO.setChildren(childrenList);
+            result.add(assessTreeDTO);
+        });
+        return result;
+    }
+
     private AssessOverlimit assembleOverlimit(AssessOverlimit assessOverlimit, String assessId, Overlimit overlimit, double dmaxLimit, double flickerLimit, VoltageDeviationUtil.VoltageDeviationLimits voltageDeviationLimits, double voltageUnbalanceLimit) {
         assessOverlimit.setAssessId(assessId);
         assessOverlimit.setVodd(BigDecimal.valueOf(overlimit.getUharm3()).setScale(3, RoundingMode.HALF_UP));
@@ -753,6 +781,7 @@ public class SecondaryEvaluationServiceImpl implements SecondaryEvaluationServic
         }
         return doubles;
     }
+
     /**
      * @Description: 根据电压字典获取电压等级
      * @Param: [id, dictDataList]

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/LedgerSelectVO.java

@@ -0,0 +1,19 @@
+package com.njcn.device.pq.pojo.vo;
+
+import lombok.Data;
+
+/**
+ * @Author: cdf
+ * @CreateTime: 2025-06-16
+ * @Description:
+ */
+@Data
+public class LedgerSelectVO {
+    private String id;
+
+    private String name;
+
+    private String voltageLevel;
+
+    private String voltageName;
+}

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LineController.java

@@ -573,4 +573,7 @@ public class LineController extends BaseController {
         List<PollutionSubstationDTO> list = lineService.getPowerStationByMonitorIds(ids);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
     }
+
+
+
 }

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/SubstationController.java

@@ -11,6 +11,7 @@ import com.njcn.device.pq.pojo.param.AlarmStrategyParam;
 import com.njcn.device.pq.pojo.po.Line;
 import com.njcn.device.pq.pojo.po.LineDetail;
 import com.njcn.device.pq.pojo.vo.AlarmStrategyVO;
+import com.njcn.device.pq.pojo.vo.LedgerSelectVO;
 import com.njcn.device.pq.service.AlarmStrategyService;
 import com.njcn.device.pq.service.ISubstationService;
 import com.njcn.web.controller.BaseController;
@@ -53,9 +54,29 @@ public class SubstationController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @ApiOperation("获取变电站列表")
     @GetMapping("getSubstationSelect")
-    HttpResult<List<Line>> getSubstationSelect(){
+    HttpResult<List<LedgerSelectVO>> getSubstationSelect(){
         String methodDescribe = getMethodDescribe("getSubstationSelect");
-        List<Line> substationDTOList = substationService.getSubstationSelect();
+        List<LedgerSelectVO> substationDTOList = substationService.getSubstationSelect();
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, substationDTOList, methodDescribe);
+    }
+
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("获取变电站下面监测点")
+    @GetMapping("getMonitorSelect")
+    HttpResult<List<Line>> getMonitorSelect(@RequestParam("stationId")String stationId){
+        String methodDescribe = getMethodDescribe("getMonitorSelect");
+        List<Line> substationDTOList = substationService.getMonitorSelect(stationId);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, substationDTOList, methodDescribe);
+    }
+
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("获取变电站下面的母线列表")
+    @GetMapping("getBusBarSelect")
+    HttpResult<List<LedgerSelectVO>> getBusBarSelect(@RequestParam("stationId")String stationId){
+        String methodDescribe = getMethodDescribe("getBusBarSelect");
+        List<LedgerSelectVO> substationDTOList = substationService.getBusBarSelect(stationId);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, substationDTOList, methodDescribe);
     }
 

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/ISubstationService.java

@@ -5,6 +5,7 @@ import com.njcn.device.pq.pojo.dto.SubstationDTO;
 import com.njcn.device.pq.pojo.po.Line;
 import com.njcn.device.pq.pojo.po.LineDetail;
 import com.njcn.device.pq.pojo.po.Substation;
+import com.njcn.device.pq.pojo.vo.LedgerSelectVO;
 
 import java.util.List;
 
@@ -23,7 +24,11 @@ public interface ISubstationService extends IService<Substation> {
      */
     List<SubstationDTO> getSubstationById(List<String> subId);
 
-    List<Line>  getSubstationSelect();
+    List<LedgerSelectVO>  getSubstationSelect();
+
+    List<LedgerSelectVO> getBusBarSelect(String stationId);
+
+    List<Line> getMonitorSelect(String stationId);
 
     List<LineDetail> getPowerByStationId(String stationId,Integer powerFlag);
 }

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/SubstationServiceImpl.java

@@ -1,5 +1,6 @@
 package com.njcn.device.pq.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -9,12 +10,19 @@ import com.njcn.device.pq.enums.PowerFlagEnum;
 import com.njcn.device.pq.mapper.LineDetailMapper;
 import com.njcn.device.pq.mapper.LineMapper;
 import com.njcn.device.pq.mapper.SubstationMapper;
+import com.njcn.device.pq.mapper.VoltageMapper;
 import com.njcn.device.pq.pojo.dto.SubstationDTO;
 import com.njcn.device.pq.pojo.po.Line;
 import com.njcn.device.pq.pojo.po.LineDetail;
 import com.njcn.device.pq.pojo.po.Substation;
+import com.njcn.device.pq.pojo.po.Voltage;
+import com.njcn.device.pq.pojo.vo.LedgerSelectVO;
 import com.njcn.device.pq.pojo.vo.LineDetailVO;
 import com.njcn.device.pq.service.ISubstationService;
+import com.njcn.system.api.DicDataFeignClient;
+import com.njcn.system.enums.DicDataEnum;
+import com.njcn.system.enums.DicDataTypeEnum;
+import com.njcn.system.pojo.po.DictData;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -35,17 +43,68 @@ public class SubstationServiceImpl extends ServiceImpl<SubstationMapper, Substat
 
     private final LineDetailMapper lineDetailMapper;
 
+    private final VoltageMapper voltageMapper;
+
+    private final SubstationMapper substationMapper;
+
+    private final DicDataFeignClient dicDataFeignClient;
+
     @Override
     public List<SubstationDTO> getSubstationById(List<String> subId) {
         return this.baseMapper.getSubstationById(subId);
     }
 
     @Override
-    public List<Line> getSubstationSelect() {
+    public List<LedgerSelectVO> getSubstationSelect() {
+        List<LedgerSelectVO> result = new ArrayList<>();
         LambdaQueryWrapper<Line> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(Line::getLevel, LineBaseEnum.SUB_LEVEL.getCode())
                 .eq(Line::getState, DataStateEnum.ENABLE.getCode()).orderByAsc(Line::getCreateTime);
-        return lineMapper.selectList(lambdaQueryWrapper);
+        List<Line> stationList = lineMapper.selectList(lambdaQueryWrapper);
+        List<String> ids = stationList.stream().map(Line::getId).collect(Collectors.toList());
+        List<Substation> substationList = substationMapper.selectBatchIds(ids);
+        Map<String,Substation> stationMap = substationList.stream().collect(Collectors.toMap(Substation::getId,Function.identity()));
+
+        List<DictData> dictDataList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE_STAND.getCode()).getData();
+        Map<String,DictData> dictDataMap = dictDataList.stream().collect(Collectors.toMap(DictData::getId,Function.identity()));
+        stationList.forEach(item->{
+            LedgerSelectVO ledgerSelectVO = new LedgerSelectVO();
+            BeanUtil.copyProperties(item,ledgerSelectVO);
+            ledgerSelectVO.setVoltageLevel(stationMap.get(item.getId()).getScale());
+            ledgerSelectVO.setVoltageName(dictDataMap.get(ledgerSelectVO.getVoltageLevel()).getName());
+            result.add(ledgerSelectVO);
+        });
+        return result;
+    }
+
+    @Override
+    public List<LedgerSelectVO> getBusBarSelect(String stationId) {
+        List<LedgerSelectVO> result = new ArrayList<>();
+        LambdaQueryWrapper<Line> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.like(Line::getPids,stationId).eq(Line::getLevel,LineBaseEnum.SUB_V_LEVEL);
+        List<Line> busBarList = lineMapper.selectList(lambdaQueryWrapper);
+        List<String> ids = busBarList.stream().map(Line::getId).collect(Collectors.toList());
+        List<Voltage> voltageList = voltageMapper.selectBatchIds(ids);
+        Map<String,Voltage> voltageMap = voltageList.stream().collect(Collectors.toMap(Voltage::getId,Function.identity()));
+
+        List<DictData> dictDataList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE_STAND.getCode()).getData();
+        Map<String,DictData> dictDataMap = dictDataList.stream().collect(Collectors.toMap(DictData::getId,Function.identity()));
+        busBarList.forEach(item->{
+            LedgerSelectVO ledgerSelectVO = new LedgerSelectVO();
+            BeanUtil.copyProperties(item,ledgerSelectVO);
+            ledgerSelectVO.setVoltageLevel(voltageMap.get(item.getId()).getScale());
+            ledgerSelectVO.setVoltageName(dictDataMap.get(ledgerSelectVO.getVoltageLevel()).getName());
+            result.add(ledgerSelectVO);
+        });
+        return result;
+    }
+
+    @Override
+    public List<Line> getMonitorSelect(String stationId) {
+        LambdaQueryWrapper<Line> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.like(Line::getPids,stationId).eq(Line::getLevel,LineBaseEnum.LINE_LEVEL);
+        List<Line> lineList = lineMapper.selectList(lambdaQueryWrapper);
+        return lineList;
     }
 
     @Override