From 9eba8d0c7cbadb31c40e0fe1536b01d5392f1665 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期五, 04 十一月 2022 11:58:08 +0800
Subject: [PATCH] 驾驶舱接口修改
---
ycl-platform/src/main/java/com/ycl/controller/cockpit/statisticsEvents/StatisticsEventsController.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/cockpit/statisticsEvents/StatisticsEventsController.java b/ycl-platform/src/main/java/com/ycl/controller/cockpit/statisticsEvents/StatisticsEventsController.java
index 21d3745..4a83fe3 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/cockpit/statisticsEvents/StatisticsEventsController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/cockpit/statisticsEvents/StatisticsEventsController.java
@@ -5,10 +5,12 @@
import com.ycl.vo.cockpit.CockpitVO;
import com.ycl.vo.cockpit.statisticsEvents.StatisticsEventsVO;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
@@ -31,8 +33,8 @@
@ApiOperation(value = "鎵ф硶浜嬩欢")
@GetMapping("/law_enforcement_event")
- public CommonResult<List<StatisticsEventsVO.LawEnforcementEventVO>> detection(@Validated CockpitVO.Params2VO params) {
- checkApiUtil.cockpit(params.getAppId(), params.getAppKey(), params.getSign(), params.getBeginTime(), params.getEndTime());
+ public CommonResult<List<StatisticsEventsVO.LawEnforcementEventVO>> detection(@Validated CockpitVO params) {
+ checkApiUtil.cockpit(params);
List<StatisticsEventsVO.LawEnforcementEventVO> lawEnforcementEventVOS = new ArrayList<>();
StatisticsEventsVO.LawEnforcementEventVO a = null;
for (int i = 0; i < 4; i++) {
@@ -48,8 +50,8 @@
@ApiOperation(value = "鐗╄仈鎰熺煡")
@GetMapping("/lot")
- public CommonResult<List<StatisticsEventsVO.LotVO>> lot(@Validated CockpitVO.Params1VO params) {
- checkApiUtil.cockpit(params.getAppId(), params.getAppKey(), params.getSign(), null, null);
+ public CommonResult<List<StatisticsEventsVO.LotVO>> lot(@Validated CockpitVO params) {
+ checkApiUtil.cockpit(params);
List<StatisticsEventsVO.LotVO> lotVOS = new ArrayList<>();
StatisticsEventsVO.LotVO a = null;
for (int i = 0; i < 4; i++) {
@@ -57,6 +59,7 @@
a.setName("鍥㈢粨灞�");
a.setType("鎽勫儚澶�");
a.setCount(10);
+ a.setRatio(new BigDecimal("-0.3").setScale(2, RoundingMode.HALF_UP));
lotVOS.add(a);
}
return CommonResult.success(lotVOS);
@@ -64,8 +67,8 @@
@ApiOperation(value = "鎵ф硶闃熶紞")
@GetMapping("/team")
- public CommonResult<StatisticsEventsVO.TeamVO> team(@Validated CockpitVO.Params1VO params) {
- checkApiUtil.cockpit(params.getAppId(), params.getAppKey(), params.getSign(), null, null);
+ public CommonResult<StatisticsEventsVO.TeamVO> team(@Validated CockpitVO params) {
+ checkApiUtil.cockpit(params);
StatisticsEventsVO.TeamVO teamVO = new StatisticsEventsVO.TeamVO();
teamVO.setAll(30);
teamVO.setAssistant(10);
@@ -78,8 +81,8 @@
@ApiOperation(value = "缃戞牸鍛�")
@GetMapping("/grid_member")
- public CommonResult<List<StatisticsEventsVO.GridMemberVO>> gridMember(@Validated CockpitVO.Params1VO params) {
- checkApiUtil.cockpit(params.getAppId(), params.getAppKey(), params.getSign(), null, null);
+ public CommonResult<List<StatisticsEventsVO.GridMemberVO>> gridMember(@Validated CockpitVO params) {
+ checkApiUtil.cockpit(params);
List<StatisticsEventsVO.GridMemberVO> gridMemberVOS = new ArrayList<>();
StatisticsEventsVO.GridMemberVO a = null;
for (int i = 0; i < 4; i++) {
@@ -94,8 +97,8 @@
@ApiOperation(value = "鎸囨暟浣撳緛")
@GetMapping("/index_signs")
- public CommonResult<StatisticsEventsVO.IndexSignsVO> indexSigns(@Validated CockpitVO.Params1VO params) {
- checkApiUtil.cockpit(params.getAppId(), params.getAppKey(), params.getSign(), null, null);
+ public CommonResult<StatisticsEventsVO.IndexSignsVO> indexSigns(@Validated CockpitVO params) {
+ checkApiUtil.cockpit(params);
StatisticsEventsVO.IndexSignsVO indexSignsVO = new StatisticsEventsVO.IndexSignsVO();
indexSignsVO.setEvent(1);
indexSignsVO.setGridMember(20);
--
Gitblit v1.8.0