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

1.全景增加技术监督计划调整

Browse Source 
2.增加暂态列表信息和监测点评估信息
This commit is contained in:
wr
2025-12-12 15:01:29 +08:00
parent 601a78246e
commit a6d2d6ed47
18 changed files with 273 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java
View File

@@ -1201,32 +1201,36 @@ public class PollutionSubstationServiceImpl extends ServiceImpl<RStatPollutionSu
if (CollUtil.isNotEmpty(lineIdList)) {
List<RMpPollutionDPO> pollutionList = rMpPollutionDPOMapper.selectSumList(lineIdList, param.getIds(), param.getStartTime(), param.getEndTime());
Map<String, Double> pollutionMap = pollutionList.stream().collect(Collectors.toMap(RMpPollutionDPO::getLineId, RMpPollutionDPO::getValue));
//获取监测点详细信息
List<PollutionLineInfoDTO> lineInfoDTOList = commLineClient.getPollutionLineInfo(lineIdList).getData();
List<PowerFlagPollution> linePollutionList;
for (GeneralDeviceDTO item : deptData) {
linePollutionList = new ArrayList<>();
AreaPollution pollution = new AreaPollution();
pollution.setDeptName(item.getName());
pollution.setDeptId(item.getIndex());
List<PollutionLineInfoDTO> lineDetails = lineInfoDTOList.stream().filter(x -> item.getLineIndexes().contains(x.getLineId())).collect(Collectors.toList());
PowerFlagPollution pollution1;
for (PollutionLineInfoDTO lineDetail : lineDetails) {
pollution1 = new PowerFlagPollution();
pollution1.setLineName(lineDetail.getLineName());
pollution1.setDevName(lineDetail.getDevName());
pollution1.setManufacturer(lineDetail.getManufacturer());
pollution1.setDevType(lineDetail.getDevType());
pollution1.setLoginTime(lineDetail.getLoginTime());
pollution1.setInterval(lineDetail.getTimeInterval());
pollution1.setPowerFlag(lineDetail.getPowerFlag());
pollution1.setVHarmonicValue(pollutionMap.containsKey(lineDetail.getLineId())?NumberUtil.round(pollutionMap.get(lineDetail.getLineId()),2).doubleValue():0.0);
linePollutionList.add(pollution1);
List<PollutionLineInfoDTO> lineDetailList = commLineClient.getPollutionLineInfo(lineIdList).getData();
Map<String, List<PollutionLineInfoDTO>> lineDetailMap = lineDetailList.stream().collect(Collectors.groupingBy(PollutionLineInfoDTO::getActualArea));
//获取部门
List<DeptDTO> deptList = deptFeignClient.getDepSonDetailByDeptId(param.getId()).getData();
deptList.forEach(item -> {
if (lineDetailMap.containsKey(item.getArea())) {
List<PowerFlagPollution> linePollutionList = new ArrayList<>();
AreaPollution pollution = new AreaPollution();
pollution.setDeptName(item.getName());
pollution.setDeptId(item.getId());
List<PollutionLineInfoDTO> lineDetails = lineDetailMap.get(item.getArea()).stream().collect(Collectors.toList());
PowerFlagPollution pollution1;
for (PollutionLineInfoDTO lineDetail : lineDetails) {
pollution1 = new PowerFlagPollution();
pollution1.setLineName(lineDetail.getLineName());
pollution1.setDevName(lineDetail.getDevName());
pollution1.setManufacturer(lineDetail.getManufacturer());
pollution1.setDevType(lineDetail.getDevType());
pollution1.setLoginTime(lineDetail.getLoginTime());
pollution1.setInterval(lineDetail.getTimeInterval());
pollution1.setPowerFlag(lineDetail.getPowerFlag());
pollution1.setVHarmonicValue(pollutionMap.containsKey(lineDetail.getLineId())?NumberUtil.round(pollutionMap.get(lineDetail.getLineId()),2).doubleValue():0.0);
linePollutionList.add(pollution1);
}
pollution.setPowerFlagPollutionList(linePollutionList.stream().sorted(Comparator.comparing(PowerFlagPollution::getVHarmonicValue).reversed()).collect(Collectors.toList()));
pollution.setScore(NumberUtil.round(linePollutionList.stream().mapToDouble(PowerFlagPollution::getVHarmonicValue).sum(),2).doubleValue());
info.add(pollution);
}
pollution.setPowerFlagPollutionList(linePollutionList.stream().sorted(Comparator.comparing(PowerFlagPollution::getVHarmonicValue).reversed()).collect(Collectors.toList()));
pollution.setScore(NumberUtil.round(linePollutionList.stream().mapToDouble(PowerFlagPollution::getVHarmonicValue).sum(),2).doubleValue());
info.add(pollution);
}
});
}
return info;
}

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

