From 15ccd1b13a0f1358d654aa9b9945560067bdd679 Mon Sep 17 00:00:00 2001
From: liyanqi <15181887205@163.com>
Date: 星期二, 01 十一月 2022 15:06:19 +0800
Subject: [PATCH] 驾驶舱fix bug
---
ycl-platform/src/main/java/com/ycl/util/CheckApiUtil.java | 17 +++++---
ycl-platform/src/main/java/com/ycl/controller/cockpit/enforcementEvents/EnforcementEventsController.java | 15 ++++---
ycl-platform/src/main/java/com/ycl/vo/cockpit/enforcementEvents/EnforcementEventsVO.java | 2 +
ycl-platform/src/main/java/com/ycl/controller/cockpit/statisticsEvents/StatisticsEventsController.java | 19 ++++++---
ycl-platform/src/main/java/com/ycl/controller/cockpit/aiIot/AIIotController.java | 15 ++++---
ycl-platform/src/main/java/com/ycl/vo/cockpit/statisticsEvents/StatisticsEventsVO.java | 2 +
6 files changed, 43 insertions(+), 27 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/cockpit/aiIot/AIIotController.java b/ycl-platform/src/main/java/com/ycl/controller/cockpit/aiIot/AIIotController.java
index 4d1d238..178c339 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/cockpit/aiIot/AIIotController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/cockpit/aiIot/AIIotController.java
@@ -5,10 +5,12 @@
import com.ycl.vo.cockpit.CockpitVO;
import com.ycl.vo.cockpit.aiIot.AIIotVO;
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;
@@ -33,7 +35,7 @@
@ApiOperation(value = "鐩戞祴鏁版嵁")
@GetMapping("/detection")
public CommonResult<AIIotVO.DetectionVO> detection(@Validated CockpitVO.Params1VO params) {
- checkApiUtil.cockpit(params.getAppId(), params.getAppKey(), params.getSign(), null, null);
+ checkApiUtil.cockpit(params.getAppId(), params.getAppKey(), params.getSign(), null, null,null);
AIIotVO.DetectionVO detectionVO = new AIIotVO.DetectionVO();
detectionVO.setVideo(121);
detectionVO.setIndividual(20);
@@ -45,8 +47,9 @@
@ApiOperation(value = "瀹炴椂瑙嗛鐩戞帶")
@GetMapping("/video")
- public CommonResult<List<AIIotVO.VideoVO>> video(@Validated CockpitVO.Params1VO params) {
- checkApiUtil.cockpit(params.getAppId(), params.getAppKey(), params.getSign(), null, null);
+ @ApiImplicitParam(name = "regionId",value = "鍦板尯Id",required = true,dataType = "String")
+ public CommonResult<List<AIIotVO.VideoVO>> video(@Validated CockpitVO.Params1VO params, @RequestParam(required = true)String regionId) {
+ checkApiUtil.cockpit(params.getAppId(), params.getAppKey(), params.getSign(), null, null,regionId);
List<AIIotVO.VideoVO> videoVOS = new ArrayList<>();
AIIotVO.VideoVO a = null;
for (int i = 0; i < 4; i++) {
@@ -67,7 +70,7 @@
@ApiOperation(value = "AI绠楁硶鏁堣兘")
@GetMapping("/efficiency")
public CommonResult<List<AIIotVO.EfficiencyVO>> efficiency(@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<AIIotVO.EfficiencyVO> efficiencyVOS = new ArrayList<>();
AIIotVO.EfficiencyVO a = null;
for (int i = 0; i < 4; i++) {
@@ -83,7 +86,7 @@
@ApiOperation(value = "娓ｅ湡鑱斿姩")
@GetMapping("/slag_car")
public CommonResult<AIIotVO.SlagCarVO> slagCar(@Validated CockpitVO.Params1VO params) {
- checkApiUtil.cockpit(params.getAppId(), params.getAppKey(), params.getSign(), null, null);
+ checkApiUtil.cockpit(params.getAppId(), params.getAppKey(), params.getSign(), null, null,null);
AIIotVO.SlagCarVO slagCarVO = new AIIotVO.SlagCarVO();
slagCarVO.setCar(236);
slagCarVO.setTeam(20);
@@ -93,7 +96,7 @@
@ApiOperation(value = "AI浜嬩欢缁熻")
@GetMapping("/event_statistics")
public CommonResult<List<AIIotVO.StatisticsVO>> 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);
List<AIIotVO.StatisticsVO> statisticsVOS = new ArrayList<>();
List<AIIotVO.Statistics1VO> statistics1VOS = new ArrayList<>();
AIIotVO.StatisticsVO a = null;
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);
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..4517bfa 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,9 @@
@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());
+ @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);
List<StatisticsEventsVO.LawEnforcementEventVO> lawEnforcementEventVOS = new ArrayList<>();
StatisticsEventsVO.LawEnforcementEventVO a = null;
for (int i = 0; i < 4; i++) {
@@ -48,8 +51,9 @@
@ApiOperation(value = "鐗╄仈鎰熺煡")
@GetMapping("/lot")
- public CommonResult<List<StatisticsEventsVO.LotVO>> lot(@Validated CockpitVO.Params1VO params) {
- checkApiUtil.cockpit(params.getAppId(), params.getAppKey(), params.getSign(), null, null);
+ @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);
List<StatisticsEventsVO.LotVO> lotVOS = new ArrayList<>();
StatisticsEventsVO.LotVO a = null;
for (int i = 0; i < 4; i++) {
@@ -57,6 +61,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);
@@ -65,7 +70,7 @@
@ApiOperation(value = "鎵ф硶闃熶紞")
@GetMapping("/team")
public CommonResult<StatisticsEventsVO.TeamVO> team(@Validated CockpitVO.Params1VO params) {
- checkApiUtil.cockpit(params.getAppId(), params.getAppKey(), params.getSign(), 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);
@@ -79,7 +84,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);
+ 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++) {
@@ -95,7 +100,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);
+ checkApiUtil.cockpit(params.getAppId(), params.getAppKey(), params.getSign(), null, null,null);
StatisticsEventsVO.IndexSignsVO indexSignsVO = new StatisticsEventsVO.IndexSignsVO();
indexSignsVO.setEvent(1);
indexSignsVO.setGridMember(20);
diff --git a/ycl-platform/src/main/java/com/ycl/util/CheckApiUtil.java b/ycl-platform/src/main/java/com/ycl/util/CheckApiUtil.java
index 1d3b50c..ccb60d5 100644
--- a/ycl-platform/src/main/java/com/ycl/util/CheckApiUtil.java
+++ b/ycl-platform/src/main/java/com/ycl/util/CheckApiUtil.java
@@ -23,14 +23,14 @@
/**
* 椹鹃┒鑸�
*
- * @param appId
- * @param appKey
- * @param sign
- * @param name
- * @param beginTime
- * @param endTime
+ * @param appId appId
+ * @param appKey appKey
+ * @param sign sign
+ * @param beginTime 寮�濮嬫椂闂�
+ * @param endTime 缁撴潫鏃堕棿
+ * @param regionId 鍖哄煙Id
*/
- public void cockpit(String appId, String appKey, String sign, String beginTime, String endTime) {
+ public void cockpit(String appId, String appKey, String sign, String beginTime, String endTime, String regionId) {
apiKeyService.checkIsExist(appId, appKey, "椹鹃┒浠�");
StringBuffer sb = new StringBuffer();
sb.append(appId);
@@ -40,6 +40,9 @@
sb.append(beginTime);
sb.append(endTime);
}
+ if (!StringUtils.isBlank(regionId)) {
+ sb.append(regionId);
+ }
result = MD5Util.md5Encrypt32Lower(sb.toString());
if (!sign.equals(result)) {
throw new ApiException(ResultCode.SIGN_ERROR);
diff --git a/ycl-platform/src/main/java/com/ycl/vo/cockpit/enforcementEvents/EnforcementEventsVO.java b/ycl-platform/src/main/java/com/ycl/vo/cockpit/enforcementEvents/EnforcementEventsVO.java
index c52ad94..17ed8f9 100644
--- a/ycl-platform/src/main/java/com/ycl/vo/cockpit/enforcementEvents/EnforcementEventsVO.java
+++ b/ycl-platform/src/main/java/com/ycl/vo/cockpit/enforcementEvents/EnforcementEventsVO.java
@@ -53,6 +53,8 @@
private String name;
@ApiModelProperty(value = "娆℃暟")
private Integer count;
+ @ApiModelProperty(value = "鏁版嵁鍗犳瘮")
+ private BigDecimal ratio;
}
@Data
diff --git a/ycl-platform/src/main/java/com/ycl/vo/cockpit/statisticsEvents/StatisticsEventsVO.java b/ycl-platform/src/main/java/com/ycl/vo/cockpit/statisticsEvents/StatisticsEventsVO.java
index 170883d..0d06c47 100644
--- a/ycl-platform/src/main/java/com/ycl/vo/cockpit/statisticsEvents/StatisticsEventsVO.java
+++ b/ycl-platform/src/main/java/com/ycl/vo/cockpit/statisticsEvents/StatisticsEventsVO.java
@@ -36,6 +36,8 @@
private String name;
@ApiModelProperty(value = "鏁伴噺")
private Integer count;
+ @ApiModelProperty(value = "姣斾緥")
+ private BigDecimal ratio;
}
@ApiModel(description = "鎵ф硶闃熶紞")
--
Gitblit v1.8.0