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/controller/intelligentPatrol/StatisticsController.java | 124 ++++++++++++++--------------------------
1 files changed, 44 insertions(+), 80 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 506d508..5fcdd02 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
@@ -8,12 +8,14 @@
import com.ycl.dto.statistics.UnlawfulDto;
import com.ycl.service.unlawful.UnlawfulService;
import com.ycl.utils.EasyExcelUtils;
+import com.ycl.vo.cockpit.CockpitVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
@@ -57,23 +59,11 @@
@LogSave(operationType = "鎸夎繚瑙勭被鍨嬬粺璁�", contain = "鏌ヨ")
public CommonResult<IPage<UnlawfulDto>> searchByType(@RequestParam(required = true) Integer currentPage,
@RequestParam(required = true) Integer pageSize,
- @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime beginTime,
- @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime endTime) {
- DateTimeFormatter fmt = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
- String startTime = null;
- String endTime1 = null;
- if (beginTime != null){
- startTime = beginTime.format(fmt);
- }
- if (endTime != null){
- endTime1 = endTime.format(fmt);
- }
+ @RequestParam(required = false) String beginTime,
+ @RequestParam(required = false) String endTime) {
- IPage<UnlawfulDto> page = new Page<>();
- List<UnlawfulDto> unlawfulByType = unlawfulService.getUnlawfulByType((currentPage - 1) * pageSize, pageSize, startTime, endTime1);
+ IPage<UnlawfulDto> page = unlawfulService.getUnlawfulByType(currentPage, pageSize, beginTime, endTime);
- page.setTotal(unlawfulService.getTotalByType(startTime, endTime1));
- page.setRecords(unlawfulByType);
return CommonResult.success(page);
}
@@ -82,22 +72,11 @@
@LogSave(operationType = "鎸夌偣浣嶇粺璁�", contain = "鏌ヨ")
public CommonResult<IPage<UnlawfulDto>> searchByPoint(@RequestParam(required = true) Integer currentPage,
@RequestParam(required = true) Integer pageSize,
- @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime beginTime,
- @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime endTime) {
- DateTimeFormatter fmt = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
- String startTime = null;
- String endTime1 = null;
- if (beginTime != null){
- startTime = beginTime.format(fmt);
- }
- if (endTime != null){
- endTime1 = endTime.format(fmt);
- }
- IPage<UnlawfulDto> page = new Page<>();
- List<UnlawfulDto> unlawfulByType = unlawfulService.getUnlawfulBySite((currentPage - 1) * pageSize, pageSize, startTime, endTime1);
+ @RequestParam(required = false) String beginTime,
+ @RequestParam(required = false) String endTime) {
- page.setTotal(unlawfulService.getTotalBySite(startTime, endTime1));
- page.setRecords(unlawfulByType);
+ IPage<UnlawfulDto> page = unlawfulService.getUnlawfulByPoint(currentPage, pageSize, beginTime, endTime);
+
return CommonResult.success(page);
}
@@ -106,21 +85,11 @@
@LogSave(operationType = "鎸夋椂闂寸粺璁�", contain = "鏌ヨ")
public CommonResult<IPage<UnlawfulDto>> searchByTime(@RequestParam(required = true) Integer currentPage,
@RequestParam(required = true) Integer pageSize,
- @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime beginTime,
- @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime endTime) {
- DateTimeFormatter fmt = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
- String startTime = null;
- String endTime1 = null;
- if (beginTime != null){
- startTime = beginTime.format(fmt);
- }
- if (endTime != null){
- endTime1 = endTime.format(fmt);
- }
- IPage<UnlawfulDto> page = new Page<>();
- List<UnlawfulDto> unlawfulByType = unlawfulService.getUnlawfulByTime((currentPage - 1) * pageSize, pageSize, startTime, endTime1);
- page.setTotal(unlawfulService.getTotalByTime(startTime, endTime1));
- page.setRecords(unlawfulByType);
+ @RequestParam(required = false) String beginTime,
+ @RequestParam(required = false) String endTime) {
+
+ IPage<UnlawfulDto> page = unlawfulService.getUnlawfulByTime(currentPage, pageSize, beginTime, endTime);
+
return CommonResult.success(page);
}
@@ -129,22 +98,10 @@
@LogSave(operationType = "鎸夊尯鍩熺粺璁�", contain = "鏌ヨ")
public CommonResult<IPage<UnlawfulDto>> searchByArea(@RequestParam(required = true) Integer currentPage,
@RequestParam(required = true) Integer pageSize,
- @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime beginTime,
- @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime endTime) {
- DateTimeFormatter fmt = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
- String startTime = null;
- String endTime1 = null;
- if (beginTime != null){
- startTime = beginTime.format(fmt);
- }
- if (endTime != null){
- endTime1 = endTime.format(fmt);
- }
- IPage<UnlawfulDto> page = new Page<>();
- List<UnlawfulDto> unlawfulByType = unlawfulService.getUnlawfulByStreet((currentPage - 1) * pageSize, pageSize, startTime, endTime1);
+ @RequestParam(required = false) String beginTime,
+ @RequestParam(required = false) String endTime) {
+ IPage<UnlawfulDto> page = unlawfulService.getUnlawfulByStreet(currentPage, pageSize, beginTime, endTime);
- page.setTotal(unlawfulService.getTotalByStreet(startTime, endTime1));
- page.setRecords(unlawfulByType);
return CommonResult.success(page);
}
@@ -175,44 +132,51 @@
return CommonResult.success(page);
}*/
- @PostMapping("/export/unlawful")
- @ApiOperation("鎸夊悇绉嶇粺璁℃柟寮�-瀵煎嚭")
- public void export(HttpServletResponse response) {
- List<UnlawfulDto> unlawfulByTypeExport = unlawfulService.getUnlawfulByTypeExport();
- String sheetName = "鎸夌粺璁℃柟寮�";
- EasyExcelUtils.export(response, sheetName, UnlawfulDto.class, unlawfulByTypeExport);
- }
+// @PostMapping("/export/unlawful")
+// @ApiOperation("鎸夊悇绉嶇粺璁℃柟寮�-瀵煎嚭")
+// public void export(HttpServletResponse response) {
+// List<UnlawfulDto> unlawfulByTypeExport = unlawfulService.getUnlawfulByTypeExport();
+// String sheetName = "鎸夌粺璁℃柟寮�";
+// EasyExcelUtils.export(response, sheetName, UnlawfulDto.class, unlawfulByTypeExport);
+// }
@PostMapping("/export/unlawful/type")
@ApiOperation("鎸夌被鍨嬬粺璁℃柟寮�-瀵煎嚭")
- public void exportType(HttpServletResponse response) {
- List<UnlawfulDto> unlawfulByTypeExport = unlawfulService.getUnlawfulByTypeExport();
- String sheetName = "鎸夌被鍨嬬粺璁℃柟寮�";
- EasyExcelUtils.export(response, sheetName, UnlawfulDto.class, unlawfulByTypeExport);
+ public void exportType(HttpServletResponse response,
+ @RequestBody CockpitVO vo) {
+ IPage<UnlawfulDto> page = unlawfulService.getUnlawfulByType(1, 500, vo.getBeginTime(), vo.getEndTime());
+ String sheetName = "鎸夌粺璁℃柟寮�";
+ EasyExcelUtils.export(response, sheetName, UnlawfulDto.class, page.getRecords());
}
@PostMapping("/export/unlawful/street")
@ApiOperation("鎸夊尯鍩熺粺璁℃柟寮�-瀵煎嚭")
- public void exportStreet(HttpServletResponse response) {
- List<UnlawfulDto> unlawfulByStreetExport = unlawfulService.getUnlawfulByStreetExport();
+ public void exportStreet(HttpServletResponse response,
+ @RequestBody CockpitVO vo) {
+ IPage<UnlawfulDto> page = unlawfulService.getUnlawfulByStreet(1, 500, vo.getBeginTime(), vo.getEndTime());
+
String sheetName = "鎸夊尯鍩熺粺璁℃柟寮�";
- EasyExcelUtils.export(response, sheetName, UnlawfulDto.class, unlawfulByStreetExport);
+ EasyExcelUtils.export(response, sheetName, UnlawfulDto.class, page.getRecords());
}
@PostMapping("/export/unlawful/site")
@ApiOperation("鎸夋姤璀︾偣浣嶇粺璁℃柟寮�-瀵煎嚭")
- public void exportSite(HttpServletResponse response) {
- List<UnlawfulDto> unlawfulBySiteExport = unlawfulService.getUnlawfulBySiteExport();
+ public void exportSite(HttpServletResponse response,
+ @RequestBody CockpitVO vo) {
+ IPage<UnlawfulDto> page = unlawfulService.getUnlawfulByPoint(1, 500, vo.getBeginTime(), vo.getEndTime());
+
String sheetName = "鎸夋姤璀︾偣浣嶇粺璁℃柟寮�";
- EasyExcelUtils.export(response, sheetName, UnlawfulDto.class, unlawfulBySiteExport);
+ EasyExcelUtils.export(response, sheetName, UnlawfulDto.class, page.getRecords());
}
@PostMapping("/export/unlawful/time")
@ApiOperation("鎸夋姤璀︾偣浣嶇粺璁℃柟寮�-瀵煎嚭")
- public void exportTime(HttpServletResponse response) {
- List<UnlawfulDto> unlawfulBySiteExport = unlawfulService.getUnlawfulByTimeExport();
+ public void exportTime(HttpServletResponse response,
+ @RequestBody CockpitVO vo) {
+ IPage<UnlawfulDto> page = unlawfulService.getUnlawfulByTime(1, 500, vo.getBeginTime(), vo.getEndTime());
+
String sheetName = "鎸夋姤璀︾偣浣嶇粺璁℃柟寮�";
- EasyExcelUtils.export(response, sheetName, UnlawfulDto.class, unlawfulBySiteExport);
+ EasyExcelUtils.export(response, sheetName, UnlawfulDto.class, page.getRecords());
}
/*@PostMapping("/export/shop")
--
Gitblit v1.8.0