ycl-common/src/main/java/com/ycl/vo/cockpit/CockpitVO.java
@@ -50,5 +50,12 @@ @ApiModelProperty(value = "结束时间,格式yyyy-MM-dd hh:mm:ss", example = "2022-10-23 13:22:22") // @NotBlank(message = "结束时间不能为空") private String endTime; @ApiModelProperty(value = "pageIndex", example = "25") private Integer pageIndex; @ApiModelProperty(value = "pageSize", example = "25") private Integer pageSize; // } } ycl-platform/src/main/java/com/ycl/controller/cockpit/enforcementEvents/EnforcementEventsController.java
@@ -1,6 +1,7 @@ package com.ycl.controller.cockpit.enforcementEvents; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.ycl.api.CommonResult; import com.ycl.dto.trend.TrendAnalysisParam; import com.ycl.entity.caseHandler.BaseCase; @@ -11,6 +12,7 @@ import com.ycl.util.CheckApiUtil; import com.ycl.vo.cockpit.CockpitVO; import com.ycl.vo.cockpit.enforcementEvents.EnforcementEventsVO; import com.ycl.vo.cockpit.enforcementEvents.EventVO; import com.ycl.vo.cockpit.enforcementEvents.VideoAndAreaVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -128,7 +130,9 @@ infoVO.setWeek(iBaseCaseService.weekCount()); infoVO.setDispatch(iBaseCaseService.dispatchCount()); infoVO.setIdentification(iBaseCaseService.alCount()); infoVO.setEvent(iBaseCaseService.selectEventList(params.getBeginTime(), params.getEndTime())); IPage<EventVO> page = iBaseCaseService.selectEventList(params.getBeginTime(), params.getEndTime(),params.getPageIndex(),params.getPageSize()); infoVO.setEvent(page.getRecords()); infoVO.setTotal(page.getTotal()); return CommonResult.success(infoVO); } } ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseCaseMapper.java
@@ -1,6 +1,7 @@ package com.ycl.mapper.caseHandler; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ycl.dto.caseHandler.QueryForViolationParam; import com.ycl.dto.cockpitManage.DelayDO; @@ -45,7 +46,7 @@ Integer dispatchCount(); List<EventVO> selectEventList(String beginTime, String endTime); IPage<EventVO> selectEventList(IPage<EventVO> page, String beginTime, String endTime); Integer alCount(); ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java
@@ -1,5 +1,6 @@ package com.ycl.service.caseHandler; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ycl.dto.caseHandler.QueryForViolationParam; @@ -81,7 +82,7 @@ Integer alCount(); List<EventVO> selectEventList(String beginTime, String endTime); IPage<EventVO> selectEventList(String beginTime, String endTime, Integer pageIndex, Integer pageSize); List<VideoAndAreaVO> areaCount(); ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ycl.bo.AdminUserDetails; @@ -476,8 +477,15 @@ } @Override public List<EventVO> selectEventList(String beginTime, String endTime) { return baseCaseMapper.selectEventList(beginTime, endTime); public IPage<EventVO> selectEventList(String beginTime, String endTime, Integer pageIndex, Integer pageSize) { if (pageIndex == null) { pageIndex = 1; } if (pageSize == null) { pageSize = 50; } IPage<EventVO> page = new Page<>(pageIndex, pageSize); return baseCaseMapper.selectEventList(page, beginTime, endTime); } @Override ycl-platform/src/main/java/com/ycl/util/CheckApiUtil.java
@@ -44,6 +44,12 @@ sb.append("&streetId="); sb.append(params.getStreetId()); } if (params.getPageIndex() != null && params.getPageSize() != null) { sb.append("&pageIndex="); sb.append(params.getPageIndex()); sb.append("&pageSize="); sb.append(params.getPageSize()); } result = MD5Util.md5Encrypt32Lower(sb.toString()); if (!params.getSign().equals(result)) { throw new ApiException(ResultCode.SIGN_ERROR); ycl-platform/src/main/java/com/ycl/vo/cockpit/enforcementEvents/EnforcementEventsVO.java
@@ -40,5 +40,7 @@ private Integer identification; @ApiModelProperty(value = "具体事件的数据信息") private List<EventVO> event; @ApiModelProperty(value = "具体事件的数据信息") private Long total; } } ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
@@ -355,7 +355,7 @@ </if> </where> order by t1.id desc </select> <select id="areaCount" resultType="com.ycl.vo.cockpit.enforcementEvents.VideoAndAreaVO"> SELECT t2.region_name name,