修改查询分页处理

wl

2022-09-20 4e260f558428dd81c4dd8981a965cdaa0ebf12de

 ycl-platform/src/main/java/com/ycl/controller/zf/VideowarmEventsreportController.java

@@ -4,8 +4,10 @@
import com.alibaba.excel.EasyExcel;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.api.CommonResult;
import com.ycl.controller.BaseController;
import com.ycl.entity.platform.zf.EnforcelawReport;
import com.ycl.entity.platform.zf.VideowarmEventsreport;
import com.ycl.service.platform.zf.IVideowarmEventsreportService;
import io.swagger.annotations.Api;
@@ -47,23 +49,10 @@
                               @RequestParam(required = false) Integer current,
                               @RequestParam(required = false) Integer size
    ) {
        QueryWrapper<VideowarmEventsreport> videowarmEventsreportQueryWrapper = new QueryWrapper<>();
        if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
            videowarmEventsreportQueryWrapper.between("cTime", startTime, endTime);
        }
        if (StringUtils.isNotBlank(eventName)) {
            videowarmEventsreportQueryWrapper.eq("eventName", eventName);
        }
        if (StringUtils.isNotBlank(eventType)) {
            videowarmEventsreportQueryWrapper.eq("eventType", eventType);
        }
        if (StringUtils.isNotBlank(eventLocation)) {
            videowarmEventsreportQueryWrapper.eq("eventLocation", eventLocation);
        }
        if (StringUtils.isNotBlank(eventRegion)) {
            videowarmEventsreportQueryWrapper.eq("eventRegion", eventRegion);
        }
        return CommonResult.success(iVideowarmEventsreportService.list(videowarmEventsreportQueryWrapper).stream().skip((current-1)*size).limit(size).collect(Collectors.toList()));
        Page<VideowarmEventsreport> page = new Page<>();
        page.setCurrent(current);
        page.setSize(size);
        return CommonResult.success(iVideowarmEventsreportService.selectPageVo(page,startTime,endTime,eventName,eventType,eventLocation,eventRegion));
    }
    @GetMapping("/search/one")
    @ApiOperation("查询违规情况详情")