From 31281cb3468ce4d45a6d688c67b2bdf2ce85ef6a Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Mon, 23 Sep 2024 20:30:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/njcn/harmonic/service/impl/GridServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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 34da163ec..8f8b5460c 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 @@ -646,15 +646,15 @@ public class GridServiceImpl implements IGridService { //谐波电压 List list1 = getList(2,25,"getUharm",item2); Integer maxValue1 = list1.stream().max(Integer::compareTo).orElse(null); - qualifiedDetail.setUHarm(Objects.isNull(maxValue1) ? 0 : PubUtils.doubleRound(2,100.0 - (maxValue1*100.0 / item2.getAllTime()))); + qualifiedDetail.setUHarm(Objects.isNull(maxValue1) ? null : PubUtils.doubleRound(2,100.0 - (maxValue1*100.0 / item2.getAllTime()))); //谐波电流 List list2 = getList(2,25,"getIharm",item2); Integer maxValue2 = list2.stream().max(Integer::compareTo).orElse(null); - qualifiedDetail.setUHarm(Objects.isNull(maxValue2) ? 0 : PubUtils.doubleRound(2,100.0 - (maxValue2*100.0 / item2.getAllTime()))); + qualifiedDetail.setUHarm(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) ? 0 : PubUtils.doubleRound(2,100.0 - (maxValue3*100.0 / item2.getAllTime()))); + qualifiedDetail.setUHarm(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) {