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

海南bug修改提交

Browse Source
This commit is contained in:
hzj
2026-01-05 11:20:23 +08:00
parent f592f2b580
commit b805bda25b
6 changed files with 8715 additions and 3993 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java
View File

@@ -340,30 +340,30 @@ public class TransientServiceImpl implements TransientService {
// 获取按终端分类的监测点索引集合
List<String> lineList = generalDeviceDTOList.stream().flatMap(dto -> dto.getLineIndexes().stream()).collect(Collectors.toList());
List<TerminalTree> data = deviceTreeClient.getTerminalTree().getData();
if (!CollectionUtils.isEmpty(transientParam.getSubstationIds())) {
List<String> collect = data.stream().map(TerminalTree::getChildren).flatMap(Collection::stream)
.map(TerminalTree::getChildren).flatMap(Collection::stream)
.map(TerminalTree::getChildren).flatMap(Collection::stream)
.map(TerminalTree::getChildren).flatMap(Collection::stream)
.filter(temp -> transientParam.getSubstationIds().contains(temp.getId()))
.map(TerminalTree::getChildren).flatMap(Collection::stream)
.map(TerminalTree::getChildren).flatMap(Collection::stream)
.map(TerminalTree::getChildren).flatMap(Collection::stream)
.map(TerminalTree::getId).collect(Collectors.toList());
lineList.retainAll(collect);
}
// if (!CollectionUtils.isEmpty(transientParam.getSubstationIds())) {
// List<String> collect = data.stream().map(TerminalTree::getChildren).flatMap(Collection::stream)
// .map(TerminalTree::getChildren).flatMap(Collection::stream)
// .map(TerminalTree::getChildren).flatMap(Collection::stream)
// .map(TerminalTree::getChildren).flatMap(Collection::stream)
// .filter(temp -> transientParam.getSubstationIds().contains(temp.getId()))
// .map(TerminalTree::getChildren).flatMap(Collection::stream)
// .map(TerminalTree::getChildren).flatMap(Collection::stream)
// .map(TerminalTree::getChildren).flatMap(Collection::stream)
// .map(TerminalTree::getId).collect(Collectors.toList());
// lineList.retainAll(collect);
// }
if (!CollectionUtils.isEmpty(transientParam.getLineIds())) {
List<String> collect1 = data.stream().map(TerminalTree::getChildren).flatMap(Collection::stream)
.map(TerminalTree::getChildren).flatMap(Collection::stream)
.map(TerminalTree::getChildren).flatMap(Collection::stream)
.map(TerminalTree::getChildren).flatMap(Collection::stream)
.map(TerminalTree::getChildren).flatMap(Collection::stream)
.map(TerminalTree::getChildren).flatMap(Collection::stream)
.map(TerminalTree::getChildren).flatMap(Collection::stream)
.filter(temp -> transientParam.getLineIds().contains(temp.getId()))
.map(TerminalTree::getId).collect(Collectors.toList());
lineList.retainAll(collect1);
// List<String> collect1 = data.stream().map(TerminalTree::getChildren).flatMap(Collection::stream)
// .map(TerminalTree::getChildren).flatMap(Collection::stream)
// .map(TerminalTree::getChildren).flatMap(Collection::stream)
// .map(TerminalTree::getChildren).flatMap(Collection::stream)
// .map(TerminalTree::getChildren).flatMap(Collection::stream)
// .map(TerminalTree::getChildren).flatMap(Collection::stream)
// .map(TerminalTree::getChildren).flatMap(Collection::stream)
// .filter(temp -> transientParam.getLineIds().contains(temp.getId()))
// .map(TerminalTree::getId).collect(Collectors.toList());
lineList.retainAll(transientParam.getLineIds());
}
if (CollUtil.isEmpty(lineList)) {
return new Page<>();