From 0d02ee0aeeaa7c4df579a57b6f75e59c69a1ed26 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 16 十一月 2022 10:22:06 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/controller/cockpit/aiIot/AIIotController.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 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 178c339..1393455 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
@@ -34,8 +34,8 @@
@ApiOperation(value = "鐩戞祴鏁版嵁")
@GetMapping("/detection")
- public CommonResult<AIIotVO.DetectionVO> detection(@Validated CockpitVO.Params1VO params) {
- checkApiUtil.cockpit(params.getAppId(), params.getAppKey(), params.getSign(), null, null,null);
+ public CommonResult<AIIotVO.DetectionVO> detection(@Validated CockpitVO params) {
+ checkApiUtil.cockpit(params);
AIIotVO.DetectionVO detectionVO = new AIIotVO.DetectionVO();
detectionVO.setVideo(121);
detectionVO.setIndividual(20);
@@ -47,9 +47,8 @@
@ApiOperation(value = "瀹炴椂瑙嗛鐩戞帶")
@GetMapping("/video")
- @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);
+ public CommonResult<List<AIIotVO.VideoVO>> video(@Validated CockpitVO params) {
+ checkApiUtil.cockpit(params);
List<AIIotVO.VideoVO> videoVOS = new ArrayList<>();
AIIotVO.VideoVO a = null;
for (int i = 0; i < 4; i++) {
@@ -69,8 +68,8 @@
@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(),null);
+ public CommonResult<List<AIIotVO.EfficiencyVO>> efficiency(@Validated CockpitVO params) {
+ checkApiUtil.cockpit(params);
List<AIIotVO.EfficiencyVO> efficiencyVOS = new ArrayList<>();
AIIotVO.EfficiencyVO a = null;
for (int i = 0; i < 4; i++) {
@@ -85,8 +84,8 @@
@ApiOperation(value = "娓ｅ湡鑱斿姩")
@GetMapping("/slag_car")
- public CommonResult<AIIotVO.SlagCarVO> slagCar(@Validated CockpitVO.Params1VO params) {
- checkApiUtil.cockpit(params.getAppId(), params.getAppKey(), params.getSign(), null, null,null);
+ public CommonResult<AIIotVO.SlagCarVO> slagCar(@Validated CockpitVO params) {
+ checkApiUtil.cockpit(params);
AIIotVO.SlagCarVO slagCarVO = new AIIotVO.SlagCarVO();
slagCarVO.setCar(236);
slagCarVO.setTeam(20);
@@ -95,8 +94,8 @@
@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(),null);
+ public CommonResult<List<AIIotVO.StatisticsVO>> statistics(@Validated CockpitVO params) {
+ checkApiUtil.cockpit(params);
List<AIIotVO.StatisticsVO> statisticsVOS = new ArrayList<>();
List<AIIotVO.Statistics1VO> statistics1VOS = new ArrayList<>();
AIIotVO.StatisticsVO a = null;
--
Gitblit v1.8.0