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

调整

Browse Source
This commit is contained in:
xy
2024-04-29 17:54:40 +08:00
parent 7ebc540823
commit 40a5504086
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,7 +80,7 @@ public class GridServiceImpl implements IGridService {
//获取综合评估 //获取综合评估
List<PQSComAssesPO> list2 = rStatComassesDMapper.getAvgCount(lineList,param.getStartTime(),param.getEndTime()); List<PQSComAssesPO> list2 = rStatComassesDMapper.getAvgCount(lineList,param.getStartTime(),param.getEndTime());
list.forEach(item->{ list.forEach(item->{
if (!Objects.equals(item.getDeptLevel(), 2)) { if (Objects.equals(item.getDeptLevel(), 3)) {
AssessVo assessVo = new AssessVo(); AssessVo assessVo = new AssessVo();
assessVo.setName(item.getUnitName()); assessVo.setName(item.getUnitName());
if (CollUtil.isNotEmpty(item.getLineBaseList())) { if (CollUtil.isNotEmpty(item.getLineBaseList())) {
@@ -129,7 +129,7 @@ public class GridServiceImpl implements IGridService {
List<RStatLimitRateDPO> list3 = rStatLimitRateDMapper.getAssessTargetRate(lineList,param.getStartTime(),param.getEndTime()); List<RStatLimitRateDPO> list3 = rStatLimitRateDMapper.getAssessTargetRate(lineList,param.getStartTime(),param.getEndTime());
//数据处理 //数据处理
list.forEach(item->{ list.forEach(item->{
if (!Objects.equals(item.getDeptLevel(), 2)) { if (Objects.equals(item.getDeptLevel(), 3)) {
List<String> ll = item.getLineBaseList().stream().map(LineDevGetDTO::getPointId).collect(Collectors.toList()); List<String> ll = item.getLineBaseList().stream().map(LineDevGetDTO::getPointId).collect(Collectors.toList());
AssessDetailVo comAssess = getAssessData(item.getUnitId(),item.getUnitName(), ll, list1, list2, list3); AssessDetailVo comAssess = getAssessData(item.getUnitId(),item.getUnitName(), ll, list1, list2, list3);
result.add(comAssess); result.add(comAssess);
@@ -170,7 +170,7 @@ public class GridServiceImpl implements IGridService {
map.put(month.toString(),comAssesList); map.put(month.toString(),comAssesList);
}); });
list.forEach(item->{ list.forEach(item->{
if (!Objects.equals(item.getDeptLevel(), 2)) { if (Objects.equals(item.getDeptLevel(), 3)) {
AssessVo.AssessTrendVo vo = new AssessVo.AssessTrendVo(); AssessVo.AssessTrendVo vo = new AssessVo.AssessTrendVo();
vo.setDeptId(item.getUnitId()); vo.setDeptId(item.getUnitId());
vo.setDeptName(item.getUnitName()); vo.setDeptName(item.getUnitName());
@@ -237,7 +237,7 @@ public class GridServiceImpl implements IGridService {
//获取监测点所有指标数据 //获取监测点所有指标数据
List<RStatLimitRateDPO> limitRateList = rStatLimitRateDMapper.getAssessTargetRate(lineList,param.getStartTime(),param.getEndTime()); List<RStatLimitRateDPO> limitRateList = rStatLimitRateDMapper.getAssessTargetRate(lineList,param.getStartTime(),param.getEndTime());
list.forEach(item->{ list.forEach(item->{
if (!Objects.equals(item.getDeptLevel(), 2)) { if (Objects.equals(item.getDeptLevel(), 3)) {
EvaluationVo.Children children = new EvaluationVo.Children(); EvaluationVo.Children children = new EvaluationVo.Children();
children.setDeptId(item.getUnitId()); children.setDeptId(item.getUnitId());
children.setDeptName(item.getUnitName()); children.setDeptName(item.getUnitName());
@@ -412,7 +412,7 @@ public class GridServiceImpl implements IGridService {
//获取监测点越限集合 //获取监测点越限集合
List<RStatLimitTargetDPO> overLimitList = rStatLimitTargetDMapper.getSumTarget(line,param.getStartTime(),param.getEndTime()); List<RStatLimitTargetDPO> overLimitList = rStatLimitTargetDMapper.getSumTarget(line,param.getStartTime(),param.getEndTime());
list.forEach(item->{ list.forEach(item->{
if (!Objects.equals(item.getDeptLevel(), 2)) { if (Objects.equals(item.getDeptLevel(), 3)) {
EvaluationLevelVo.EvaluationDetail detail = new EvaluationLevelVo.EvaluationDetail(); EvaluationLevelVo.EvaluationDetail detail = new EvaluationLevelVo.EvaluationDetail();
detail.setDeptId(item.getUnitId()); detail.setDeptId(item.getUnitId());
detail.setDeptName(item.getUnitName()); detail.setDeptName(item.getUnitName());
@@ -422,8 +422,19 @@ public class GridServiceImpl implements IGridService {
detail.setOnlineNum(list1.size()); detail.setOnlineNum(list1.size());
//筛选当前部门下监测点的超标数据 //筛选当前部门下监测点的超标数据
List<RStatLimitTargetDPO> list2 = overLimitList.stream().filter(it->list1.contains(it.getLineId())).collect(Collectors.toList()); List<RStatLimitTargetDPO> 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 long allNum = list2.stream().filter(o->o.getFreqDevOvertime() > 0
|| o.getVoltageDevOvertime() > 0 || o.getVoltageDevOvertime() > 0
@@ -432,50 +443,39 @@ public class GridServiceImpl implements IGridService {
|| o.getUbalanceOvertime() > 0).count(); || o.getUbalanceOvertime() > 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()));
//筛选出电压偏差超标监测点 //筛选出电压偏差超标监测点
long num1 = list2.stream().filter(o->o.getFreqDevOvertime() > 0).count(); long num1 = list2.stream().filter(o->o.getFreqDevOvertime() > 0).count();
Integer day1 = list2.stream().max(Comparator.comparingInt(RStatLimitTargetDPO::getFreqDevOvertime)).get().getFreqDevOvertime(); Integer day1 = list2.stream().max(Comparator.comparingInt(RStatLimitTargetDPO::getFreqDevOvertime)).get().getFreqDevOvertime();
EvaluationLevelVo.TargetDetail detail1 = new EvaluationLevelVo.TargetDetail();
detail1.setTargetName("电压偏差");
detail1.setOverNum((int) num1); detail1.setOverNum((int) num1);
detail1.setOverDay(day1); detail1.setOverDay(day1);
//筛选出频率偏差超标监测点 //筛选出频率偏差超标监测点
long num2 = list2.stream().filter(o->o.getVoltageDevOvertime() > 0).count(); long num2 = list2.stream().filter(o->o.getVoltageDevOvertime() > 0).count();
Integer day2 = list2.stream().max(Comparator.comparingInt(RStatLimitTargetDPO::getVoltageDevOvertime)).get().getVoltageDevOvertime(); Integer day2 = list2.stream().max(Comparator.comparingInt(RStatLimitTargetDPO::getVoltageDevOvertime)).get().getVoltageDevOvertime();
EvaluationLevelVo.TargetDetail detail2 = new EvaluationLevelVo.TargetDetail();
detail2.setTargetName("频率偏差");
detail2.setOverNum((int) num2); detail2.setOverNum((int) num2);
detail2.setOverDay(day2); detail2.setOverDay(day2);
//筛选出电压总谐波畸变率超标监测点 //筛选出电压总谐波畸变率超标监测点
long num3 = list2.stream().filter(o->o.getUaberranceOvertime() > 0).count(); long num3 = list2.stream().filter(o->o.getUaberranceOvertime() > 0).count();
Integer day3 = list2.stream().max(Comparator.comparingInt(RStatLimitTargetDPO::getUaberranceOvertime)).get().getUaberranceOvertime(); Integer day3 = list2.stream().max(Comparator.comparingInt(RStatLimitTargetDPO::getUaberranceOvertime)).get().getUaberranceOvertime();
EvaluationLevelVo.TargetDetail detail3 = new EvaluationLevelVo.TargetDetail();
detail3.setTargetName("电压总谐波畸变率");
detail3.setOverNum((int) num3); detail3.setOverNum((int) num3);
detail3.setOverDay(day3); detail3.setOverDay(day3);
//筛选出电压闪变超标监测点 //筛选出电压闪变超标监测点
long num4 = list2.stream().filter(o->o.getFlickerOvertime() > 0).count(); long num4 = list2.stream().filter(o->o.getFlickerOvertime() > 0).count();
Integer day4 = list2.stream().max(Comparator.comparingInt(RStatLimitTargetDPO::getFlickerOvertime)).get().getFlickerOvertime(); Integer day4 = list2.stream().max(Comparator.comparingInt(RStatLimitTargetDPO::getFlickerOvertime)).get().getFlickerOvertime();
EvaluationLevelVo.TargetDetail detail4 = new EvaluationLevelVo.TargetDetail();
detail4.setTargetName("闪变");
detail4.setOverNum((int) num4); detail4.setOverNum((int) num4);
detail4.setOverDay(day4); detail4.setOverDay(day4);
//筛选出三相电压不平衡度超标监测点 //筛选出三相电压不平衡度超标监测点
long num5 = list2.stream().filter(o->o.getUbalanceOvertime() > 0).count(); long num5 = list2.stream().filter(o->o.getUbalanceOvertime() > 0).count();
Integer day5 = list2.stream().max(Comparator.comparingInt(RStatLimitTargetDPO::getUbalanceOvertime)).get().getUbalanceOvertime(); Integer day5 = list2.stream().max(Comparator.comparingInt(RStatLimitTargetDPO::getUbalanceOvertime)).get().getUbalanceOvertime();
EvaluationLevelVo.TargetDetail detail5 = new EvaluationLevelVo.TargetDetail();
detail5.setTargetName("三相电压不平衡度");
detail5.setOverNum((int) num5); detail5.setOverNum((int) num5);
detail5.setOverDay(day5); detail5.setOverDay(day5);
}
List<EvaluationLevelVo.TargetDetail> details = Arrays.asList(detail1, detail2, detail3, detail4, detail5); List<EvaluationLevelVo.TargetDetail> details = Arrays.asList(detail1, detail2, detail3, detail4, detail5);
detail.setList(details); detail.setList(details);
} }
}
result.add(detail); 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.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()))); qualifiedDetail.setUbalance(PubUtils.doubleRound(2,100.0-(item2.getUbalanceOvertime()*100.0/item2.getAllTime())));
} }
result.add(qualifiedDetail);
} }
result.add(qualifiedDetail);
}); });
return result; return result;
} }