From 062fd5ae15c67087d68e32abbe21c8d814409592 Mon Sep 17 00:00:00 2001 From: zhuxinyu <1799009482@qq.com> Date: Fri, 14 Apr 2023 16:23:56 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A8=B3=E6=80=81=E6=8C=87=E6=A0=87=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AnalyzeServiceImpl.java | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/AnalyzeServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/AnalyzeServiceImpl.java index e0cb375ea..ee3229b4d 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/AnalyzeServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/AnalyzeServiceImpl.java @@ -340,11 +340,14 @@ public class AnalyzeServiceImpl implements IAnalyzeService { monitorOverLimitVO.setOverCurOtherTimes(source.getOverCurOtherTimes()); List limitRateDPOS = rsMap.get(vo.getId()); // 谐波电压含有率超标天数 - long volContainOverDay = limitRateDPOS.stream().filter(t -> FilterNotQualifiedUharmData(t)).count(); + long volContainOverDay = limitRateDPOS.stream().filter(t -> filterNotQualifiedUharmData(t)).count(); // 谐波电流超标天数 - long harmCurOverDay = limitRateDPOS.stream().filter(t -> FilterNotQualifiedIharmData(t)).count(); + long harmCurOverDay = limitRateDPOS.stream().filter(t -> filterNotQualifiedIharmData(t)).count(); // 间谐波电压含有率超标天数 - long intHarmOverDay = limitRateDPOS.stream().filter(t -> FilterNotQualifiedInuharmData(t)).count(); + long intHarmOverDay = limitRateDPOS.stream().filter(t -> filterNotQualifiedInuharmData(t)).count(); + // 谐波电压超标天数 + long harmVolOverDay = limitRateDPOS.stream().filter(t -> filterNotQualifiedHarmVolData(t)).count(); + monitorOverLimitVO.setHarmVolOverDay((int) harmVolOverDay); monitorOverLimitVO.setVolContainOverDay((int) volContainOverDay); monitorOverLimitVO.setHarmCurOverDay((int) harmCurOverDay); monitorOverLimitVO.setIntHarmOverDay((int) intHarmOverDay); @@ -503,7 +506,16 @@ public class AnalyzeServiceImpl implements IAnalyzeService { // return page; } - private boolean FilterNotQualifiedInuharmData(RStatLimitRateDPO t) { + private boolean filterNotQualifiedHarmVolData(RStatLimitRateDPO t) { + // 电压畸变率+谐波电压含有率（2-25次） + int i = t.getUaberranceOvertime() + t.getUharm2Overtime() + t.getUharm3Overtime() + t.getUharm4Overtime() + t.getUharm5Overtime() + t.getUharm6Overtime() + t.getUharm7Overtime() + t.getUharm8Overtime() + t.getUharm9Overtime() + t.getUharm10Overtime() + t.getUharm11Overtime() + t.getUharm12Overtime() + t.getUharm13Overtime() + t.getUharm14Overtime() + t.getUharm15Overtime() + t.getUharm16Overtime() + t.getUharm17Overtime() + t.getUharm18Overtime() + t.getUharm19Overtime() + t.getUharm20Overtime() + t.getUharm21Overtime() + t.getUharm22Overtime() + t.getUharm23Overtime() + t.getUharm24Overtime() + t.getUharm25Overtime(); + if (i>0){ + return true; + } + return false; + } + + private boolean filterNotQualifiedInuharmData(RStatLimitRateDPO t) { int i =t.getInuharm1Overtime()+ t.getInuharm2Overtime() + t.getInuharm3Overtime() + t.getInuharm4Overtime() + t.getInuharm5Overtime() + t.getInuharm6Overtime() + t.getInuharm7Overtime() + t.getInuharm8Overtime() + t.getInuharm9Overtime() + t.getInuharm10Overtime() + t.getInuharm11Overtime() + t.getInuharm12Overtime() + t.getInuharm13Overtime() + t.getInuharm14Overtime() + t.getInuharm15Overtime() + t.getInuharm16Overtime(); if (i>0){ return true; @@ -511,7 +523,7 @@ public class AnalyzeServiceImpl implements IAnalyzeService { return false; } - private boolean FilterNotQualifiedIharmData(RStatLimitRateDPO t) { + private boolean filterNotQualifiedIharmData(RStatLimitRateDPO t) { int i = t.getIharm2Overtime() + t.getIharm3Overtime() + t.getIharm4Overtime() + t.getIharm5Overtime() + t.getIharm6Overtime() + t.getIharm7Overtime() + t.getIharm8Overtime() + t.getIharm9Overtime() + t.getIharm10Overtime() + t.getIharm11Overtime() + t.getIharm12Overtime() + t.getIharm13Overtime() + t.getIharm14Overtime() + t.getIharm15Overtime() + t.getIharm16Overtime() + t.getIharm17Overtime() + t.getIharm18Overtime() + t.getIharm19Overtime() + t.getIharm20Overtime() + t.getIharm21Overtime() + t.getIharm22Overtime() + t.getIharm23Overtime() + t.getIharm24Overtime() + t.getIharm25Overtime(); if (i>0){ return true; @@ -519,7 +531,7 @@ public class AnalyzeServiceImpl implements IAnalyzeService { return false; } - private boolean FilterNotQualifiedUharmData(RStatLimitRateDPO t) { + private boolean filterNotQualifiedUharmData(RStatLimitRateDPO t) { int i = t.getUharm2Overtime() + t.getUharm3Overtime() + t.getUharm4Overtime() + t.getUharm5Overtime() + t.getUharm6Overtime() + t.getUharm7Overtime() + t.getUharm8Overtime() + t.getUharm9Overtime() + t.getUharm10Overtime() + t.getUharm11Overtime() + t.getUharm12Overtime() + t.getUharm13Overtime() + t.getUharm14Overtime() + t.getUharm15Overtime() + t.getUharm16Overtime() + t.getUharm17Overtime() + t.getUharm18Overtime() + t.getUharm19Overtime() + t.getUharm20Overtime() + t.getUharm21Overtime() + t.getUharm22Overtime() + t.getUharm23Overtime() + t.getUharm24Overtime() + t.getUharm25Overtime(); if (i>0){