From 31155ed32e2f2e2022b4b1697c8a2052a8543a48 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 25 十月 2023 21:38:04 +0800
Subject: [PATCH] 合并代码
---
ycl-platform/src/main/java/com/ycl/service/unlawful/UnlawfulService.java | 24 ++++++------------------
1 files changed, 6 insertions(+), 18 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 dc91c3e..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,32 +9,19 @@
public interface UnlawfulService {
/**
- * 鎸夌被鍨�
+ * 鎸夌被鍨�
*/
- public List<UnlawfulDto> getUnlawfulByType(Integer currentPage, Integer pageSize, String startTime, String endTime);
- public List<UnlawfulDto> getUnlawfulByTypeExport();
- public Integer getTotalByType(String startTime, String endTime);
+ 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 Integer getTotalByStreet(String startTime, String endTime);
-
- /**
- * 鎸夋姤璀︾偣浣�
- */
- public List<UnlawfulDto> getUnlawfulBySite(Integer currentPage, Integer pageSize, String startTime, String endTime);
-
- public List<UnlawfulDto> getUnlawfulBySiteExport();
- public Integer getTotalBySite(String startTime, String endTime);
+ IPage<UnlawfulDto> getUnlawfulByStreet(Integer currentPage, Integer pageSize, String startTime, String endTime);
/**
* 鎸夋姤璀︽椂闂�
*/
- public List<UnlawfulDto> getUnlawfulByTime(Integer currentPage, Integer pageSize, String startTime, String endTime);
+ IPage<UnlawfulDto> getUnlawfulByTime(Integer currentPage, Integer pageSize, String startTime, String endTime);
- public List<UnlawfulDto> getUnlawfulByTimeExport();
- public Integer getTotalByTime(String startTime, String endTime);
+ IPage<UnlawfulDto> getUnlawfulByPoint(Integer currentPage, Integer pageSize, String startTime, String endTime);
}
--
Gitblit v1.8.0