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 18:56:42 +08:00
parent ca32a4e3c6
commit c6f767b3aa
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -295,7 +295,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<TerminalTree> 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)
@@ -308,7 +308,7 @@ public class TransientServiceImpl implements TransientService {
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<TerminalTree> 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)