Merge remote-tracking branch 'origin/liaoning' into liaoning

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

@@ -1,5 +1,6 @@
 package com.njcn.advance.service.assess.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.StrUtil;
@@ -86,12 +87,12 @@ public class SecondaryEvaluationServiceImpl implements SecondaryEvaluationServic
         Double iNeg;
         if (StrUtil.isNotBlank(param.getId())) {
             AssessEvaluation data = harmDataFeignClient.getHarmIAndHarmVData(param).getData();
-            if (ObjUtil.isNotNull(data)){
+            if (ObjUtil.isNotNull(data)) {
                 iMax = data.getIMax();
                 unbalance = data.getUnbalance();
                 uMax = data.getUMax();
                 iNeg = data.getINeg();
-            }else{
+            } else {
                 throw new BusinessException("评估原始数据有误！请检查数据是否为空");
             }
         } else {
@@ -160,7 +161,6 @@ public class SecondaryEvaluationServiceImpl implements SecondaryEvaluationServic
 
         // 1. 计算单个负荷谐波阻抗和谐波电流
         //2. 计算配变谐波阻抗 并叠加
-
         List<HarmonicsIAndZDTO> loadList = new ArrayList<>();
 
         List<AssessLoadParam> assessLoadParamLista = iAssessLoadParamService.lambdaQuery().eq(AssessLoadParam::getAssessId, assessId).list();
@@ -198,34 +198,33 @@ public class SecondaryEvaluationServiceImpl implements SecondaryEvaluationServic
 
 
         // 4. 变压器谐波阻抗串联叠加
-        HarmonicsIAndZDTO transIAndZDTO = null;
+        HarmonicsIAndZDTO transIAndZDTO;
-        Double transUl = null;
+        Double transUl;
-        Double transUh = null;
+        Double transUh;
-        AssessDicTransformer assessDicTransformer = new AssessDicTransformer();
+        AssessDicTransformer assessDicTransformer;
         AssessTransformerParam assessTransformerParam = iAssessTransformerParamService.lambdaQuery().eq(AssessTransformerParam::getAssessId, assessId).one();
-        if (Objects.nonNull(assessTransformerParam)) {
+        if(Objects.isNull(assessTransformerParam)){
-            assessDicTransformer = iAssessDicTransformerService.lambdaQuery().eq(AssessDicTransformer::getTranstypeId, assessTransformerParam.getTranstypeId()).one();
+            throw new BusinessException("变压器参数缺失");
-            transUl = getVoltage(assessDicTransformer.getTranslowScale(), dictDataList);
-            transUh = getVoltage(assessDicTransformer.getTranshighScale(), dictDataList);
-            Double sRt = assessDicTransformer.getTransCapa().doubleValue();
-            Double uKr = assessDicTransformer.getShortCircuitImpedance().doubleValue();
-            Double pKrt = assessDicTransformer.getLoadLoss().doubleValue();
-            transIAndZDTO = PowerQualityAlgorithmUtil.transZCal(sRt, transUl, uKr, pKrt);
         }
+        assessDicTransformer = iAssessDicTransformerService.lambdaQuery().eq(AssessDicTransformer::getTranstypeId, assessTransformerParam.getTranstypeId()).one();
+        transUl = getVoltage(assessDicTransformer.getTranslowScale(), dictDataList);
+        transUh = getVoltage(assessDicTransformer.getTranshighScale(), dictDataList);
+        Double sRt = assessDicTransformer.getTransCapa().doubleValue();
+        Double uKr = assessDicTransformer.getShortCircuitImpedance().doubleValue();
+        Double pKrt = assessDicTransformer.getLoadLoss().doubleValue();
+        transIAndZDTO = PowerQualityAlgorithmUtil.transZCal(sRt, transUl, uKr, pKrt);
+
 
         // 5. 电容器组阻抗串联叠加
         AssessCapacitorParam assessCapacitorParam = iAssessCapacitorParamService.lambdaQuery().eq(AssessCapacitorParam::getAssessId, assessId).one();
         HarmonicsIAndZDTO capIAndZDTO;
-        if (Objects.isNull(assessTransformerParam)) {
+        if (Objects.isNull(assessCapacitorParam)) {
             throw new BusinessException("评估用户电容器参数缺失");
         } else {
-
             Integer capacitorNum = assessCapacitorParam.getCapacitorNum();
             double capacitorCapacity = assessCapacitorParam.getCapacitorCapacity().doubleValue();
             double capacitorReactance = assessCapacitorParam.getCapacitorReactance().doubleValue();
             double capacitorScale = getVoltage(assessCapacitorParam.getCapacitorScale(), dictDataList);
-
-
             capIAndZDTO = PowerQualityAlgorithmUtil.capacitorZCal(capacitorScale, capacitorCapacity, capacitorReactance, capacitorNum);
         }
 
@@ -343,7 +342,6 @@ public class SecondaryEvaluationServiceImpl implements SecondaryEvaluationServic
                     un.doubleValue(),
                     false);
         } else if (Objects.equals(isWindfarm, "03")) {
-
             dMax = VoltageFluctuationUtil.calculateImpactLoadVoltageFluctuation(assessShockLoadParam.getInpactloadPower().doubleValue(),
                     assessShockLoadParam.getInpactloadMultiple().doubleValue(), scc);
         } else {
@@ -355,6 +353,9 @@ public class SecondaryEvaluationServiceImpl implements SecondaryEvaluationServic
         Double plt;
         if (Objects.equals(isWindfarm, "01")) {
             List<AssessWindLoadParam> assessWindLoadParams = iAssessWindLoadParamService.lambdaQuery().eq(AssessWindLoadParam::getAssessId, assessId).list();
+            if (Objects.isNull(assessWindLoadParams)) {
+                throw new BusinessException("风电参数缺失");
+            }
             List<VoltageFlickerUtil.WindFarmLoads> windFarmLoadsList = assessWindLoadParams.stream().map(temp -> {
                 VoltageFlickerUtil.WindFarmLoads windFarmLoads = new VoltageFlickerUtil.WindFarmLoads();
                 windFarmLoads.setFlickerCoefficient(temp.getFlickerCoeff().doubleValue());