From d935c94f9e47e107cbe0ac2b50c6aa37909c54c0 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 03 十一月 2022 17:56:00 +0800
Subject: [PATCH] 优化
---
ycl-common/src/main/java/com/ycl/vo/cockpit/CockpitVO.java | 25 +++++++++++++------------
ycl-platform/src/main/java/com/ycl/controller/cockpit/statisticsEvents/StatisticsEventsController.java | 16 +++++++---------
2 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/vo/cockpit/CockpitVO.java b/ycl-common/src/main/java/com/ycl/vo/cockpit/CockpitVO.java
index 30fa4d8..44ef16a 100644
--- a/ycl-common/src/main/java/com/ycl/vo/cockpit/CockpitVO.java
+++ b/ycl-common/src/main/java/com/ycl/vo/cockpit/CockpitVO.java
@@ -5,6 +5,7 @@
import lombok.Data;
import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
/**
* @author Lyq
@@ -14,35 +15,35 @@
public class CockpitVO {
@Data
@ApiModel
- public static class Params1VO {
+ public class Params1VO implements Serializable {
@ApiModelProperty(value = "appId", example = "1")
- @NotBlank(message = "appId涓嶈兘涓虹┖")
+// @NotBlank(message = "appId涓嶈兘涓虹┖")
private String appId;
@ApiModelProperty(value = "appKey", example = "1")
- @NotBlank(message = "appKey涓嶈兘涓虹┖")
+// @NotBlank(message = "appKey涓嶈兘涓虹┖")
private String appKey;
@ApiModelProperty(value = "sign", example = "sfagjgfjgfjdgfjsgdfgsa")
- @NotBlank(message = "sign涓嶈兘涓虹┖")
+// @NotBlank(message = "sign涓嶈兘涓虹┖")
private String sign;
}
@Data
@ApiModel
- public static class Params2VO {
+ public class Params2VO implements Serializable {
@ApiModelProperty(value = "appId", example = "1")
- @NotBlank(message = "appId涓嶈兘涓虹┖")
+// @NotBlank(message = "appId涓嶈兘涓虹┖")
private String appId;
@ApiModelProperty(value = "appKey", example = "1")
- @NotBlank(message = "appKey涓嶈兘涓虹┖")
+// @NotBlank(message = "appKey涓嶈兘涓虹┖")
private String appKey;
@ApiModelProperty(value = "sign", example = "sfagjgfjgfjdgfjsgdfgsa")
- @NotBlank(message = "sign涓嶈兘涓虹┖")
+// @NotBlank(message = "sign涓嶈兘涓虹┖")
private String sign;
- @ApiModelProperty(value = "寮�濮嬫椂闂达紝鏍煎紡yyyy-MM-dd hh:mm:ss",example = "2022-10-22 13:22:22")
- @NotBlank(message = "寮�濮嬫椂闂翠笉鑳戒负绌�")
+ @ApiModelProperty(value = "寮�濮嬫椂闂达紝鏍煎紡yyyy-MM-dd hh:mm:ss", example = "2022-10-22 13:22:22")
+// @NotBlank(message = "寮�濮嬫椂闂翠笉鑳戒负绌�")
private String beginTime;
- @ApiModelProperty(value = "缁撴潫鏃堕棿锛屾牸寮弝yyy-MM-dd hh:mm:ss",example = "2022-10-23 13:22:22")
- @NotBlank(message = "缁撴潫鏃堕棿涓嶈兘涓虹┖")
+ @ApiModelProperty(value = "缁撴潫鏃堕棿锛屾牸寮弝yyy-MM-dd hh:mm:ss", example = "2022-10-23 13:22:22")
+// @NotBlank(message = "缁撴潫鏃堕棿涓嶈兘涓虹┖")
private String endTime;
}
}
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 4517bfa..3762499 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
@@ -33,9 +33,8 @@
@ApiOperation(value = "鎵ф硶浜嬩欢")
@GetMapping("/law_enforcement_event")
- @ApiImplicitParam(name = "regionId",value = "鍦板尯Id",required = true,dataType = "String")
- public CommonResult<List<StatisticsEventsVO.LawEnforcementEventVO>> detection(@Validated CockpitVO.Params2VO params, @RequestParam(required = true)String regionId) {
- checkApiUtil.cockpit(params.getAppId(), params.getAppKey(), params.getSign(), params.getBeginTime(), params.getEndTime(),regionId);
+ public CommonResult<List<StatisticsEventsVO.LawEnforcementEventVO>> detection(@Validated CockpitVO.Params2VO params) {
+ checkApiUtil.cockpit(params.getAppId(), params.getAppKey(), params.getSign(), params.getBeginTime(), params.getEndTime(), null);
List<StatisticsEventsVO.LawEnforcementEventVO> lawEnforcementEventVOS = new ArrayList<>();
StatisticsEventsVO.LawEnforcementEventVO a = null;
for (int i = 0; i < 4; i++) {
@@ -51,9 +50,8 @@
@ApiOperation(value = "鐗╄仈鎰熺煡")
@GetMapping("/lot")
- @ApiImplicitParam(name = "regionId",value = "鍦板尯Id",required = true,dataType = "String")
- public CommonResult<List<StatisticsEventsVO.LotVO>> lot(@Validated CockpitVO.Params1VO params,@RequestParam(required = true)String regionId) {
- checkApiUtil.cockpit(params.getAppId(), params.getAppKey(), params.getSign(), null, null,regionId);
+ public CommonResult<List<StatisticsEventsVO.LotVO>> lot(@Validated CockpitVO.Params1VO params) {
+ checkApiUtil.cockpit(params.getAppId(), params.getAppKey(), params.getSign(), null, null, null);
List<StatisticsEventsVO.LotVO> lotVOS = new ArrayList<>();
StatisticsEventsVO.LotVO a = null;
for (int i = 0; i < 4; i++) {
@@ -70,7 +68,7 @@
@ApiOperation(value = "鎵ф硶闃熶紞")
@GetMapping("/team")
public CommonResult<StatisticsEventsVO.TeamVO> team(@Validated CockpitVO.Params1VO params) {
- checkApiUtil.cockpit(params.getAppId(), params.getAppKey(), params.getSign(), null, null,null);
+ checkApiUtil.cockpit(params.getAppId(), params.getAppKey(), params.getSign(), null, null, null);
StatisticsEventsVO.TeamVO teamVO = new StatisticsEventsVO.TeamVO();
teamVO.setAll(30);
teamVO.setAssistant(10);
@@ -84,7 +82,7 @@
@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,null);
+ checkApiUtil.cockpit(params.getAppId(), params.getAppKey(), params.getSign(), null, null, null);
List<StatisticsEventsVO.GridMemberVO> gridMemberVOS = new ArrayList<>();
StatisticsEventsVO.GridMemberVO a = null;
for (int i = 0; i < 4; i++) {
@@ -100,7 +98,7 @@
@ApiOperation(value = "鎸囨暟浣撳緛")
@GetMapping("/index_signs")
public CommonResult<StatisticsEventsVO.IndexSignsVO> indexSigns(@Validated CockpitVO.Params1VO params) {
- checkApiUtil.cockpit(params.getAppId(), params.getAppKey(), params.getSign(), null, null,null);
+ checkApiUtil.cockpit(params.getAppId(), params.getAppKey(), params.getSign(), null, null, null);
StatisticsEventsVO.IndexSignsVO indexSignsVO = new StatisticsEventsVO.IndexSignsVO();
indexSignsVO.setEvent(1);
indexSignsVO.setGridMember(20);
--
Gitblit v1.8.0