From deb28da155f10fbe2af4afe4f7d009e8f05d8a06 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Fri, 21 Apr 2023 16:38:38 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=90=E6=B3=A2=E7=9B=91=E6=B5=8B-=E5=8C=BA?= =?UTF-8?q?=E5=9F=9F=EF=BC=9A=E7=95=B8=E5=8F=98=E7=8E=87=E5=BC=82=E5=B8=B8?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/harmonic/service/impl/THDistortionServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/THDistortionServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/THDistortionServiceImpl.java index 678ecd860..c7470c399 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/THDistortionServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/THDistortionServiceImpl.java @@ -29,7 +29,6 @@ import com.njcn.harmonic.service.THDistortionService; import com.njcn.harmonic.utils.PubUtils; import com.njcn.influxdb.utils.InfluxDbUtils; import lombok.AllArgsConstructor; -import org.influxdb.dto.QueryResult; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -266,8 +265,9 @@ public class THDistortionServiceImpl implements THDistortionService { ); if (CollUtil.isNotEmpty(info)) { //根据id分组，先乘以100.在取平均值，在四舍五入 + Map> collect = info.stream().filter(x -> x.getVThd() != null).collect(Collectors.groupingBy(RStatDataVD::getLineId, Collectors.mapping(RStatDataVD::getVThd, Collectors.toList()))); Map vthdMap = info.stream().filter(x -> x.getVThd() != null).collect(Collectors.groupingBy(RStatDataVD::getLineId, - Collectors.averagingDouble(x -> x.getVThd().multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()))); + Collectors.averagingDouble(x -> x.getVThd().setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()))); PublicDTO publicDTO; for (Map.Entry entry : vthdMap.entrySet()) { publicDTO = new PublicDTO();