From 995a267ea7fa951782ae36c853fa7fcfd73af377 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Thu, 22 Feb 2024 10:58:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E4=BD=8D=E8=B6=85=E6=A0=87=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E7=AE=97=E6=B3=95bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Impl/area/RStatHarmonicVoltageServiceImpl.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RStatHarmonicVoltageServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RStatHarmonicVoltageServiceImpl.java index 59e138fdc..8c09c3630 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RStatHarmonicVoltageServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RStatHarmonicVoltageServiceImpl.java @@ -250,18 +250,20 @@ public class RStatHarmonicVoltageServiceImpl implements RStatHarmonicVoltageServ List lineBaseList = deptGetChildrenMoreDTO.getLineBaseList(); Map> collect = lineBaseList.stream().collect(Collectors.groupingBy(LineDevGetDTO::getLineTag)); collect.forEach((k, v) -> { - List collect1 = v.stream().map(LineDevGetDTO::getPointId).collect(Collectors.toList()); Map> collect2 = v.stream().collect(Collectors.groupingBy(LineDevGetDTO::getVoltageLevel)); collect2.forEach((k1, v1) -> { + + List collect3 = v1.stream().map(LineDevGetDTO::getPointId).collect(Collectors.toList()); + queryWrapper.clear(); queryWrapper.select("freq_over_day", "v_dev_over_day", "v_over_day", "i_over_day", "unbalance_over_day", "i_neg_over_day"). - in("measurement_point_id", collect1). + in("measurement_point_id", collect3). between("data_date",begin,end); List rMpPartHarmonicDetailMS = rMpPartHarmonicDetailMMapper.selectList(queryWrapper); rMpSurplusHarmonicDetailMQueryWrapper.clear(); rMpSurplusHarmonicDetailMQueryWrapper.select("flicker_over_day", "inuharm_over_day"). - in("measurement_point_id", collect1). + in("measurement_point_id", collect3). between("data_date",begin,end); List rMpSurplusHarmonicDetailMS = rMpSurplusHarmonicDetailMMapper.selectList(rMpSurplusHarmonicDetailMQueryWrapper); @@ -303,7 +305,7 @@ public class RStatHarmonicVoltageServiceImpl implements RStatHarmonicVoltageServ rStatHarmonicVoltageMPO.setOverLimitMeasurementAverage(asDouble); double asDouble1 = list.stream().mapToDouble(RStatHarmonicVoltageDPO::getOverLimitMeasurementRatioAverage).average().getAsDouble(); asDouble1 = BigDecimal.valueOf(asDouble1).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); - rStatHarmonicVoltageMPO.setOverLimitMeasurementRatioAccrued(asDouble); + rStatHarmonicVoltageMPO.setOverLimitMeasurementRatioAccrued(asDouble1); int sum = list.stream().mapToInt(RStatHarmonicVoltageDPO::getOverLimitMeasurementAverage).sum(); rStatHarmonicVoltageMPO.setOverDay(sum);