From dfea866e55c725bd601ff84c92dff30f83057571 Mon Sep 17 00:00:00 2001 From: zhanghua <314079846@qq.com> Date: 星期四, 30 三月 2023 19:56:59 +0800 Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server --- ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java index 7361032..85b4413 100644 --- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java +++ b/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; @@ -13,6 +14,7 @@ import com.ycl.vo.cockpit.enforcementEvents.DelayVO; import com.ycl.vo.cockpit.enforcementEvents.EventVO; import com.ycl.vo.cockpit.enforcementEvents.VideoAndAreaVO; +import org.springframework.web.bind.annotation.RequestParam; import java.util.ArrayList; import java.util.List; @@ -37,9 +39,9 @@ */ String uploadEvent(Long caseId); - Page listViolationsPage(Page page, Integer state, Integer resource, String code, String categoryBig, String categorySmall, Integer street, String site, String startTime, String endTime,Integer violationsTypeId,Integer videoId); + Page listViolationsPage(Integer size, Integer current, Integer state, Integer resource, String code, String categoryBig, String categorySmall, Integer street, String site, String startTime, String endTime, Integer violationsTypeId,Integer videoId); - Page listIllegalBuilding(Page page, Integer state, Integer resource); + Page listIllegalBuilding(Integer size, Integer current, Integer state, Integer resource); Boolean saveViolationCase(ViolationParam violationParam, Long id); @@ -67,7 +69,7 @@ List<QueryForViolationVO> selectViolationList(QueryForViolationParam queryForViolationParam); - Page<BaseCaseVO> selectVideoInspection(Integer current); + Page<BaseCaseVO> selectVideoInspection(Integer current, Long gradeId, Long videoId, String beginTime, String endTime); Map<String, Object> selectCount(); @@ -81,11 +83,11 @@ Integer alCount(); - List<EventVO> selectEventList(String beginTime, String endTime); + IPage<EventVO> selectEventList(String beginTime, String endTime, Integer pageIndex, Integer pageSize); List<VideoAndAreaVO> areaCount(); List<DelayVO> selectDelayList(); - Map<String,Object> statistics(); + Map<String, Object> statistics(); } \ No newline at end of file -- Gitblit v1.8.0