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-08-01 14:48:15 +08:00
parent 055c762415
commit e54df08dca
8 changed files with 51 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -825,11 +825,8 @@ public class PollutionSubstationServiceImpl extends ServiceImpl<RStatPollutionSu
Map<String, String> lineOrgName = lineNameList.stream().collect(Collectors.toMap(LineDevGetDTO::getPointId, LineDevGetDTO::getUnitName));
//获取监测点集合
Map<String, List<String>> lineMap = this.getLineMap(list, searchValue);
List<String> lineList = lineMap.values().stream()
.flatMap(List::stream)
.distinct()
.collect(Collectors.toList());
List<LineDetail> data = lineFeignClient.getByName(searchValue).getData();
List<String> lineList = data.stream().map(LineDetail::getId).distinct().collect(Collectors.toList());
if (CollUtil.isNotEmpty(lineList)) {
//获取监测点的超标数据
List<RStatLimitRateDPO> limitRateList = rStatLimitRateDMapper.getAllOverTimes(lineList, startTime, endTime);
@@ -849,11 +846,7 @@ public class PollutionSubstationServiceImpl extends ServiceImpl<RStatPollutionSu
List<RMpPollutionDPO> harmonicI = lineData.stream().filter(x -> i.equals(x.getPollutionType())).collect(Collectors.toList());
//获取监测点详细信息
List<LineDetail> lineDetailList = lineFeignClient.getLineDetail(lineList).getData();
if(StrUtil.isNotBlank(searchValue)){
lineDetailList= lineDetailList.stream().filter(item -> item.getPowerSubstationName().contains(searchValue)).collect(Collectors.toList());
}
Map<String, List<LineDetail>> lineDetailMap = lineDetailList.stream().filter(x -> StrUtil.isNotBlank(x.getPowerSubstationName())).collect(Collectors.groupingBy(LineDetail::getPowerSubstationName));
Map<String, List<LineDetail>> lineDetailMap = data.stream().filter(x -> StrUtil.isNotBlank(x.getPowerSubstationName())).collect(Collectors.groupingBy(LineDetail::getPowerSubstationName));
lineDetailMap.forEach((key, value) -> {
AtomicInteger alarmTime = new AtomicInteger();
SubstationVo vo = new SubstationVo();
@@ -879,28 +872,6 @@ public class PollutionSubstationServiceImpl extends ServiceImpl<RStatPollutionSu
return result;
}
/**
* 监测点名称筛选
* @param list
* @param searchValue
* @return
*/
public Map<String, List<String>> getLineMap(List<DeptGetChildrenMoreDTO> list, String searchValue) {
Map<String, List<String>> map = new HashMap<>();
list.forEach(it -> {
Predicate<LineDevGetDTO> voltageFilter = item -> true;
if (!Objects.isNull(searchValue) && !Objects.equals(searchValue, "")) {
voltageFilter = item -> item.getPointName().contains(searchValue);
}
Predicate<LineDevGetDTO> combinedFilter = voltageFilter;
map.put(it.getUnitName(), it.getLineBaseList().stream()
.filter(combinedFilter)
.map(LineDevGetDTO::getPointId)
.distinct()
.collect(Collectors.toList()));
});
return map;
}
private List<String> addList(List<RStatPollutionSubstationM> substationMlist) {