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
2024-11-25 20:02:57 +08:00
parent c6f767b3aa
commit 5b4b756fc3
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -296,7 +296,7 @@ public class TransientServiceImpl implements TransientService {
List<String> lineList = generalDeviceDTOList.stream().flatMap(dto -> dto.getLineIndexes().stream()).collect(Collectors.toList()); List<String> lineList = generalDeviceDTOList.stream().flatMap(dto -> dto.getLineIndexes().stream()).collect(Collectors.toList());
List<TerminalTree> data = deviceTreeClient.getTerminalTree().getData(); List<TerminalTree> data = deviceTreeClient.getTerminalTree().getData();
if(!CollectionUtils.isEmpty(transientParam.getSubstationIds())){ if(!CollectionUtils.isEmpty(transientParam.getSubstationIds())){
List<TerminalTree> collect = data.stream().map(TerminalTree::getChildren).flatMap(Collection::stream) 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) .map(TerminalTree::getChildren).flatMap(Collection::stream)
.map(TerminalTree::getChildren).flatMap(Collection::stream) .map(TerminalTree::getChildren).flatMap(Collection::stream)
@@ -304,12 +304,12 @@ public class TransientServiceImpl implements TransientService {
.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)
.collect(Collectors.toList()); .map(TerminalTree::getId).collect(Collectors.toList());
lineList.retainAll(collect); lineList.retainAll(collect);
} }
if(!CollectionUtils.isEmpty(transientParam.getLineIds())){ if(!CollectionUtils.isEmpty(transientParam.getLineIds())){
List<TerminalTree> collect1 = data.stream().map(TerminalTree::getChildren).flatMap(Collection::stream) 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)
@@ -317,7 +317,7 @@ public class TransientServiceImpl implements TransientService {
.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())) .filter(temp->transientParam.getLineIds().contains(temp.getId()))
.collect(Collectors.toList()); .map(TerminalTree::getId).collect(Collectors.toList());
lineList.retainAll(collect1); lineList.retainAll(collect1);
} }
if(CollUtil.isEmpty(lineList)){ if(CollUtil.isEmpty(lineList)){