From e16e9a3ef7eb82daeb139fd9252213579e2bed25 Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期五, 24 二月 2023 19:33:22 +0800
Subject: [PATCH] 按照报警时间统计

---
 ycl-platform/src/main/java/com/ycl/controller/intelligentPatrol/StatisticsController.java |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/ycl-platform/src/main/java/com/ycl/controller/intelligentPatrol/StatisticsController.java b/ycl-platform/src/main/java/com/ycl/controller/intelligentPatrol/StatisticsController.java
index 86f2ecf..fa174fb 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/intelligentPatrol/StatisticsController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/intelligentPatrol/StatisticsController.java
@@ -72,7 +72,7 @@
         IPage<UnlawfulDto> page = new Page<>();
         List<UnlawfulDto> unlawfulByType = unlawfulService.getUnlawfulByType((currentPage - 1) * pageSize, pageSize, startTime, endTime1);
 
-        page.setTotal(unlawfulByType.size());
+        page.setTotal(unlawfulService.getTotalByType(startTime, endTime1));
         page.setRecords(unlawfulByType);
         return CommonResult.success(page);
     }
@@ -96,7 +96,7 @@
         IPage<UnlawfulDto> page = new Page<>();
         List<UnlawfulDto> unlawfulByType = unlawfulService.getUnlawfulBySite((currentPage - 1) * pageSize, pageSize, startTime, endTime1);
 
-        page.setTotal(unlawfulByType.size());
+        page.setTotal(unlawfulService.getTotalBySite(startTime, endTime1));
         page.setRecords(unlawfulByType);
         return CommonResult.success(page);
     }
@@ -119,8 +119,7 @@
         }
         IPage<UnlawfulDto> page = new Page<>();
         List<UnlawfulDto> unlawfulByType = unlawfulService.getUnlawfulByTime((currentPage - 1) * pageSize, pageSize, startTime, endTime1);
-
-        page.setTotal(unlawfulByType.size());
+        page.setTotal(unlawfulService.getTotalByTime(startTime, endTime1));
         page.setRecords(unlawfulByType);
         return CommonResult.success(page);
     }
@@ -142,9 +141,9 @@
             endTime1 = beginTime.format(fmt);
         }
         IPage<UnlawfulDto> page = new Page<>();
-        List<UnlawfulDto> unlawfulByType = unlawfulService.getUnlawfulBySite((currentPage - 1) * pageSize, pageSize, startTime, endTime1);
+        List<UnlawfulDto> unlawfulByType = unlawfulService.getUnlawfulByStreet((currentPage - 1) * pageSize, pageSize, startTime, endTime1);
 
-        page.setTotal(unlawfulByType.size());
+        page.setTotal(unlawfulService.getTotalByStreet(startTime, endTime1));
         page.setRecords(unlawfulByType);
         return CommonResult.success(page);
     }
@@ -208,6 +207,14 @@
         EasyExcelUtils.export(response, sheetName, UnlawfulDto.class, unlawfulBySiteExport);
     }
 
+    @PostMapping("/export/unlawful/time")
+    @ApiOperation("鎸夋姤璀︾偣浣嶇粺璁℃柟寮�-瀵煎嚭")
+    public void exportTime(HttpServletResponse response) {
+        List<UnlawfulDto> unlawfulBySiteExport = unlawfulService.getUnlawfulByTimeExport();
+        String sheetName = "鎸夋姤璀︾偣浣嶇粺璁℃柟寮�";
+        EasyExcelUtils.export(response, sheetName, UnlawfulDto.class, unlawfulBySiteExport);
+    }
+
     /*@PostMapping("/export/shop")
     @ApiOperation("闂ㄥ墠涓夊寘-瀵煎嚭")
     public void exportShop(HttpServletResponse response) {

--
Gitblit v1.8.0