From 1765cd62c8e7b7eb4dad2365f272c0367f7e027f Mon Sep 17 00:00:00 2001 From: xuyang <748613696@qq.com> Date: Thu, 22 Feb 2024 14:16:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B2=B3=E5=8C=97=E8=B6=85=E9=AB=98=E5=8E=8B?= =?UTF-8?q?=E7=AE=97=E6=B3=95=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RUploadEvaluationDataDServiceImpl.java | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) 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()); }); } }