@@ -186,7 +186,7 @@ public class RStatLimitServiceImpl implements RStatLimitService {
baseParam.setIds(onLine);
baseParam.setStartTime(DateUtil.beginOfDay(DateUtil.parse(param.getSearchBeginTime())).toString());
baseParam.setEndTime(DateUtil.endOfDay(DateUtil.parse(param.getSearchEndTime())).toString());
List<String> linesTarget = targetDService.getLinesTarget(baseParam);
List<String> linesTarget = targetDService.getLinesHarmTarget(baseParam);
List<RStatIntegrityD> integrityDS = lineIntegrityClient.getIntegrityByLineIds(onLine,
DateUtil.beginOfDay(DateUtil.parse(param.getSearchBeginTime())).toString(),
DateUtil.endOfDay(DateUtil.parse(param.getSearchEndTime())).toString()).getData();
@@ -272,7 +272,7 @@ public class RStatLimitServiceImpl implements RStatLimitService {
baseParam.setStartTime(DateUtil.beginOfDay(DateUtil.parse(param.getSearchBeginTime())).toString());
baseParam.setEndTime(DateUtil.endOfDay(DateUtil.parse(param.getSearchEndTime())).toString());
List<String> linesTarget = targetDService.getLinesHarmTarget(baseParam);
List<RStatIntegrityD> integrityDS = lineIntegrityClient.getIntegrityByLineIds(online,
List<RStatIntegrityD> integrityDS = lineIntegrityClient.getIntegrityByLineIds(line,
DateUtil.beginOfDay(DateUtil.parse(param.getSearchBeginTime())).toString(),
DateUtil.endOfDay(DateUtil.parse(param.getSearchEndTime())).toString()).getData();
//在线率大于90的点
@@ -299,7 +299,7 @@ public class RStatLimitServiceImpl implements RStatLimitService {
//数据完整性≥90% - <90%
GridDiagramVO.RunData integrityData = new GridDiagramVO.RunData();
List<String> integrity = online.stream().filter(x -> !integrityDS90.contains(x)).distinct().collect(Collectors.toList());
List<String> integrity = line.stream().filter(x -> !integrityDS90.contains(x)).distinct().collect(Collectors.toList());
integrityData.setLineNumOne(integrityDS90.size());
integrityData.setLineListOne(integrityDS90);
integrityData.setLineNumTwo(integrity.size());
@@ -309,7 +309,7 @@ public class RStatLimitServiceImpl implements RStatLimitService {
//电能质量指标未超标-超标
GridDiagramVO.RunData targetData = new GridDiagramVO.RunData();
List<String> integrityS = online.stream().filter(x -> !linesTarget.contains(x)).distinct().collect(Collectors.toList());
List<String> integrityS = line.stream().filter(x -> !linesTarget.contains(x)).distinct().collect(Collectors.toList());
targetData.setLineNumOne(integrityS.size());
targetData.setLineListOne(integrityS);
targetData.setLineNumTwo(linesTarget.size());