From 36a2d9a19b0b9ca2209555f6479ae1ef0198efd3 Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期三, 02 十一月 2022 09:35:12 +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 | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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;
--
Gitblit v1.8.0