diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/SecondaryEvaluationServiceImpl.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/SecondaryEvaluationServiceImpl.java index 24d5e3e32..104943f88 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/SecondaryEvaluationServiceImpl.java +++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/SecondaryEvaluationServiceImpl.java @@ -314,9 +314,6 @@ public class SecondaryEvaluationServiceImpl implements SecondaryEvaluationServic /************************************电压波动算法**********************************/ //非风电场取冲击负荷最大的哪个 List assessShockLoadParams = iAssessShockLoadParamService.lambdaQuery().eq(AssessShockLoadParam::getAssessId, assessId).list(); - if (CollUtil.isEmpty(assessShockLoadParams)) { - throw new BusinessException("冲击负荷参数缺失"); - } assessShockLoadParams.forEach(temp -> { AssessDicShockLoad byId = iAssessDicShockLoadService.getById(temp.getInpactloadtypeId()); if (Objects.isNull(byId)) { @@ -345,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 { @@ -357,6 +353,9 @@ public class SecondaryEvaluationServiceImpl implements SecondaryEvaluationServic Double plt; if (Objects.equals(isWindfarm, "01")) { List assessWindLoadParams = iAssessWindLoadParamService.lambdaQuery().eq(AssessWindLoadParam::getAssessId, assessId).list(); + if (Objects.isNull(assessWindLoadParams)) { + throw new BusinessException("风电参数缺失"); + } List windFarmLoadsList = assessWindLoadParams.stream().map(temp -> { VoltageFlickerUtil.WindFarmLoads windFarmLoads = new VoltageFlickerUtil.WindFarmLoads(); windFarmLoads.setFlickerCoefficient(temp.getFlickerCoeff().doubleValue());