From feffedd3a450e935debea24599cb5ce2f4c06ab2 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 14 三月 2023 10:18:39 +0800
Subject: [PATCH] bug修改
---
ycl-platform/src/main/java/com/ycl/controller/intelligentPatrol/StatisticsController.java | 57 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 35 insertions(+), 22 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 f37dedc..506d508 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
@@ -5,12 +5,9 @@
import com.ycl.annotation.LogSave;
import com.ycl.api.CommonResult;
import com.ycl.controller.BaseController;
-import com.ycl.dto.caseHandler.QueryForViolationParam;
import com.ycl.dto.statistics.UnlawfulDto;
-import com.ycl.dto.statistics.UnlawfulShopDto;
import com.ycl.service.unlawful.UnlawfulService;
import com.ycl.utils.EasyExcelUtils;
-import com.ycl.vo.casePool.QueryForViolationVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,8 +17,6 @@
import javax.servlet.http.HttpServletResponse;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
/**
@@ -71,13 +66,13 @@
startTime = beginTime.format(fmt);
}
if (endTime != null){
- endTime1 = beginTime.format(fmt);
+ endTime1 = endTime.format(fmt);
}
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,28 +91,38 @@
startTime = beginTime.format(fmt);
}
if (endTime != null){
- endTime1 = beginTime.format(fmt);
+ endTime1 = endTime.format(fmt);
}
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);
}
- /*@GetMapping("/unlawful/time")
+ @GetMapping("/unlawful/time")
@ApiOperation("鎸夋椂闂寸粺璁�")
@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<>();
- page.setTotal(ls.size());
- page.setRecords(ls);
+ List<UnlawfulDto> unlawfulByType = unlawfulService.getUnlawfulByTime((currentPage - 1) * pageSize, pageSize, startTime, endTime1);
+ page.setTotal(unlawfulService.getTotalByTime(startTime, endTime1));
+ page.setRecords(unlawfulByType);
return CommonResult.success(page);
- }*/
+ }
@GetMapping("/unlawful/area")
@ApiOperation("鎸夊尯鍩熺粺璁�")
@@ -133,12 +138,12 @@
startTime = beginTime.format(fmt);
}
if (endTime != null){
- endTime1 = beginTime.format(fmt);
+ endTime1 = endTime.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);
}
@@ -179,26 +184,34 @@
}
@PostMapping("/export/unlawful/type")
- @ApiOperation("鎸夊悇绉嶇粺璁℃柟寮�-瀵煎嚭")
+ @ApiOperation("鎸夌被鍨嬬粺璁℃柟寮�-瀵煎嚭")
public void exportType(HttpServletResponse response) {
List<UnlawfulDto> unlawfulByTypeExport = unlawfulService.getUnlawfulByTypeExport();
- String sheetName = "鎸夌粺璁℃柟寮�";
+ String sheetName = "鎸夌被鍨嬬粺璁℃柟寮�";
EasyExcelUtils.export(response, sheetName, UnlawfulDto.class, unlawfulByTypeExport);
}
@PostMapping("/export/unlawful/street")
- @ApiOperation("鎸夊悇绉嶇粺璁℃柟寮�-瀵煎嚭")
+ @ApiOperation("鎸夊尯鍩熺粺璁℃柟寮�-瀵煎嚭")
public void exportStreet(HttpServletResponse response) {
List<UnlawfulDto> unlawfulByStreetExport = unlawfulService.getUnlawfulByStreetExport();
- String sheetName = "鎸夌粺璁℃柟寮�";
+ String sheetName = "鎸夊尯鍩熺粺璁℃柟寮�";
EasyExcelUtils.export(response, sheetName, UnlawfulDto.class, unlawfulByStreetExport);
}
@PostMapping("/export/unlawful/site")
- @ApiOperation("鎸夊悇绉嶇粺璁℃柟寮�-瀵煎嚭")
+ @ApiOperation("鎸夋姤璀︾偣浣嶇粺璁℃柟寮�-瀵煎嚭")
public void exportSite(HttpServletResponse response) {
List<UnlawfulDto> unlawfulBySiteExport = unlawfulService.getUnlawfulBySiteExport();
- String sheetName = "鎸夌粺璁℃柟寮�";
+ String sheetName = "鎸夋姤璀︾偣浣嶇粺璁℃柟寮�";
+ 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);
}
--
Gitblit v1.8.0