Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整事件显示

Browse Source
This commit is contained in:
xy
2024-09-03 13:00:11 +08:00
parent eeb9c787c6
commit 212350a442
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java
View File

@@ -234,14 +234,30 @@ public class CsEventUserPOServiceImpl extends ServiceImpl<CsEventUserPOMapper, C
List<String> deviceId = new ArrayList<>(); List<String> deviceId = new ArrayList<>();
List<CsLedgerVO> data = csLedgerFeignClient.getDeviceTree().getData(); List<CsLedgerVO> data = csLedgerFeignClient.getDeviceTree().getData();
// List<String> collect = data.stream().filter(temp->StringUtils.isEmpty(csEventUserQueryPage.getEngineeringid())||
// Objects.equals(temp.getId(), csEventUserQueryPage.getEngineeringid())).map(CsLedgerVO::getChildren).
// flatMap(Collection::stream).filter(
// temp->StringUtils.isEmpty(csEventUserQueryPage.getProjectId())||
// Objects.equals(temp.getId(), csEventUserQueryPage.getProjectId())
// ).
// map(CsLedgerVO::getChildren).
// flatMap(Collection::stream).filter(
// temp->StringUtils.isEmpty(csEventUserQueryPage.getDeviceId())||
// Objects.equals(temp.getId(), csEventUserQueryPage.getDeviceId())
// ).
// map(CsLedgerVO::getId).
// collect(Collectors.toList());
List<String> collect = data.stream().filter(temp->StringUtils.isEmpty(csEventUserQueryPage.getEngineeringid())|| List<String> collect = data.stream().filter(temp->StringUtils.isEmpty(csEventUserQueryPage.getEngineeringid())||
Objects.equals(temp.getId(), csEventUserQueryPage.getEngineeringid())).map(CsLedgerVO::getChildren). Objects.equals(temp.getId(), csEventUserQueryPage.getEngineeringid()))
flatMap(Collection::stream).filter( .map(CsLedgerVO::getChildren).flatMap(Collection::stream).filter(
temp->StringUtils.isEmpty(csEventUserQueryPage.getProjectId())|| temp->StringUtils.isEmpty(csEventUserQueryPage.getProjectId())||
Objects.equals(temp.getId(), csEventUserQueryPage.getProjectId()) Objects.equals(temp.getId(), csEventUserQueryPage.getProjectId())
). ).
map(CsLedgerVO::getChildren). map(CsLedgerVO::getChildren).flatMap(Collection::stream).filter(
flatMap(Collection::stream).filter( temp->StringUtils.isEmpty(csEventUserQueryPage.getDeviceId())||
Objects.equals(temp.getId(), csEventUserQueryPage.getDeviceId())
).
map(CsLedgerVO::getChildren).flatMap(Collection::stream).filter(
temp->StringUtils.isEmpty(csEventUserQueryPage.getDeviceId())|| temp->StringUtils.isEmpty(csEventUserQueryPage.getDeviceId())||
Objects.equals(temp.getId(), csEventUserQueryPage.getDeviceId()) Objects.equals(temp.getId(), csEventUserQueryPage.getDeviceId())
). ).
@@ -251,7 +267,6 @@ public class CsEventUserPOServiceImpl extends ServiceImpl<CsEventUserPOMapper, C
return returnpage; return returnpage;
} }
returnpage = this.getBaseMapper().queryEventpage(returnpage,csEventUserQueryPage,collect,flag); returnpage = this.getBaseMapper().queryEventpage(returnpage,csEventUserQueryPage,collect,flag);
returnpage.getRecords().forEach(temp->{ returnpage.getRecords().forEach(temp->{