Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1.解决监测点超标问题

Browse Source
This commit is contained in:
wr
2024-11-01 11:45:00 +08:00
parent 89e38abc00
commit 84321ff192
5 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatLimitTargetVO.java
View File

@@ -73,4 +73,7 @@ public class RStatLimitTargetVO {
@ApiModelProperty("所有指标越限天数") @ApiModelProperty("所有指标越限天数")
private Integer allOvertime = 0; private Integer allOvertime = 0;
@ApiModelProperty("所有闪变越限天数")
private Integer flickerAllTime = 0;
} }

10
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLimitTargetDMapper.xml
View File

@@ -423,7 +423,14 @@
THEN 1 THEN 1
ELSE 0 ELSE 0
END END
) allOvertime ) allOvertime,
SUM(
CASE
WHEN A.flickerAllTime > 0
THEN 1
ELSE 0
END
) flickerAllTime
FROM FROM
(SELECT (SELECT
time_id, time_id,
@@ -434,6 +441,7 @@
SUM(ubalance_overtime) AS ubalanceOvertime, SUM(ubalance_overtime) AS ubalanceOvertime,
SUM(uaberrance_overtime) AS uaberranceOvertime, SUM(uaberrance_overtime) AS uaberranceOvertime,
SUM(i_neg_overtime) AS iNegOvertime, SUM(i_neg_overtime) AS iNegOvertime,
SUM(flicker_all_time) AS flickerAllTime,
SUM( SUM(
IF( IF(
( (

2
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/GridServiceImpl.java
View File

@@ -527,7 +527,7 @@ public class GridServiceImpl implements IGridService {
detail9.setTargetName(DicDataEnum.INTERHARMONIC_VOLTAGE.getName()); detail9.setTargetName(DicDataEnum.INTERHARMONIC_VOLTAGE.getName());
if (CollUtil.isNotEmpty(list2)) { if (CollUtil.isNotEmpty(list2)) {
//筛选出9项指标(电压偏差、频率偏差、电压总谐波畸变率、电压闪变、三相电压不平衡度、负序电流、谐波电流、间谐波电压、谐波电压)超标监测点 //筛选出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.setOverNum((int) allNum);
detail.setOverRatio(PubUtils.doubleRound(2,detail.getOverNum()*100.0/detail.getOnlineNum())); detail.setOverRatio(PubUtils.doubleRound(2,detail.getOverNum()*100.0/detail.getOnlineNum()));
//筛选出电压偏差超标监测点 //筛选出电压偏差超标监测点

5
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatLimitServiceImpl.java
View File

@@ -699,9 +699,8 @@ public class RStatLimitServiceImpl implements RStatLimitService {
if (CollUtil.isNotEmpty(limitTarget)) { if (CollUtil.isNotEmpty(limitTarget)) {
long count = limitTarget.stream() long count = limitTarget.stream()
.filter(x -> x.getAllTime() > 0 || x.getFlickerAllTime() > 0) .filter(x -> x.getAllTime() > 0 || x.getFlickerAllTime() > 0)
.distinct() .map(RStatLimitTargetDPO::getLineId).distinct().count();
.map(RStatLimitTargetDPO::getLineId).count(); lineData.setOutOfStandardRate(NumberUtil.round(count * 100.0 / lineIds.size(), 2).floatValue());
lineData.setOutOfStandardRate(NumberUtil.round(count * 100.0 / limitTarget.size(), 2).floatValue());
} else { } else {
lineData.setOutOfStandardRate(0.0f); lineData.setOutOfStandardRate(0.0f);
} }

8
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/HarmonicMetricServiceImpl.java
View File

@@ -261,6 +261,10 @@ public class HarmonicMetricServiceImpl extends MppServiceImpl<RStatAssesDMapper,
dealData(iMap,phasic,overLimit,flag,mpSurplusAbnormalCp95,mpSurplusAbnormalAvg,mpSurplusAbnormalMax,mpSurplusAbnormalMin,2,26,2,"iharm_","i_",all); dealData(iMap,phasic,overLimit,flag,mpSurplusAbnormalCp95,mpSurplusAbnormalAvg,mpSurplusAbnormalMax,mpSurplusAbnormalMin,2,26,2,"iharm_","i_",all);
//间谐波电压 //间谐波电压
dealData(inMap,phasic,overLimit,flag,mpSurplusAbnormalCp95,mpSurplusAbnormalAvg,mpSurplusAbnormalMax,mpSurplusAbnormalMin,1,17,3,"inuharm_","v_",all); dealData(inMap,phasic,overLimit,flag,mpSurplusAbnormalCp95,mpSurplusAbnormalAvg,mpSurplusAbnormalMax,mpSurplusAbnormalMin,1,17,3,"inuharm_","v_",all);
all.add(mpSurplusAbnormalCp95);
all.add(mpSurplusAbnormalAvg);
all.add(mpSurplusAbnormalMax);
all.add(mpSurplusAbnormalMin);
} }
} }
} }
@@ -309,10 +313,6 @@ public class HarmonicMetricServiceImpl extends MppServiceImpl<RStatAssesDMapper,
assPojo(moreValueMax, mpSurplusAbnormalMax, type); assPojo(moreValueMax, mpSurplusAbnormalMax, type);
assPojo(moreValueMin, mpSurplusAbnormalMin, type); assPojo(moreValueMin, mpSurplusAbnormalMin, type);
all.add(mpSurplusAbnormalCp95);
all.add(mpSurplusAbnormalAvg);
all.add(mpSurplusAbnormalMax);
all.add(mpSurplusAbnormalMin);
} }
} }
} }