From 6cb222359fbcdcb8f9d633715968bb72c1ae4953 Mon Sep 17 00:00:00 2001 From: xy <748613699@qq.com> Date: Sun, 28 Apr 2024 13:17:41 +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 --- .../pojo/vo/hebeinorth/EvaluationVo.java | 4 +- .../RStatPollutionSubstationMMapper.xml | 38 ++++++++++++++----- .../service/impl/GridServiceImpl.java | 35 ++++++++--------- 3 files changed, 47 insertions(+), 30 deletions(-) diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/hebeinorth/EvaluationVo.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/hebeinorth/EvaluationVo.java index b1ba63366..2f9c4a364 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/hebeinorth/EvaluationVo.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/hebeinorth/EvaluationVo.java @@ -16,7 +16,7 @@ import java.util.List; public class EvaluationVo { @ApiModelProperty("监测点越限占比") - private Double lineRatio; + private Double lineRatio = 3.14159; @ApiModelProperty("子集") private List childrenList; @@ -31,7 +31,7 @@ public class EvaluationVo { private String deptName; @ApiModelProperty("越限占比") - private Double ratio; + private Double ratio = 3.14159; } } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatPollutionSubstationMMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatPollutionSubstationMMapper.xml index 23dfd882a..deb8c7f7b 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatPollutionSubstationMMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatPollutionSubstationMMapper.xml @@ -105,12 +105,35 @@ \ No newline at end of file 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 351b2a733..dbc4c3027 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 @@ -181,10 +181,12 @@ public class GridServiceImpl implements IGridService { result.setChildrenList(childrenList); if (CollUtil.isNotEmpty(childrenList)) { List newList = childrenList.stream() - .filter(child -> !Objects.isNull(child.getRatio())) + .filter(child -> !Objects.isNull(child.getRatio()) && !Objects.equals(child.getRatio(), 3.14159)) .collect(Collectors.toList()); - double avg = newList.stream().mapToDouble(EvaluationVo.Children::getRatio).average().orElse(0.0); - result.setLineRatio(PubUtils.doubleRound(2,avg)); + if (CollUtil.isNotEmpty(newList)) { + double avg = newList.stream().mapToDouble(EvaluationVo.Children::getRatio).average().orElse(0.0); + result.setLineRatio(PubUtils.doubleRound(2,avg)); + } } return result; } @@ -211,58 +213,53 @@ public class GridServiceImpl implements IGridService { } } //获取数据 + EvaluationLevelVo vo1 = new EvaluationLevelVo(); + vo1.setTargetName("频率偏差"); + EvaluationLevelVo vo2 = new EvaluationLevelVo(); + vo2.setTargetName("电压偏差"); + EvaluationLevelVo vo3 = new EvaluationLevelVo(); + vo3.setTargetName("电压总谐波畸变率"); + EvaluationLevelVo vo4 = new EvaluationLevelVo(); + vo4.setTargetName("三相电压不平衡度"); + EvaluationLevelVo vo5 = new EvaluationLevelVo(); + vo5.setTargetName("闪变"); if (CollUtil.isNotEmpty(line)) { List list1 = getList1(line,param.getStartTime(),param.getEndTime()); List list2 = getList2(line,param.getStartTime(),param.getEndTime()); List list3 = getList3(line,param.getStartTime(),param.getEndTime()); List list4 = getList4(line,param.getStartTime(),param.getEndTime()); - - EvaluationLevelVo vo1 = new EvaluationLevelVo(); - vo1.setTargetName("频率偏差"); if (CollUtil.isNotEmpty(list1)) { List d = list1.stream().map(o->o.getFreqDev().doubleValue()).collect(Collectors.toList()); double avg = d.stream().collect(Collectors.averagingDouble(x->x)); vo1.setAvg(PubUtils.doubleRound(2,avg)); vo1.setSd(targetSd(d,avg)); } - - EvaluationLevelVo vo2 = new EvaluationLevelVo(); - vo2.setTargetName("电压偏差"); if (CollUtil.isNotEmpty(list2)) { List d = list2.stream().map(o->o.getVlDev().doubleValue()).collect(Collectors.toList()); double avg = d.stream().collect(Collectors.averagingDouble(x->x)); vo2.setAvg(PubUtils.doubleRound(2,avg)); vo2.setSd(targetSd(d,avg)); } - - EvaluationLevelVo vo3 = new EvaluationLevelVo(); - vo3.setTargetName("电压总谐波畸变率"); if (CollUtil.isNotEmpty(list3)){ List d = list3.stream().map(o->o.getVThd().doubleValue()).collect(Collectors.toList()); double avg = d.stream().collect(Collectors.averagingDouble(x->x)); vo3.setAvg(PubUtils.doubleRound(2,avg)); vo3.setSd(targetSd(d,avg)); } - - EvaluationLevelVo vo4 = new EvaluationLevelVo(); - vo4.setTargetName("三相电压不平衡度"); if (CollUtil.isNotEmpty(list1)) { List d = list1.stream().map(o -> o.getVUnbalance().doubleValue()).collect(Collectors.toList()); double avg = d.stream().collect(Collectors.averagingDouble(x -> x)); vo4.setAvg(PubUtils.doubleRound(2,avg)); vo4.setSd(targetSd(d,avg)); } - - EvaluationLevelVo vo5 = new EvaluationLevelVo(); - vo5.setTargetName("闪变"); if (CollUtil.isNotEmpty(list4)) { List d = list4.stream().map(RStatDataPltDPO::getPlt).collect(Collectors.toList()); double avg = d.stream().collect(Collectors.averagingDouble(x -> x)); vo5.setAvg(PubUtils.doubleRound(2,avg)); vo5.setSd(targetSd(d,avg)); } - Stream.of(vo1, vo2, vo3, vo4, vo5).forEach(result::add); } + Stream.of(vo1, vo2, vo3, vo4, vo5).forEach(result::add); return result; }