二级评估联调和导出评估结果

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/api/HarmDataFeignClient.java

@@ -1,11 +1,13 @@
 package com.njcn.harmonic.api;
 
 import com.njcn.common.pojo.constant.ServerInfo;
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.harmonic.api.fallback.HarmDataFeignClientFallbackFactory;
 import com.njcn.harmonic.pojo.param.HistoryHarmParam;
 import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
 import com.njcn.harmonic.pojo.po.day.RStatLimitRateDPO;
+import com.njcn.harmonic.pojo.vo.AssessEvaluation;
 import com.njcn.influx.pojo.dto.HarmHistoryDataDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -44,4 +46,13 @@ public interface HarmDataFeignClient {
      */
     @PostMapping("/getLinesRate")
     HttpResult<List<RStatLimitRateDPO>> getLinesRate(@RequestBody StatSubstationBizBaseParam param);
+
+
+    /**
+     * 评估结果获取谐波电压和谐波电流含有率、三项不平横度和负序电流
+     * @param param
+     * @return
+     */
+    @PostMapping("/getHarmIAndHarmVData")
+    HttpResult<AssessEvaluation> getHarmIAndHarmVData(@RequestBody StatisticsBizBaseParam param);
 }

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/api/fallback/HarmDataFeignClientFallbackFactory.java

@@ -2,12 +2,14 @@ package com.njcn.harmonic.api.fallback;
 
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.device.biz.utils.DeviceEnumUtil;
 import com.njcn.harmonic.api.HarmDataFeignClient;
 import com.njcn.harmonic.pojo.param.HistoryHarmParam;
 import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
 import com.njcn.harmonic.pojo.po.day.RStatLimitRateDPO;
+import com.njcn.harmonic.pojo.vo.AssessEvaluation;
 import com.njcn.influx.pojo.dto.HarmHistoryDataDTO;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
@@ -50,6 +52,12 @@ public class HarmDataFeignClientFallbackFactory implements FallbackFactory<HarmD
                 log.error("{}异常，降级处理，异常为：{}", "获取越线监测点越线次数", throwable.toString());
                 throw new BusinessException(finalExceptionEnum);
             }
+
+            @Override
+            public HttpResult<AssessEvaluation> getHarmIAndHarmVData(StatisticsBizBaseParam param) {
+                log.error("{}异常，降级处理，异常为：{}", "评估结果获取谐波电压和谐波电流含有率、三项不平横度和负序电流", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
         };
     }
 }

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/AssessEvaluation.java

@@ -0,0 +1,28 @@
+package com.njcn.harmonic.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author wr
+ * @description
+ * @date 2025/8/26 14:38
+ */
+@Data
+public class AssessEvaluation implements Serializable {
+
+    @ApiModelProperty("2-50次谐波电流含有率")
+    private List<Double> iMax;
+
+    @ApiModelProperty("三项不平衡度")
+    private  Double unbalance;
+
+    @ApiModelProperty("2-50次谐波电压含有率")
+    private List<Double> uMax;
+
+    @ApiModelProperty("负序电流")
+    private  Double iNeg;
+}

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/utils/WordUtil2.java

@@ -71,7 +71,7 @@ public class WordUtil2 {
         CustomXWPFDocument doc = null;
         //读取报告模板
         try {
-            inStream =  new ClassPathResource(path).getInputStream();;
+            inStream =  new ClassPathResource(path).getInputStream();
             doc = new CustomXWPFDocument(inStream);
             this.replaceInTable(doc,params,tableList);
             this.replaceInPara(doc, params);