From 84321ff19210c9b81749f0cbc9bb32e79456b307 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Fri, 1 Nov 2024 11:45:00 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=A7=A3=E5=86=B3=E7=9B=91=E6=B5=8B=E7=82=B9?= =?UTF-8?q?=E8=B6=85=E6=A0=87=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/njcn/harmonic/pojo/vo/RStatLimitTargetVO.java | 3 +++ .../mapper/mapping/RStatLimitTargetDMapper.xml | 10 +++++++++- .../njcn/harmonic/service/impl/GridServiceImpl.java | 2 +- .../majornetwork/impl/RStatLimitServiceImpl.java | 5 ++--- .../mysql/Impl/line/HarmonicMetricServiceImpl.java | 8 ++++---- 5 files changed, 19 insertions(+), 9 deletions(-) diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatLimitTargetVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatLimitTargetVO.java index 11bb7cfdc..a06259316 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatLimitTargetVO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatLimitTargetVO.java @@ -73,4 +73,7 @@ public class RStatLimitTargetVO { @ApiModelProperty("所有指标越限天数") private Integer allOvertime = 0; + @ApiModelProperty("所有闪变越限天数") + private Integer flickerAllTime = 0; + } \ No newline at end of file diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLimitTargetDMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLimitTargetDMapper.xml index 627e7102b..fce807472 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLimitTargetDMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLimitTargetDMapper.xml @@ -423,7 +423,14 @@ THEN 1 ELSE 0 END - ) allOvertime + ) allOvertime, + SUM( + CASE + WHEN A.flickerAllTime > 0 + THEN 1 + ELSE 0 + END + ) flickerAllTime FROM (SELECT time_id, @@ -434,6 +441,7 @@ SUM(ubalance_overtime) AS ubalanceOvertime, SUM(uaberrance_overtime) AS uaberranceOvertime, SUM(i_neg_overtime) AS iNegOvertime, + SUM(flicker_all_time) AS flickerAllTime, SUM( IF( ( 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 f6a95ccb9..9b9ae0761 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 @@ -527,7 +527,7 @@ public class GridServiceImpl implements IGridService { detail9.setTargetName(DicDataEnum.INTERHARMONIC_VOLTAGE.getName()); if (CollUtil.isNotEmpty(list2)) { //筛选出9项指标(电压偏差、频率偏差、电压总谐波畸变率、电压闪变、三相电压不平衡度、负序电流、谐波电流、间谐波电压、谐波电压)超标监测点 - long allNum = list2.stream().filter(o->o.getAllOvertime() > 0).count(); + long allNum = list2.stream().filter(o->o.getAllOvertime() > 0|| o.getFlickerAllTime()>0).count(); detail.setOverNum((int) allNum); detail.setOverRatio(PubUtils.doubleRound(2,detail.getOverNum()*100.0/detail.getOnlineNum())); //筛选出电压偏差超标监测点 diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatLimitServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatLimitServiceImpl.java index 4258a97b3..ac9154ef8 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatLimitServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatLimitServiceImpl.java @@ -699,9 +699,8 @@ public class RStatLimitServiceImpl implements RStatLimitService { if (CollUtil.isNotEmpty(limitTarget)) { long count = limitTarget.stream() .filter(x -> x.getAllTime() > 0 || x.getFlickerAllTime() > 0) - .distinct() - .map(RStatLimitTargetDPO::getLineId).count(); - lineData.setOutOfStandardRate(NumberUtil.round(count * 100.0 / limitTarget.size(), 2).floatValue()); + .map(RStatLimitTargetDPO::getLineId).distinct().count(); + lineData.setOutOfStandardRate(NumberUtil.round(count * 100.0 / lineIds.size(), 2).floatValue()); } else { lineData.setOutOfStandardRate(0.0f); } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/HarmonicMetricServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/HarmonicMetricServiceImpl.java index 60adab4ae..4cdd775c2 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/HarmonicMetricServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/HarmonicMetricServiceImpl.java @@ -261,6 +261,10 @@ public class HarmonicMetricServiceImpl extends MppServiceImpl