From ebf167b950e735f873f3fcdbba276df47ada9834 Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期五, 24 二月 2023 01:13:07 +0800
Subject: [PATCH] 按违规类型统计
---
ycl-platform/src/main/java/com/ycl/controller/intelligentPatrol/StatisticsController.java | 79 ++++++++++++++++++++++++---------------
1 files changed, 49 insertions(+), 30 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 084a6b8..467a9b9 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,15 +8,18 @@
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;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.*;
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;
@@ -33,23 +36,26 @@
@Api(tags = "杩濈珷-杩濇硶缁熻")
public class StatisticsController extends BaseController {
- List<UnlawfulDto> ls = new ArrayList<>(Arrays.asList(
- new UnlawfulDto("甯傚満鐩戠", 100, 0.6, 10, 1, 20, 5, 20, 0.6, 0.9, 0.0),
- new UnlawfulDto("鍏畨", 100, 0.6, 10, 1, 20, 5, 20, 0.6, 0.9, 0.0),
- new UnlawfulDto("鑷劧璧勬簮", 100, 0.6, 10, 1, 20, 5, 20, 0.6, 0.9, 0.0),
- new UnlawfulDto("鐢熸�佺幆澧�", 100, 0.6, 10, 1, 20, 5, 20, 0.6, 0.9, 0.0),
- new UnlawfulDto("鍦版柟绔嬫硶", 100, 0.6, 10, 1, 20, 5, 20, 0.6, 0.9, 0.0),
- new UnlawfulDto("鍦伴渿", 100, 0.6, 10, 1, 20, 5, 20, 0.6, 0.9, 0.0),
- new UnlawfulDto("鏁欒偛", 100, 0.6, 10, 1, 20, 5, 20, 0.6, 0.9, 0.0),
- new UnlawfulDto("缁忎俊", 100, 0.6, 10, 1, 20, 5, 20, 0.6, 0.9, 0.0),
- new UnlawfulDto("鏋椾笟", 100, 0.6, 10, 1, 20, 5, 20, 0.6, 0.9, 0.0),
- new UnlawfulDto("鍐滄潙鐜鍗敓", 100, 0.6, 10, 1, 20, 5, 20, 0.6, 0.9, 0.0),
- new UnlawfulDto("姘旇薄", 100, 0.6, 10, 1, 20, 5, 20, 0.6, 0.9, 0.0),
- new UnlawfulDto("浜洪槻", 100, 0.6, 10, 1, 20, 5, 20, 0.6, 0.9, 0.0),
- new UnlawfulDto("姘磋鏀�", 100, 0.6, 10, 1, 20, 5, 20, 0.6, 0.9, 0.0),
- new UnlawfulDto("搴旀�ョ鐞�", 100, 0.6, 10, 1, 20, 5, 20, 0.6, 0.9, 0.0),
- new UnlawfulDto("鍏朵粬", 100, 0.6, 10, 1, 20, 5, 20, 0.6, 0.9, 0.0))
- );
+// List<UnlawfulDto> ls = new ArrayList<>(Arrays.asList(
+// new UnlawfulDto("甯傚満鐩戠", 100, 0.6, 10, 1, 20, 5, 20, 0.6, 0.9, 0.0),
+// new UnlawfulDto("鍏畨", 100, 0.6, 10, 1, 20, 5, 20, 0.6, 0.9, 0.0),
+// new UnlawfulDto("鑷劧璧勬簮", 100, 0.6, 10, 1, 20, 5, 20, 0.6, 0.9, 0.0),
+// new UnlawfulDto("鐢熸�佺幆澧�", 100, 0.6, 10, 1, 20, 5, 20, 0.6, 0.9, 0.0),
+// new UnlawfulDto("鍦版柟绔嬫硶", 100, 0.6, 10, 1, 20, 5, 20, 0.6, 0.9, 0.0),
+// new UnlawfulDto("鍦伴渿", 100, 0.6, 10, 1, 20, 5, 20, 0.6, 0.9, 0.0),
+// new UnlawfulDto("鏁欒偛", 100, 0.6, 10, 1, 20, 5, 20, 0.6, 0.9, 0.0),
+// new UnlawfulDto("缁忎俊", 100, 0.6, 10, 1, 20, 5, 20, 0.6, 0.9, 0.0),
+// new UnlawfulDto("鏋椾笟", 100, 0.6, 10, 1, 20, 5, 20, 0.6, 0.9, 0.0),
+// new UnlawfulDto("鍐滄潙鐜鍗敓", 100, 0.6, 10, 1, 20, 5, 20, 0.6, 0.9, 0.0),
+// new UnlawfulDto("姘旇薄", 100, 0.6, 10, 1, 20, 5, 20, 0.6, 0.9, 0.0),
+// new UnlawfulDto("浜洪槻", 100, 0.6, 10, 1, 20, 5, 20, 0.6, 0.9, 0.0),
+// new UnlawfulDto("姘磋鏀�", 100, 0.6, 10, 1, 20, 5, 20, 0.6, 0.9, 0.0),
+// new UnlawfulDto("搴旀�ョ鐞�", 100, 0.6, 10, 1, 20, 5, 20, 0.6, 0.9, 0.0),
+// new UnlawfulDto("鍏朵粬", 100, 0.6, 10, 1, 20, 5, 20, 0.6, 0.9, 0.0))
+// );
+
+ @Autowired
+ private UnlawfulService unlawfulService;
@GetMapping("/unlawful/type")
@ApiOperation("鎸夎繚瑙勭被鍨嬬粺璁�")
@@ -58,13 +64,25 @@
@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 = beginTime.format(fmt);
+ }
+
IPage<UnlawfulDto> page = new Page<>();
- page.setTotal(ls.size());
- page.setRecords(ls);
+ List<UnlawfulDto> unlawfulByType = unlawfulService.getUnlawfulByType((currentPage - 1) * pageSize, pageSize, startTime, endTime1);
+
+ page.setTotal(unlawfulByType.size());
+ page.setRecords(unlawfulByType);
return CommonResult.success(page);
}
- @GetMapping("/unlawful/point")
+ /*@GetMapping("/unlawful/point")
@ApiOperation("鎸夌偣浣嶇粺璁�")
@LogSave(operationType = "鎸夌偣浣嶇粺璁�", contain = "鏌ヨ")
public CommonResult<IPage<UnlawfulDto>> searchByPoint(@RequestParam(required = true) Integer currentPage,
@@ -75,9 +93,9 @@
page.setTotal(ls.size());
page.setRecords(ls);
return CommonResult.success(page);
- }
+ }*/
- @GetMapping("/unlawful/time")
+ /*@GetMapping("/unlawful/time")
@ApiOperation("鎸夋椂闂寸粺璁�")
@LogSave(operationType = "鎸夋椂闂寸粺璁�", contain = "鏌ヨ")
public CommonResult<IPage<UnlawfulDto>> searchByTime(@RequestParam(required = true) Integer currentPage,
@@ -88,9 +106,9 @@
page.setTotal(ls.size());
page.setRecords(ls);
return CommonResult.success(page);
- }
+ }*/
- @GetMapping("/unlawful/area")
+ /*@GetMapping("/unlawful/area")
@ApiOperation("鎸夊尯鍩熺粺璁�")
@LogSave(operationType = "鎸夊尯鍩熺粺璁�", contain = "鏌ヨ")
public CommonResult<IPage<UnlawfulDto>> searchByArea(@RequestParam(required = true) Integer currentPage,
@@ -101,9 +119,9 @@
page.setTotal(ls.size());
page.setRecords(ls);
return CommonResult.success(page);
- }
+ }*/
- @GetMapping("/unlawful/shop")
+ /*@GetMapping("/unlawful/shop")
@ApiOperation("闂ㄥ墠涓夊寘缁熻")
@LogSave(operationType = "闂ㄥ墠涓夊寘缁熻", contain = "鏌ヨ")
public CommonResult<IPage<UnlawfulShopDto>> searchByShop(@RequestParam(required = true) Integer currentPage,
@@ -128,16 +146,17 @@
page.setTotal(ls.size());
page.setRecords(ls);
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, ls);
+ EasyExcelUtils.export(response, sheetName, UnlawfulDto.class, unlawfulByTypeExport);
}
- @PostMapping("/export/shop")
+ /*@PostMapping("/export/shop")
@ApiOperation("闂ㄥ墠涓夊寘-瀵煎嚭")
public void exportShop(HttpServletResponse response) {
List<UnlawfulShopDto> ls = new ArrayList<>();
@@ -156,5 +175,5 @@
ls.add(new UnlawfulShopDto("搴楅摵13", 100, 10, 1, 20, 5, 20, 0.9));
String sheetName = "闂ㄥ墠涓夊寘";
EasyExcelUtils.export(response, sheetName, UnlawfulShopDto.class, ls);
- }
+ }*/
}
--
Gitblit v1.8.0