From 704e7207d74b6477c5f472c5aba92d484ab17f98 Mon Sep 17 00:00:00 2001 From: zhanghua <314079846@qq.com> Date: 星期三, 29 十一月 2023 17:07:11 +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 | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 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 027167c..6288ec9 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,15 +1,20 @@ 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; import com.ycl.dto.casePool.IllegalBuildingParam; +import com.ycl.dto.casePool.VideoInspectParam; import com.ycl.dto.casePool.ViolationParam; import com.ycl.entity.caseHandler.BaseCase; import com.ycl.entity.caseHandler.BaseCaseDetail; import com.ycl.vo.casePool.BaseCaseVO; import com.ycl.vo.casePool.QueryForViolationVO; +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; @@ -34,9 +39,9 @@ */ String uploadEvent(Long caseId); - Page listViolationsPage(Page page, Integer state, Integer resource); + 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 current, Integer size, Integer state, Integer resource); Boolean saveViolationCase(ViolationParam violationParam, Long id); @@ -58,17 +63,18 @@ void endCase(Long caseId, String result, String opinion); - Page<BaseCase> selectPage(Page<BaseCase> setSize, String number, Integer streetId, Integer categories, String startTime, String endTime, String site); + Page<BaseCase> selectPage(Page<BaseCase> setSize, String number, Integer communityId, Integer categories, String startTime, String endTime, String site, Integer state, Integer streetId, Integer time); + Page<QueryForViolationVO> selectViolation(QueryForViolationParam queryForViolationParam); List<QueryForViolationVO> selectViolationList(QueryForViolationParam queryForViolationParam); - Page<BaseCaseVO> selectVideoInspection(Integer current); + Page<BaseCaseVO> selectVideoInspection(Integer current, Integer pageSize, Long gradeId, Long videoId, String beginTime, String endTime); Map<String, Object> selectCount(); - Boolean updateCase(ViolationParam violationParam); + Boolean updateCase(VideoInspectParam videoInspectParam); Integer dayCount(); @@ -78,5 +84,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(); } -- Gitblit v1.8.0