From 98cf051fabae549ba57aa134affc068032e20a8d Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Fri, 27 Sep 2024 16:21:45 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/njcn/harmonic/service/impl/GridServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/GridServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/GridServiceImpl.java index f006420db..f6a95ccb9 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/GridServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/GridServiceImpl.java @@ -656,11 +656,11 @@ public class GridServiceImpl implements IGridService { //谐波电流 List list2 = getList(2,25,"getIharm",item2); Integer maxValue2 = list2.stream().max(Integer::compareTo).orElse(null); - qualifiedDetail.setUHarm(Objects.isNull(maxValue2) ? null : PubUtils.doubleRound(2,100.0 - (maxValue2*100.0 / item2.getAllTime()))); + qualifiedDetail.setIHarm(Objects.isNull(maxValue2) ? null : PubUtils.doubleRound(2,100.0 - (maxValue2*100.0 / item2.getAllTime()))); //间谐波电压 List list3 = getList(1,16,"getInuharm",item2); Integer maxValue3 = list3.stream().max(Integer::compareTo).orElse(null); - qualifiedDetail.setUHarm(Objects.isNull(maxValue3) ? null : PubUtils.doubleRound(2,100.0 - (maxValue3*100.0 / item2.getAllTime()))); + qualifiedDetail.setInuHarm(Objects.isNull(maxValue3) ? null : PubUtils.doubleRound(2,100.0 - (maxValue3*100.0 / item2.getAllTime()))); qualifiedDetail.setINeg(PubUtils.doubleRound(2, 100.0 - (item2.getINegOvertime() * 100.0 / item2.getAllTime()))); } if (item2.getFlickerAllTime() > 0) {