From 072a2b6bfccdcc003fc3d1c1ad3e2d24330a068e Mon Sep 17 00:00:00 2001 From: hzj <826100833@qq.com> Date: Fri, 27 Jun 2025 14:16:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E7=89=88=E6=9C=AC=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LargeScreenCountServiceImpl.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/LargeScreenCountServiceImpl.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/LargeScreenCountServiceImpl.java index 13a66824..6116e4a8 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/LargeScreenCountServiceImpl.java +++ b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/LargeScreenCountServiceImpl.java @@ -334,14 +334,13 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService { for(List 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 - List noticeLine = pqsDeptslineService.lambdaQuery().in(PqsDeptsline::getDeptsIndex, noticeDept).eq(PqsDeptsline::getSystype, sysTypeZt).list(); - noticeLineIds = deptslines.stream().map(PqsDeptsline::getLineIndex).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(noticeDept)){ + List noticeLine = pqsDeptslineService.lambdaQuery().in(PqsDeptsline::getDeptsIndex, noticeDept).eq(PqsDeptsline::getSystype, sysTypeZt).list(); + noticeLineIds = noticeLine.stream().map(PqsDeptsline::getLineIndex).collect(Collectors.toList()); + } + }