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 1e0e6197..238681dc 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 @@ -200,19 +200,22 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService { List eventIds = eventdetails.stream().map(PqsEventdetail::getEventdetailIndex).collect(Collectors.toList()); //通知 List msgEventInfoList = new ArrayList<>(); - if(eventIds.size()>1000){ - List> listEven = CollUtil.split(eventIds,1000); - for(List pList: listEven){ - List temp = msgEventInfoService.lambdaQuery().in(MsgEventInfo::getEventIndex,pList).list(); + if(!CollectionUtils.isEmpty(eventIds)){ + if(eventIds.size()>1000){ + List> listEven = CollUtil.split(eventIds,1000); + for(List pList: listEven){ + List temp = msgEventInfoService.lambdaQuery().in(MsgEventInfo::getEventIndex,pList).list(); + msgEventInfoList.addAll(temp); + } + }else { + List temp = msgEventInfoService.lambdaQuery().in(MsgEventInfo::getEventIndex,eventIds).list(); msgEventInfoList.addAll(temp); } - }else { - List temp = msgEventInfoService.lambdaQuery().in(MsgEventInfo::getEventIndex,eventIds).list(); - msgEventInfoList.addAll(temp); } + List lookALarmEvent = aLarmEvent.stream().filter(temp ->Objects.equals(temp.getLookFlag(),1 )).collect(Collectors.toList()); List lookWarnEvent = warnEvent.stream().filter(temp ->Objects.equals(temp.getLookFlag(),1 ) ).collect(Collectors.toList()); List handleMsg = msgEventInfoList.stream().filter(temp -> Objects.equals(temp.getIsHandle(), 1)).collect(Collectors.toList());