From 87a395a6024278594a0a80d25a24ba4ca5993513 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期六, 18 三月 2023 17:42:10 +0800
Subject: [PATCH] 统计修改

---
 ycl-platform/src/main/java/com/ycl/mapper/unlawful/UnlawfulMapper.java |   38 ++++++++++++--------------------------
 1 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/ycl-platform/src/main/java/com/ycl/mapper/unlawful/UnlawfulMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/unlawful/UnlawfulMapper.java
index a59f123..f9182d9 100644
--- a/ycl-platform/src/main/java/com/ycl/mapper/unlawful/UnlawfulMapper.java
+++ b/ycl-platform/src/main/java/com/ycl/mapper/unlawful/UnlawfulMapper.java
@@ -1,8 +1,11 @@
 package com.ycl.mapper.unlawful;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ycl.dto.statistics.CategoryDto;
 import com.ycl.dto.statistics.StatusDto;
 import com.ycl.dto.statistics.TimeDto;
+import com.ycl.dto.statistics.UnlawfulDto;
 
 import java.util.List;
 
@@ -10,44 +13,27 @@
     /**
      * 鑾峰彇鎬昏繚瑙勬暟閲�
      */
-    Integer getTotal();
+    Integer getTotal(String startTime, String endTime, Boolean type, Boolean street, Boolean video);
 
     /**
-     *  鎸夌収杩濊绫诲瀷缁熻
+     * 鎸夌収杩濊绫诲瀷缁熻
      */
-    List<CategoryDto> getDataByType(Integer currentPage, Integer pageSize, String startTime, String endTime);
-    StatusDto getStatusDataByType(String startTime, String endTime, Integer dictionaryId);
-    List<CategoryDto> getDataByTypeExp();
+    IPage<UnlawfulDto> getDataByType(Page<UnlawfulDto> page, String startTime, String endTime);
+
 
     /**
-     *  鎸夌収鍖哄煙缁熻
+     * 鎸夌収鍖哄煙缁熻
      */
-    List<CategoryDto> getDataByStreet(Integer currentPage, Integer pageSize, String startTime, String endTime);
-    StatusDto getStatusDataByStreet(String startTime, String endTime, Integer streetId);
-    List<CategoryDto> getDataByStreetExp();
+    IPage<UnlawfulDto> getDataByStreet(Page<UnlawfulDto> page, String startTime, String endTime);
+
 
     /**
      * 鎸夌偣浣嶇粺璁�
      */
-    List<String> getDataBySite(Integer currentPage, Integer pageSize, String startTime, String endTime);
-    StatusDto getStatusDataBySite(String startTime, String endTime, String site);
-    List<String> getDataBySiteExp();
+    IPage<UnlawfulDto> getDataByPoint(Page<UnlawfulDto> page, String startTime, String endTime);
 
     /**
      * 鎸夋姤璀︽椂闂�
      */
-    List<TimeDto> getDataByTime(Integer currentPage, Integer pageSize, String startTime, String endTime);
-    StatusDto getStatusDataByTime(String startTime, String endTime, Integer id);
-    List<TimeDto> getDataByTimeExp();
-
-    /**
-     * 鑾峰彇鍒嗛〉鎬绘暟
-     */
-    Integer getTotalByType(String startTime, String endTime);
-    Integer getTotalByStreet(String startTime, String endTime);
-    Integer getTotalBySite(String startTime, String endTime);
-    Integer getTotalByTime(String startTime, String endTime);
-
-
-
+    IPage<UnlawfulDto> getDataByTime(Page<UnlawfulDto> page, String startTime, String endTime);
 }

--
Gitblit v1.8.0