ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

微调

Browse Source
This commit is contained in:
cdf
2025-08-06 15:28:41 +08:00
parent ca1b1661d1
commit 71083101ae
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/EventRightServiceImpl.java
View File

@@ -2,6 +2,8 @@ package com.njcn.gather.event.transientes.service.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.date.LocalDateTimeUtil; import cn.hutool.core.date.LocalDateTimeUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
@@ -33,6 +35,7 @@ import org.springframework.util.CollectionUtils;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode; import java.math.RoundingMode;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*; import java.util.*;
import java.util.function.Function; import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@@ -261,8 +264,9 @@ public class EventRightServiceImpl implements EventRightService {
@Override @Override
public Page<DeviceDTO> rightEventDevOpen(LargeScreenCountParam param) { public Page<DeviceDTO> rightEventDevOpen(LargeScreenCountParam param) {
LocalDateTime startTime = param.getStartTime().atStartOfDay(); DateTime startTime = DateUtil.beginOfDay(DateUtil.parse(param.getSearchBeginTime(), DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN)));
LocalDateTime endTime = LocalDateTimeUtil.endOfDay(param.getEndTime().atStartOfDay()); DateTime endTime = DateUtil.endOfDay(DateUtil.parse(param.getSearchEndTime(), DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN)));
Page<DeviceDTO> result = new Page<>(PageFactory.getPageNum(param),PageFactory.getPageSize(param)); Page<DeviceDTO> result = new Page<>(PageFactory.getPageNum(param),PageFactory.getPageSize(param));
List<Integer> lineIds = commGeneralService.getLineIdsByRedis(param.getDeptId()); List<Integer> lineIds = commGeneralService.getLineIdsByRedis(param.getDeptId());
@@ -275,7 +279,18 @@ public class EventRightServiceImpl implements EventRightService {
List<String> userIds = assPOList.stream().map(PqUserLineAssPO::getUserIndex).collect(Collectors.toList()); List<String> userIds = assPOList.stream().map(PqUserLineAssPO::getUserIndex).collect(Collectors.toList());
LambdaQueryWrapper<PqUserLedgerPO> lambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PqUserLedgerPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
if(userIds.size() > 1000){
List<List<String>> userIdList = CollUtil.split(userIds,1000);
lambdaQueryWrapper.and(ad->{
for(List<String> ids : userIdList){
ad.or(o->o.in(PqUserLedgerPO::getId,ids));
}
});
}else {
lambdaQueryWrapper.in(PqUserLedgerPO::getId,userIds); lambdaQueryWrapper.in(PqUserLedgerPO::getId,userIds);
}
if(StrUtil.isNotBlank(param.getBigObjType())){ if(StrUtil.isNotBlank(param.getBigObjType())){
//对象大类不为空 //对象大类不为空
lambdaQueryWrapper.eq(PqUserLedgerPO::getBigObjType,param.getBigObjType()); lambdaQueryWrapper.eq(PqUserLedgerPO::getBigObjType,param.getBigObjType());