From 89244932c6185cd39e9a9f8aa8bf3acf99329335 Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期日, 11 四月 2021 15:00:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/vmanager/gbStream/GbStreamController.java | 44 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 37 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gbStream/GbStreamController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gbStream/GbStreamController.java
index 787a094..64e4567 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gbStream/GbStreamController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gbStream/GbStreamController.java
@@ -5,11 +5,16 @@
import com.genersoft.iot.vmp.vmanager.gbStream.bean.GbStreamParam;
import com.genersoft.iot.vmp.service.IGbStreamService;
import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+@Api(tags = "瑙嗛娴佸叧鑱斿埌绾ц仈骞冲彴")
@CrossOrigin
@RestController
@RequestMapping("/api/gbStream")
@@ -24,7 +29,18 @@
private IVideoManagerStorager storager;
- @RequestMapping(value = "/list")
+ /**
+ * 鏌ヨ鍥芥爣閫氶亾
+ * @param page 褰撳墠椤�
+ * @param count 姣忛〉鏉℃暟
+ * @return
+ */
+ @ApiOperation("鏌ヨ鍥芥爣閫氶亾")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "page", value = "褰撳墠椤�", required = true ),
+ @ApiImplicitParam(name = "count", value = "姣忛〉鏉℃暟", required = true ),
+ })
+ @GetMapping(value = "/list")
@ResponseBody
public PageInfo<GbStream> list(@RequestParam(required = false)Integer page,
@RequestParam(required = false)Integer count){
@@ -33,11 +49,18 @@
}
- @RequestMapping(value = "/del")
+ /**
+ * 绉婚櫎鍥芥爣鍏宠仈
+ * @param gbStreamParam
+ * @return
+ */
+ @ApiOperation("绉婚櫎鍥芥爣鍏宠仈")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "gbStreamParam", value = "GbStreamParam", required = true ),
+ })
+ @DeleteMapping(value = "/del")
@ResponseBody
public Object del(@RequestBody GbStreamParam gbStreamParam){
- System.out.println(2222);
- System.out.println(gbStreamParam.getGbStreams().size());
if (gbStreamService.delPlatformInfo(gbStreamParam.getGbStreams())) {
return "success";
}else {
@@ -46,11 +69,18 @@
}
- @RequestMapping(value = "/add")
+ /**
+ * 淇濆瓨鍥芥爣鍏宠仈
+ * @param gbStreamParam
+ * @return
+ */
+ @ApiOperation("淇濆瓨鍥芥爣鍏宠仈")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "gbStreamParam", value = "GbStreamParam", required = true ),
+ })
+ @PostMapping(value = "/add")
@ResponseBody
public Object add(@RequestBody GbStreamParam gbStreamParam){
- System.out.println(3333);
- System.out.println(gbStreamParam.getGbStreams().size());
if (gbStreamService.addPlatformInfo(gbStreamParam.getGbStreams(), gbStreamParam.getPlatformId())) {
return "success";
}else {
--
Gitblit v1.8.0