From a0912fe376f382cf7056e9ff3bc87a607681c981 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 21 三月 2023 11:35:41 +0800
Subject: [PATCH] 驾驶舱接口优化
---
ycl-platform/src/main/java/com/ycl/controller/cockpit/enforcementEvents/EnforcementEventsController.java | 19 +++----------------
1 files changed, 3 insertions(+), 16 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 244ee39..db89209 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
@@ -8,9 +8,7 @@
import com.ycl.mapper.trend.TrendAnalysisMapper;
import com.ycl.service.caseHandler.IBaseCaseService;
import com.ycl.service.caseHandler.IViolationsService;
-import com.ycl.service.trend.TrendAnalysisService;
import com.ycl.util.CheckApiUtil;
-import com.ycl.vo.TrendVo;
import com.ycl.vo.cockpit.CockpitVO;
import com.ycl.vo.cockpit.enforcementEvents.EnforcementEventsVO;
import com.ycl.vo.cockpit.enforcementEvents.VideoAndAreaVO;
@@ -24,9 +22,7 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
-import java.math.RoundingMode;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -54,16 +50,7 @@
@GetMapping("/statistics")
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);
- map.put("register", eventVO);
- return CommonResult.success(map);
+ return CommonResult.success(iBaseCaseService.statistics());
}
@ApiOperation(value = "浜嬩欢绫诲瀷")
@@ -74,7 +61,7 @@
Long count = iViolationsService.count();
typeAndSourceVO.setAll(iViolationsService.count());
List<VideoAndAreaVO> videoAndAreaVOS = iViolationsService.selectType();
- videoAndAreaVOS.stream().forEach(item->item.setRatio(new BigDecimal(item.getCount()*1.0/count).setScale(2,BigDecimal.ROUND_HALF_UP)));
+ videoAndAreaVOS.stream().forEach(item -> item.setRatio(new BigDecimal(item.getCount() * 1.0 / count).setScale(2, BigDecimal.ROUND_HALF_UP)));
typeAndSourceVO.setRecords(videoAndAreaVOS);
return CommonResult.success(typeAndSourceVO);
}
@@ -109,7 +96,7 @@
al.setCount(alCount);
typeVO1s.add(al);
VideoAndAreaVO hand = new VideoAndAreaVO();
- hand.setName("浜哄伐涓婃姤");
+ hand.setName("缃戞牸宸℃煡");
hand.setRatio(new BigDecimal(handCount * 1.0 / allCount).setScale(2, BigDecimal.ROUND_HALF_UP));
hand.setCount(handCount);
typeVO1s.add(hand);
--
Gitblit v1.8.0