diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadEvaluationDataDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadEvaluationDataDServiceImpl.java index 53a87855f..d68edd516 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadEvaluationDataDServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadEvaluationDataDServiceImpl.java @@ -283,15 +283,19 @@ public class RUploadEvaluationDataDServiceImpl extends MppServiceImpl list = dto2.getVoltageChild(); if (CollUtil.isNotEmpty(list)){ list.forEach(item->{ - if (Objects.equals(item.getVoltageLevel(),voltage)){ - dto.setMonitorBusNum(item.getMonitorBusNum()); - dto.setOnlineBusNum(item.getOnlineBusNum()); - dto.setMonitorBusRate(item.getMonitorRate()); - } else if (Objects.equals(voltage, "0")){ - dto.setMonitorBusNum(dto2.getAllMonitorBusNum()); - dto.setOnlineBusNum(dto2.getAllOnlineBusNum()); - dto.setMonitorBusRate(dto2.getAllMonitorBusNum()*100.0d/dto2.getAllOnlineBusNum()); - } +// if (Objects.equals(item.getVoltageLevel(),voltage)){ +// dto.setMonitorBusNum(item.getMonitorBusNum()); +// dto.setOnlineBusNum(item.getOnlineBusNum()); +// dto.setMonitorBusRate(item.getMonitorRate()); +// } else if (Objects.equals(voltage, "0")){ +// dto.setMonitorBusNum(dto2.getAllMonitorBusNum()); +// dto.setOnlineBusNum(dto2.getAllOnlineBusNum()); +// dto.setMonitorBusRate(dto2.getAllMonitorBusNum()*100.0d/dto2.getAllOnlineBusNum()); +// } + //fixme 基准水平数据上传失败,先将各个电压等级数据调整为不区分电压等级的数据 + dto.setMonitorBusNum(dto2.getAllMonitorBusNum()); + dto.setOnlineBusNum(dto2.getAllOnlineBusNum()); + dto.setMonitorBusRate(dto2.getAllMonitorBusNum()*100.0d/dto2.getAllOnlineBusNum()); }); } }