From e5bf0d08d05f5c58224fe28cdf743a1bae88e3f0 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期四, 30 十一月 2023 16:48:55 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ycl-platform/src/main/java/com/ycl/service/unlawful/UnlawfulService.java | 20 +++++++------------- 1 files changed, 7 insertions(+), 13 deletions(-) diff --git a/ycl-platform/src/main/java/com/ycl/service/unlawful/UnlawfulService.java b/ycl-platform/src/main/java/com/ycl/service/unlawful/UnlawfulService.java index 3d3f2f5..e1d902c 100644 --- a/ycl-platform/src/main/java/com/ycl/service/unlawful/UnlawfulService.java +++ b/ycl-platform/src/main/java/com/ycl/service/unlawful/UnlawfulService.java @@ -1,5 +1,6 @@ package com.ycl.service.unlawful; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ycl.dto.statistics.UnlawfulDto; @@ -8,26 +9,19 @@ public interface UnlawfulService { /** - * 鎸夌被鍨� + * 鎸夌被鍨� */ - public List<UnlawfulDto> getUnlawfulByType(Integer currentPage, Integer pageSize, String startTime, String endTime); - public List<UnlawfulDto> getUnlawfulByTypeExport(); + IPage<UnlawfulDto> getUnlawfulByType(Integer currentPage, Integer pageSize, String startTime, String endTime); /** * 鎸夊尯鍩� */ - public List<UnlawfulDto> getUnlawfulByStreet(Integer currentPage, Integer pageSize, String startTime, String endTime); - public List<UnlawfulDto> getUnlawfulByStreetExport(); - - /** - * 鎸夋姤璀︾偣浣� - */ - public List<UnlawfulDto> getUnlawfulBySite(Integer currentPage, Integer pageSize, String startTime, String endTime); - public List<UnlawfulDto> getUnlawfulBySiteExport(); + IPage<UnlawfulDto> getUnlawfulByStreet(Integer currentPage, Integer pageSize, String startTime, String endTime); /** * 鎸夋姤璀︽椂闂� */ - public List<UnlawfulDto> getUnlawfulByTime(Integer currentPage, Integer pageSize, String startTime, String endTime); - public List<UnlawfulDto> getUnlawfulByTimeExport(); + IPage<UnlawfulDto> getUnlawfulByTime(Integer currentPage, Integer pageSize, String startTime, String endTime); + + IPage<UnlawfulDto> getUnlawfulByPoint(Integer currentPage, Integer pageSize, String startTime, String endTime); } -- Gitblit v1.8.0