diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java index 02ce0ac98..ae9a28a3b 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java @@ -296,7 +296,7 @@ public class TransientServiceImpl implements TransientService { List lineList = generalDeviceDTOList.stream().flatMap(dto -> dto.getLineIndexes().stream()).collect(Collectors.toList()); List data = deviceTreeClient.getTerminalTree().getData(); if(!CollectionUtils.isEmpty(transientParam.getSubstationIds())){ - List collect = data.stream().map(TerminalTree::getChildren).flatMap(Collection::stream) + List 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) @@ -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) - .collect(Collectors.toList()); + .map(TerminalTree::getId).collect(Collectors.toList()); lineList.retainAll(collect); } if(!CollectionUtils.isEmpty(transientParam.getLineIds())){ - List collect1 = data.stream().map(TerminalTree::getChildren).flatMap(Collection::stream) + List 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) @@ -317,7 +317,7 @@ public class TransientServiceImpl implements TransientService { .map(TerminalTree::getChildren).flatMap(Collection::stream) .map(TerminalTree::getChildren).flatMap(Collection::stream) .filter(temp->transientParam.getLineIds().contains(temp.getId())) - .collect(Collectors.toList()); + .map(TerminalTree::getId).collect(Collectors.toList()); lineList.retainAll(collect1); } if(CollUtil.isEmpty(lineList)){