From 65805e4f50ed7d40b6fcc5089b5af7b16c11f8b6 Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Mon, 15 Dec 2025 13:25:12 +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, 4 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 ef9d90904..1879f5bb4 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 @@ -708,6 +708,7 @@ public class GridServiceImpl implements IGridService { List list3 = getList(1, 16, "getInuharm", item2); Integer maxValue3 = list3.stream().max(Integer::compareTo).orElse(null); 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) { @@ -857,10 +858,11 @@ public class GridServiceImpl implements IGridService { .collect(Collectors.toList()); children.setRatio(PubUtils.doubleRound(2, filteredList5.size() * 100.0 / limitRateList.size())); break; - //谐波电压 + // 谐波电压 + // 谐波电压含有率 + 谐波电压有效值 case 6: List filteredList6 = limitRateList.stream() - .filter(x -> getLimitRateStats(x, 2, 26, "uharm", "Overtime")) + .filter(x -> getLimitRateStats(x, 2, 26, "uharm", "Overtime") || x.getUaberranceOvertime() > 0) .collect(Collectors.toList()); children.setRatio(PubUtils.doubleRound(2, filteredList6.size() * 100.0 / limitRateList.size())); break;