From 36a2d9a19b0b9ca2209555f6479ae1ef0198efd3 Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期三, 02 十一月 2022 09:35:12 +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 | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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 1c19a87..fb20fd6 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
@@ -34,7 +34,7 @@
@ApiOperation(value = "鎵ф硶浜嬩欢缁熻")
@GetMapping("/statistics")
public CommonResult<Map<String, Object>> statistics(@Validated CockpitVO.Params2VO params) {
- checkApiUtil.cockpit(params.getAppId(), params.getAppKey(), params.getSign(), params.getBeginTime(), params.getEndTime());
+ checkApiUtil.cockpit(params.getAppId(), params.getAppKey(), params.getSign(), params.getBeginTime(), params.getEndTime(),null);
Map<String, Object> map = new HashMap<>();
EnforcementEventsVO.StatisticsEventVO eventVO = new EnforcementEventsVO.StatisticsEventVO();
eventVO.setCount(10);
@@ -49,7 +49,7 @@
@ApiOperation(value = "浜嬩欢绫诲瀷")
@GetMapping("/type")
public CommonResult<EnforcementEventsVO.TypeAndSourceVO> type(@Validated CockpitVO.Params2VO params) {
- checkApiUtil.cockpit(params.getAppId(), params.getAppKey(), params.getSign(), params.getBeginTime(), params.getEndTime());
+ checkApiUtil.cockpit(params.getAppId(), params.getAppKey(), params.getSign(), params.getBeginTime(), params.getEndTime(),null);
List<EnforcementEventsVO.TypeAndSourceVO1> typeVO1s = new ArrayList<>();
EnforcementEventsVO.TypeAndSourceVO typeVO = new EnforcementEventsVO.TypeAndSourceVO();
EnforcementEventsVO.TypeAndSourceVO1 typeVO1 = null;
@@ -68,13 +68,14 @@
@ApiOperation(value = "瑙嗛鎶撴媿鍛婂彂鐐逛綅")
@GetMapping("/video")
public CommonResult<List<EnforcementEventsVO.VideoAndAreaVO>> video(@Validated CockpitVO.Params2VO params) {
- checkApiUtil.cockpit(params.getAppId(), params.getAppKey(), params.getSign(), params.getBeginTime(), params.getEndTime());
+ checkApiUtil.cockpit(params.getAppId(), params.getAppKey(), params.getSign(), params.getBeginTime(), params.getEndTime(),null);
List<EnforcementEventsVO.VideoAndAreaVO> videoVOS = new ArrayList<>();
EnforcementEventsVO.VideoAndAreaVO videoVO = null;
for (int i = 0; i < 4; i++) {
videoVO = new EnforcementEventsVO.VideoAndAreaVO();
videoVO.setName("鍥㈢粨灞�");
videoVO.setCount(10);
+ videoVO.setRatio(new BigDecimal("0.65").setScale(2, RoundingMode.HALF_UP));
videoVOS.add(videoVO);
}
return CommonResult.success(videoVOS);
@@ -83,7 +84,7 @@
@ApiOperation(value = "浜嬩欢鏉ユ簮")
@GetMapping("/source")
public CommonResult<EnforcementEventsVO.TypeAndSourceVO> source(@Validated CockpitVO.Params2VO params) {
- checkApiUtil.cockpit(params.getAppId(), params.getAppKey(), params.getSign(), params.getBeginTime(), params.getEndTime());
+ checkApiUtil.cockpit(params.getAppId(), params.getAppKey(), params.getSign(), params.getBeginTime(), params.getEndTime(),null);
List<EnforcementEventsVO.TypeAndSourceVO1> typeVO1s = new ArrayList<>();
EnforcementEventsVO.TypeAndSourceVO typeVO = new EnforcementEventsVO.TypeAndSourceVO();
EnforcementEventsVO.TypeAndSourceVO1 typeVO1 = null;
@@ -102,7 +103,7 @@
@ApiOperation(value = "浜嬩欢鍖哄煙缁熻")
@GetMapping("/area")
public CommonResult<List<EnforcementEventsVO.VideoAndAreaVO>> area(@Validated CockpitVO.Params2VO params) {
- checkApiUtil.cockpit(params.getAppId(), params.getAppKey(), params.getSign(), params.getBeginTime(), params.getEndTime());
+ checkApiUtil.cockpit(params.getAppId(), params.getAppKey(), params.getSign(), params.getBeginTime(), params.getEndTime(),null);
List<EnforcementEventsVO.VideoAndAreaVO> videoVOS = new ArrayList<>();
EnforcementEventsVO.VideoAndAreaVO videoVO = null;
for (int i = 0; i < 4; i++) {
@@ -117,7 +118,7 @@
@ApiOperation(value = "寤惰浜嬩欢")
@GetMapping("/delay")
public CommonResult<List<EnforcementEventsVO.DelayVO>> delay(@Validated CockpitVO.Params2VO params) {
- checkApiUtil.cockpit(params.getAppId(), params.getAppKey(), params.getSign(), params.getBeginTime(), params.getEndTime());
+ checkApiUtil.cockpit(params.getAppId(), params.getAppKey(), params.getSign(), params.getBeginTime(), params.getEndTime(),null);
List<EnforcementEventsVO.DelayVO> delayVOS = new ArrayList<>();
EnforcementEventsVO.DelayVO delayVO = null;
for (int i = 0; i < 4; i++) {
@@ -133,7 +134,7 @@
@ApiOperation(value = "浜嬩欢淇℃伅")
@GetMapping("/info")
public CommonResult<EnforcementEventsVO.InfoVO> info(@Validated CockpitVO.Params2VO params) {
- checkApiUtil.cockpit(params.getAppId(), params.getAppKey(), params.getSign(), params.getBeginTime(), params.getEndTime());
+ checkApiUtil.cockpit(params.getAppId(), params.getAppKey(), params.getSign(), params.getBeginTime(), params.getEndTime(),null);
EnforcementEventsVO.InfoVO infoVO = new EnforcementEventsVO.InfoVO();
EnforcementEventsVO.EventVO eventVO = new EnforcementEventsVO.EventVO();
infoVO.setToday(5);
--
Gitblit v1.8.0