From a4cd4c2d98392cd1036f36b96c262878743a7e63 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 05 九月 2024 19:52:22 +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 | 130 ++++++++++++++++++++++---------------------
1 files changed, 66 insertions(+), 64 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..75547fb 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,29 +54,29 @@
@GetMapping("/statistics")
public CommonResult<Map<String, Object>> statistics(@Validated CockpitVO params) {
checkApiUtil.cockpit(params);
-// CommonResult.success(iBaseCaseService.statistics());
- StatisticsVO report = new StatisticsVO();
- report.setCount(63L);
- report.setRatio(BigDecimal.valueOf(0.9141));
- report.setUp(true);
- StatisticsVO dispose = new StatisticsVO();
- dispose.setCount(2743L);
- dispose.setRatio(BigDecimal.valueOf(0.9946));
- dispose.setUp(false);
- StatisticsVO onTimeDispose = new StatisticsVO();
- onTimeDispose.setCount(2743L);
- onTimeDispose.setRatio(BigDecimal.valueOf(1.0000));
- onTimeDispose.setUp(false);
- StatisticsVO register = new StatisticsVO();
- register.setCount(2758L);
- register.setRatio(BigDecimal.valueOf(0.3619));
- register.setUp(false);
- Map<String, Object> map = new HashMap<>();
- map.put("reported", report);
- map.put("disposition", dispose);
- map.put("dispositionInTime", onTimeDispose);
- map.put("register", register);
- return CommonResult.success(map);
+ return CommonResult.success(iBaseCaseService.statistics());
+// StatisticsVO report = new StatisticsVO();
+// report.setCount(63L);
+// report.setRatio(BigDecimal.valueOf(0.9141));
+// report.setUp(true);
+// StatisticsVO dispose = new StatisticsVO();
+// dispose.setCount(2743L);
+// dispose.setRatio(new BigDecimal(0.9946d).setScale(4, BigDecimal.ROUND_HALF_UP).abs());
+// dispose.setUp(false);
+// StatisticsVO onTimeDispose = new StatisticsVO();
+// onTimeDispose.setCount(2743L);
+// onTimeDispose.setRatio(BigDecimal.valueOf(1.0000));
+// onTimeDispose.setUp(false);
+// StatisticsVO register = new StatisticsVO();
+// register.setCount(2758L);
+// register.setRatio(BigDecimal.valueOf(0.3619));
+// register.setUp(false);
+// Map<String, Object> map = new HashMap<>();
+// map.put("reported", report);
+// map.put("disposition", dispose);
+// map.put("dispositionInTime", onTimeDispose);
+// map.put("register", register);
+// return CommonResult.success(map);
}
@ApiOperation(value = "浜嬩欢绫诲瀷")
@@ -85,8 +85,8 @@
checkApiUtil.cockpit(params);
EnforcementEventsVO.TypeAndSourceVO typeAndSourceVO = new EnforcementEventsVO.TypeAndSourceVO();
Long count = iViolationsService.count();
-// typeAndSourceVO.setAll(iViolationsService.count());
- typeAndSourceVO.setAll(7621L);
+ typeAndSourceVO.setAll(iViolationsService.count());
+// typeAndSourceVO.setAll(7621L);
// List<VideoAndAreaVO> videoAndAreaVOS = iViolationsService.selectType();
// videoAndAreaVOS.stream().forEach(item -> item.setRatio(new BigDecimal(item.getCount() * 1.0 / count).setScale(4, BigDecimal.ROUND_HALF_UP)));
// typeAndSourceVO.setRecords(videoAndAreaVOS);
@@ -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);
}
@@ -155,11 +157,11 @@
return videoAndAreaVO;
}).collect(Collectors.toList());
- collect.get(0).setCount(631L);
- collect.get(1).setCount(569L);
- collect.get(2).setCount(550L);
- collect.get(3).setCount(491L);
- collect.get(4).setCount(490L);
+// collect.get(0).setCount(631L);
+// collect.get(1).setCount(569L);
+// collect.get(2).setCount(550L);
+// collect.get(3).setCount(491L);
+// collect.get(4).setCount(490L);
return CommonResult.success(collect);
}
@@ -191,13 +193,13 @@
@GetMapping("/area")
public CommonResult area(@Validated CockpitVO params) {
checkApiUtil.cockpit(params);
-// return CommonResult.success(iBaseCaseService.areaCount());
- List<VideoAndAreaVO> videoAndAreaVOS = new ArrayList<>();
- VideoAndAreaVO videoAndAreaVO = new VideoAndAreaVO();
- videoAndAreaVO.setName("濡欓珮琛楅亾");
- videoAndAreaVO.setCount(7621L);
- videoAndAreaVOS.add(videoAndAreaVO);
- return CommonResult.success(videoAndAreaVOS);
+ return CommonResult.success(iBaseCaseService.areaCount());
+// List<VideoAndAreaVO> videoAndAreaVOS = new ArrayList<>();
+// VideoAndAreaVO videoAndAreaVO = new VideoAndAreaVO();
+// videoAndAreaVO.setName("濡欓珮琛楅亾");
+// videoAndAreaVO.setCount(7621L);
+// videoAndAreaVOS.add(videoAndAreaVO);
+// return CommonResult.success(videoAndAreaVOS);
}
@ApiOperation(value = "寤惰浜嬩欢")
@@ -212,13 +214,13 @@
public CommonResult<EnforcementEventsVO.InfoVO> info(@Validated CockpitVO params) {
checkApiUtil.cockpit(params);
EnforcementEventsVO.InfoVO infoVO = new EnforcementEventsVO.InfoVO();
-// infoVO.setToday(iBaseCaseService.dayCount());
- infoVO.setToday(41);
-// infoVO.setWeek(iBaseCaseService.weekCount());
- infoVO.setWeek(41);
+ infoVO.setToday(iBaseCaseService.dayCount());
+// infoVO.setToday(41);
+ infoVO.setWeek(iBaseCaseService.weekCount());
+// infoVO.setWeek(41);
infoVO.setDispatch(iBaseCaseService.dispatchCount());
-// infoVO.setIdentification(iBaseCaseService.alCount());
- infoVO.setIdentification(7621);
+ infoVO.setIdentification(iBaseCaseService.alCount());
+// infoVO.setIdentification(7621);
IPage<EventVO> page = iBaseCaseService.selectEventList(params.getBeginTime(), params.getEndTime(),params.getPageIndex(),params.getPageSize());
infoVO.setEvent(page.getRecords());
infoVO.setTotal(page.getTotal());
--
Gitblit v1.8.0