This commit is contained in:
2025-07-09 15:06:15 +08:00
parent 85d6b843ac
commit 18381ab2cc

View File

@@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
import com.njcn.dataProcess.dao.relation.mapper.RStatLimitRateDetailRelationMapper; import com.njcn.dataProcess.dao.relation.mapper.RStatLimitRateDetailRelationMapper;
import com.njcn.dataProcess.pojo.dto.*; import com.njcn.dataProcess.pojo.dto.*;
@@ -116,13 +117,14 @@ public class RelationDataLimitRateDetailImpl extends MppServiceImpl<RStatLimitRa
@Override @Override
public List<DataLimitRateDetailDto> getRawData(LineCountEvaluateParam lineParam) { public List<DataLimitRateDetailDto> getRawData(LineCountEvaluateParam lineParam) {
List<DataLimitRateDetailDto> result = new ArrayList<>(); List<DataLimitRateDetailDto> result = new ArrayList<>();
LambdaQueryWrapper<RStatLimitRateDetailD> lambdaQueryWrapper = new LambdaQueryWrapper<>(); QueryWrapper<RStatLimitRateDetailD> queryWrapper = new QueryWrapper<>();
lambdaQueryWrapper.in(CollUtil.isNotEmpty(lineParam.getLineId()), RStatLimitRateDetailD::getLineId, lineParam.getLineId()) if(StrUtil.isNotBlank(lineParam.getColumnName())){
queryWrapper.select(lineParam.getColumnName());
}
queryWrapper.lambda().in(CollUtil.isNotEmpty(lineParam.getLineId()), RStatLimitRateDetailD::getLineId, lineParam.getLineId())
.ge(RStatLimitRateDetailD::getTime, lineParam.getStartTime()) .ge(RStatLimitRateDetailD::getTime, lineParam.getStartTime())
.le(RStatLimitRateDetailD::getTime, lineParam.getEndTime()); .le(RStatLimitRateDetailD::getTime, lineParam.getEndTime());
List<RStatLimitRateDetailD> list = this.list(queryWrapper);
List<RStatLimitRateDetailD> list = this.list(lambdaQueryWrapper);
list.forEach(item -> { list.forEach(item -> {
DataLimitRateDetailDto dto = new DataLimitRateDetailDto(); DataLimitRateDetailDto dto = new DataLimitRateDetailDto();
BeanUtils.copyProperties(item, dto); BeanUtils.copyProperties(item, dto);