初始版本提交
This commit is contained in:
@@ -334,14 +334,13 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService {
|
||||
for(List<Integer> pList: idPartitions){
|
||||
ew.or(w->w.in(PqsEventdetail::getLineid, pList));
|
||||
}
|
||||
}).orderByAsc(PqsEventdetail::getLookFlag)
|
||||
.orderByDesc(PqsEventdetail::getTimeid);
|
||||
}).orderByDesc(PqsEventdetail::getTimeid);
|
||||
|
||||
|
||||
} else {
|
||||
queryWrapper.lambda()
|
||||
.between(PqsEventdetail::getTimeid, startTime, endTime)
|
||||
.in(PqsEventdetail::getLineid, deptslineIds)
|
||||
.orderByAsc(PqsEventdetail::getLookFlag)
|
||||
.orderByDesc(PqsEventdetail::getTimeid);
|
||||
}
|
||||
//查询需要发送短息处理的部门反推监测点
|
||||
@@ -355,8 +354,11 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService {
|
||||
return pqsDeptsService.findDeptAndChildren(temp.getDeptsIndex());
|
||||
}).flatMap(Collection::stream).distinct().collect(Collectors.toList());
|
||||
//获取对应监测点id
|
||||
if(!CollectionUtils.isEmpty(noticeDept)){
|
||||
List<PqsDeptsline> noticeLine = pqsDeptslineService.lambdaQuery().in(PqsDeptsline::getDeptsIndex, noticeDept).eq(PqsDeptsline::getSystype, sysTypeZt).list();
|
||||
noticeLineIds = deptslines.stream().map(PqsDeptsline::getLineIndex).collect(Collectors.toList());
|
||||
noticeLineIds = noticeLine.stream().map(PqsDeptsline::getLineIndex).collect(Collectors.toList());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user