From 9d72eb559e67e3f0bb321198fc562f3cfd9a8625 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期日, 21 一月 2024 20:54:33 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/controller/cockpit/enforcementEvents/EnforcementEventsController.java | 50 ++++++++++++++++++++++++++------------------------
1 files changed, 26 insertions(+), 24 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/cockpit/enforcementEvents/EnforcementEventsController.java b/ycl-platform/src/main/java/com/ycl/controller/cockpit/enforcementEvents/EnforcementEventsController.java
index f276bc7..8695987 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/cockpit/enforcementEvents/EnforcementEventsController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/cockpit/enforcementEvents/EnforcementEventsController.java
@@ -54,14 +54,14 @@
@GetMapping("/statistics")
public CommonResult<Map<String, Object>> statistics(@Validated CockpitVO params) {
checkApiUtil.cockpit(params);
-// CommonResult.success(iBaseCaseService.statistics());
+ CommonResult.success(iBaseCaseService.statistics());
StatisticsVO report = new StatisticsVO();
- report.setCount(63L);
+ report.setCount(2521L);
report.setRatio(BigDecimal.valueOf(0.9141));
report.setUp(true);
StatisticsVO dispose = new StatisticsVO();
dispose.setCount(2743L);
- dispose.setRatio(BigDecimal.valueOf(0.9946));
+ dispose.setRatio(BigDecimal.valueOf(0.9946d));
dispose.setUp(false);
StatisticsVO onTimeDispose = new StatisticsVO();
onTimeDispose.setCount(2743L);
@@ -97,39 +97,39 @@
videoAndAreaVO.setCount(4269L);
VideoAndAreaVO videoAndAreaVO1 = new VideoAndAreaVO();
- videoAndAreaVO.setName("闈炴満鍔ㄨ溅涔卞仠鏀�");
- videoAndAreaVO.setRatio(BigDecimal.valueOf(0.2245));
- videoAndAreaVO.setCount(1711L);
+ videoAndAreaVO1.setName("闈炴満鍔ㄨ溅涔卞仠鏀�");
+ videoAndAreaVO1.setRatio(BigDecimal.valueOf(0.2245));
+ videoAndAreaVO1.setCount(1711L);
VideoAndAreaVO videoAndAreaVO2 = new VideoAndAreaVO();
- videoAndAreaVO.setName("鍗犻亾缁忚惀");
- videoAndAreaVO.setRatio(BigDecimal.valueOf(0.0633));
- videoAndAreaVO.setCount(482L);
+ videoAndAreaVO2.setName("鍗犻亾缁忚惀");
+ videoAndAreaVO2.setRatio(BigDecimal.valueOf(0.0633));
+ videoAndAreaVO2.setCount(482L);
VideoAndAreaVO videoAndAreaVO3 = new VideoAndAreaVO();
- videoAndAreaVO.setName("鏃犵収缁忚惀娓稿晢");
- videoAndAreaVO.setRatio(BigDecimal.valueOf(0.0413));
- videoAndAreaVO.setCount(315L);
+ videoAndAreaVO3.setName("鏃犵収缁忚惀娓稿晢");
+ videoAndAreaVO3.setRatio(BigDecimal.valueOf(0.0413));
+ videoAndAreaVO3.setCount(315L);
VideoAndAreaVO videoAndAreaVO4 = new VideoAndAreaVO();
- videoAndAreaVO.setName("搴楀缁忚惀");
- videoAndAreaVO.setRatio(BigDecimal.valueOf(0.0392));
- videoAndAreaVO.setCount(291L);
+ videoAndAreaVO4.setName("搴楀缁忚惀");
+ videoAndAreaVO4.setRatio(BigDecimal.valueOf(0.0392));
+ videoAndAreaVO4.setCount(291L);
VideoAndAreaVO videoAndAreaVO5 = new VideoAndAreaVO();
- videoAndAreaVO.setName("杩濊鎾戜紴");
- videoAndAreaVO.setRatio(BigDecimal.valueOf(0.0217));
- videoAndAreaVO.setCount(165L);
+ videoAndAreaVO5.setName("杩濊鎾戜紴");
+ videoAndAreaVO5.setRatio(BigDecimal.valueOf(0.0217));
+ videoAndAreaVO5.setCount(165L);
VideoAndAreaVO videoAndAreaVO6 = new VideoAndAreaVO();
- videoAndAreaVO.setName("鍏朵粬");
- videoAndAreaVO.setRatio(BigDecimal.valueOf(0.0160));
- videoAndAreaVO.setCount(122L);
+ videoAndAreaVO6.setName("鍏朵粬");
+ videoAndAreaVO6.setRatio(BigDecimal.valueOf(0.0160));
+ videoAndAreaVO6.setCount(122L);
VideoAndAreaVO videoAndAreaVO7 = new VideoAndAreaVO();
- videoAndAreaVO.setName("缇ゅ彂鎬т簨浠�");
- videoAndAreaVO.setRatio(BigDecimal.valueOf(0.0123));
- videoAndAreaVO.setCount(94L);
+ videoAndAreaVO7.setName("缇ゅ彂鎬т簨浠�");
+ videoAndAreaVO7.setRatio(BigDecimal.valueOf(0.0123));
+ videoAndAreaVO7.setCount(94L);
videoAndAreaVOS.add(videoAndAreaVO);
videoAndAreaVOS.add(videoAndAreaVO1);
@@ -139,6 +139,8 @@
videoAndAreaVOS.add(videoAndAreaVO5);
videoAndAreaVOS.add(videoAndAreaVO6);
videoAndAreaVOS.add(videoAndAreaVO7);
+
+ typeAndSourceVO.setRecords(videoAndAreaVOS);
return CommonResult.success(typeAndSourceVO);
}
--
Gitblit v1.8.0