From a4047b6048ebfe09e66a765b58ea12b5bd0e2e6e Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 28 十一月 2022 16:18:10 +0800
Subject: [PATCH] 店铺管理优化

---
 ycl-platform/src/main/java/com/ycl/controller/cockpit/enforcementEvents/EnforcementEventsController.java |   30 ++++++++++++++++--------------
 1 files changed, 16 insertions(+), 14 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..dd28236 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
@@ -33,12 +33,13 @@
 
     @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());
+    public CommonResult<Map<String, Object>> statistics(@Validated CockpitVO params) {
+        checkApiUtil.cockpit(params);
         Map<String, Object> map = new HashMap<>();
         EnforcementEventsVO.StatisticsEventVO eventVO = new EnforcementEventsVO.StatisticsEventVO();
         eventVO.setCount(10);
         eventVO.setRatio(new BigDecimal("0.69").setScale(2, RoundingMode.HALF_UP));
+        eventVO.setUp(true);
         map.put("reported", eventVO);
         map.put("disposition", eventVO);
         map.put("dispositionInTime", eventVO);
@@ -48,8 +49,8 @@
 
     @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());
+    public CommonResult<EnforcementEventsVO.TypeAndSourceVO> type(@Validated CockpitVO params) {
+        checkApiUtil.cockpit(params);
         List<EnforcementEventsVO.TypeAndSourceVO1> typeVO1s = new ArrayList<>();
         EnforcementEventsVO.TypeAndSourceVO typeVO = new EnforcementEventsVO.TypeAndSourceVO();
         EnforcementEventsVO.TypeAndSourceVO1 typeVO1 = null;
@@ -67,14 +68,15 @@
 
     @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());
+    public CommonResult<List<EnforcementEventsVO.VideoAndAreaVO>> video(@Validated CockpitVO params) {
+        checkApiUtil.cockpit(params);
         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);
@@ -82,8 +84,8 @@
 
     @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());
+    public CommonResult<EnforcementEventsVO.TypeAndSourceVO> source(@Validated CockpitVO params) {
+        checkApiUtil.cockpit(params);
         List<EnforcementEventsVO.TypeAndSourceVO1> typeVO1s = new ArrayList<>();
         EnforcementEventsVO.TypeAndSourceVO typeVO = new EnforcementEventsVO.TypeAndSourceVO();
         EnforcementEventsVO.TypeAndSourceVO1 typeVO1 = null;
@@ -101,8 +103,8 @@
 
     @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());
+    public CommonResult<List<EnforcementEventsVO.VideoAndAreaVO>> area(@Validated CockpitVO params) {
+        checkApiUtil.cockpit(params);
         List<EnforcementEventsVO.VideoAndAreaVO> videoVOS = new ArrayList<>();
         EnforcementEventsVO.VideoAndAreaVO videoVO = null;
         for (int i = 0; i < 4; i++) {
@@ -116,8 +118,8 @@
 
     @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());
+    public CommonResult<List<EnforcementEventsVO.DelayVO>> delay(@Validated CockpitVO params) {
+        checkApiUtil.cockpit(params);
         List<EnforcementEventsVO.DelayVO> delayVOS = new ArrayList<>();
         EnforcementEventsVO.DelayVO delayVO = null;
         for (int i = 0; i < 4; i++) {
@@ -132,8 +134,8 @@
 
     @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());
+    public CommonResult<EnforcementEventsVO.InfoVO> info(@Validated CockpitVO params) {
+        checkApiUtil.cockpit(params);
         EnforcementEventsVO.InfoVO infoVO = new EnforcementEventsVO.InfoVO();
         EnforcementEventsVO.EventVO eventVO = new EnforcementEventsVO.EventVO();
         infoVO.setToday(5);

--
Gitblit v1.8.0