From 40a55040867be4e90b38f0832dfc569c3d89f4d0 Mon Sep 17 00:00:00 2001 From: xy <748613699@qq.com> Date: Mon, 29 Apr 2024 17:54:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/GridServiceImpl.java | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 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 4239c80c9..819c38a89 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 @@ -80,7 +80,7 @@ public class GridServiceImpl implements IGridService { //获取综合评估 List list2 = rStatComassesDMapper.getAvgCount(lineList,param.getStartTime(),param.getEndTime()); list.forEach(item->{ - if (!Objects.equals(item.getDeptLevel(), 2)) { + if (Objects.equals(item.getDeptLevel(), 3)) { AssessVo assessVo = new AssessVo(); assessVo.setName(item.getUnitName()); if (CollUtil.isNotEmpty(item.getLineBaseList())) { @@ -129,7 +129,7 @@ public class GridServiceImpl implements IGridService { List list3 = rStatLimitRateDMapper.getAssessTargetRate(lineList,param.getStartTime(),param.getEndTime()); //数据处理 list.forEach(item->{ - if (!Objects.equals(item.getDeptLevel(), 2)) { + if (Objects.equals(item.getDeptLevel(), 3)) { List ll = item.getLineBaseList().stream().map(LineDevGetDTO::getPointId).collect(Collectors.toList()); AssessDetailVo comAssess = getAssessData(item.getUnitId(),item.getUnitName(), ll, list1, list2, list3); result.add(comAssess); @@ -170,7 +170,7 @@ public class GridServiceImpl implements IGridService { map.put(month.toString(),comAssesList); }); list.forEach(item->{ - if (!Objects.equals(item.getDeptLevel(), 2)) { + if (Objects.equals(item.getDeptLevel(), 3)) { AssessVo.AssessTrendVo vo = new AssessVo.AssessTrendVo(); vo.setDeptId(item.getUnitId()); vo.setDeptName(item.getUnitName()); @@ -237,7 +237,7 @@ public class GridServiceImpl implements IGridService { //获取监测点所有指标数据 List limitRateList = rStatLimitRateDMapper.getAssessTargetRate(lineList,param.getStartTime(),param.getEndTime()); list.forEach(item->{ - if (!Objects.equals(item.getDeptLevel(), 2)) { + if (Objects.equals(item.getDeptLevel(), 3)) { EvaluationVo.Children children = new EvaluationVo.Children(); children.setDeptId(item.getUnitId()); children.setDeptName(item.getUnitName()); @@ -412,7 +412,7 @@ public class GridServiceImpl implements IGridService { //获取监测点越限集合 List overLimitList = rStatLimitTargetDMapper.getSumTarget(line,param.getStartTime(),param.getEndTime()); list.forEach(item->{ - if (!Objects.equals(item.getDeptLevel(), 2)) { + if (Objects.equals(item.getDeptLevel(), 3)) { EvaluationLevelVo.EvaluationDetail detail = new EvaluationLevelVo.EvaluationDetail(); detail.setDeptId(item.getUnitId()); detail.setDeptName(item.getUnitName()); @@ -422,8 +422,19 @@ public class GridServiceImpl implements IGridService { detail.setOnlineNum(list1.size()); //筛选当前部门下监测点的超标数据 List list2 = overLimitList.stream().filter(it->list1.contains(it.getLineId())).collect(Collectors.toList()); - if (CollUtil.isNotEmpty(list2)) { + EvaluationLevelVo.TargetDetail detail1 = new EvaluationLevelVo.TargetDetail(); + detail1.setTargetName("电压偏差"); + EvaluationLevelVo.TargetDetail detail2 = new EvaluationLevelVo.TargetDetail(); + detail2.setTargetName("频率偏差"); + EvaluationLevelVo.TargetDetail detail3 = new EvaluationLevelVo.TargetDetail(); + detail3.setTargetName("电压总谐波畸变率"); + EvaluationLevelVo.TargetDetail detail4 = new EvaluationLevelVo.TargetDetail(); + detail4.setTargetName("闪变"); + EvaluationLevelVo.TargetDetail detail5 = new EvaluationLevelVo.TargetDetail(); + detail5.setTargetName("三相电压不平衡度"); + + if (CollUtil.isNotEmpty(list2)) { //筛选出五项指标(电压偏差、频率偏差、电压总谐波畸变率、电压闪变、三相电压不平衡度)超标监测点 long allNum = list2.stream().filter(o->o.getFreqDevOvertime() > 0 || o.getVoltageDevOvertime() > 0 @@ -432,49 +443,38 @@ public class GridServiceImpl implements IGridService { || o.getUbalanceOvertime() > 0).count(); detail.setOverNum((int) allNum); detail.setOverRatio(PubUtils.doubleRound(2,detail.getOverNum()*100.0/detail.getOnlineNum())); - //筛选出电压偏差超标监测点 long num1 = list2.stream().filter(o->o.getFreqDevOvertime() > 0).count(); Integer day1 = list2.stream().max(Comparator.comparingInt(RStatLimitTargetDPO::getFreqDevOvertime)).get().getFreqDevOvertime(); - EvaluationLevelVo.TargetDetail detail1 = new EvaluationLevelVo.TargetDetail(); - detail1.setTargetName("电压偏差"); detail1.setOverNum((int) num1); detail1.setOverDay(day1); //筛选出频率偏差超标监测点 long num2 = list2.stream().filter(o->o.getVoltageDevOvertime() > 0).count(); Integer day2 = list2.stream().max(Comparator.comparingInt(RStatLimitTargetDPO::getVoltageDevOvertime)).get().getVoltageDevOvertime(); - EvaluationLevelVo.TargetDetail detail2 = new EvaluationLevelVo.TargetDetail(); - detail2.setTargetName("频率偏差"); detail2.setOverNum((int) num2); detail2.setOverDay(day2); //筛选出电压总谐波畸变率超标监测点 long num3 = list2.stream().filter(o->o.getUaberranceOvertime() > 0).count(); Integer day3 = list2.stream().max(Comparator.comparingInt(RStatLimitTargetDPO::getUaberranceOvertime)).get().getUaberranceOvertime(); - EvaluationLevelVo.TargetDetail detail3 = new EvaluationLevelVo.TargetDetail(); - detail3.setTargetName("电压总谐波畸变率"); detail3.setOverNum((int) num3); detail3.setOverDay(day3); //筛选出电压闪变超标监测点 long num4 = list2.stream().filter(o->o.getFlickerOvertime() > 0).count(); Integer day4 = list2.stream().max(Comparator.comparingInt(RStatLimitTargetDPO::getFlickerOvertime)).get().getFlickerOvertime(); - EvaluationLevelVo.TargetDetail detail4 = new EvaluationLevelVo.TargetDetail(); - detail4.setTargetName("闪变"); detail4.setOverNum((int) num4); detail4.setOverDay(day4); //筛选出三相电压不平衡度超标监测点 long num5 = list2.stream().filter(o->o.getUbalanceOvertime() > 0).count(); Integer day5 = list2.stream().max(Comparator.comparingInt(RStatLimitTargetDPO::getUbalanceOvertime)).get().getUbalanceOvertime(); - EvaluationLevelVo.TargetDetail detail5 = new EvaluationLevelVo.TargetDetail(); - detail5.setTargetName("三相电压不平衡度"); detail5.setOverNum((int) num5); detail5.setOverDay(day5); - List details = Arrays.asList(detail1, detail2, detail3, detail4, detail5); - detail.setList(details); } + List details = Arrays.asList(detail1, detail2, detail3, detail4, detail5); + detail.setList(details); } result.add(detail); } @@ -520,8 +520,8 @@ public class GridServiceImpl implements IGridService { qualifiedDetail.setPlt(PubUtils.doubleRound(2,100.0-(item2.getFlickerOvertime()*100.0/item2.getAllTime()))); qualifiedDetail.setUbalance(PubUtils.doubleRound(2,100.0-(item2.getUbalanceOvertime()*100.0/item2.getAllTime()))); } - result.add(qualifiedDetail); } + result.add(qualifiedDetail); }); return result; }