From 1a9e49d9ff210e39f6297150db758906a4f02e6f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 19 八月 2022 17:11:51 +0800
Subject: [PATCH] 依赖包版本升级
---
src/main/java/com/genersoft/iot/vmp/vmanager/streamProxy/StreamProxyController.java | 57 +++++++++++++++++++++++----------------------------------
1 files changed, 23 insertions(+), 34 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/streamProxy/StreamProxyController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/streamProxy/StreamProxyController.java
index f21bfd1..1ec4318 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/streamProxy/StreamProxyController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/streamProxy/StreamProxyController.java
@@ -10,10 +10,10 @@
import com.genersoft.iot.vmp.service.IStreamProxyService;
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
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 io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.tags.Tag;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -25,7 +25,7 @@
/**
* 鎷夋祦浠ｇ悊鎺ュ彛
*/
-@Api(tags = "鎷夋祦浠ｇ悊")
+@Tag(name = "鎷夋祦浠ｇ悊", description = "")
@Controller
@CrossOrigin
@RequestMapping(value = "/api/proxy")
@@ -44,13 +44,11 @@
private IStreamProxyService streamProxyService;
- @ApiOperation("鍒嗛〉鏌ヨ娴佷唬鐞�")
- @ApiImplicitParams({
- @ApiImplicitParam(name="page", value = "褰撳墠椤�", required = true, dataTypeClass = Integer.class),
- @ApiImplicitParam(name="count", value = "姣忛〉鏌ヨ鏁伴噺", required = true, dataTypeClass = Integer.class),
- @ApiImplicitParam(name="query", value = "鏌ヨ鍐呭", dataTypeClass = String.class),
- @ApiImplicitParam(name="online", value = "鏄惁鍦ㄧ嚎", dataTypeClass = Boolean.class),
- })
+ @Operation(summary = "鍒嗛〉鏌ヨ娴佷唬鐞�")
+ @Parameter(name = "page", description = "褰撳墠椤�")
+ @Parameter(name = "count", description = "姣忛〉鏌ヨ鏁伴噺")
+ @Parameter(name = "query", description = "鏌ヨ鍐呭")
+ @Parameter(name = "online", description = "鏄惁鍦ㄧ嚎")
@GetMapping(value = "/list")
@ResponseBody
public PageInfo<StreamProxyItem> list(@RequestParam(required = false)Integer page,
@@ -61,9 +59,8 @@
return streamProxyService.getAll(page, count);
}
- @ApiOperation("淇濆瓨浠ｇ悊")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "param", value = "浠ｇ悊鍙傛暟", dataTypeClass = StreamProxyItem.class),
+ @Operation(summary = "淇濆瓨浠ｇ悊", parameters = {
+ @Parameter(name = "param", description = "浠ｇ悊鍙傛暟", required = true),
})
@PostMapping(value = "/save")
@ResponseBody
@@ -82,12 +79,10 @@
return result;
}
- @ApiOperation("鑾峰彇ffmpeg.cmd妯℃澘")
@GetMapping(value = "/ffmpeg_cmd/list")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "mediaServerId", value = "娴佸獟浣揑D", dataTypeClass = String.class),
- })
@ResponseBody
+ @Operation(summary = "鑾峰彇ffmpeg.cmd妯℃澘")
+ @Parameter(name = "mediaServerId", description = "娴佸獟浣揑D", required = true)
public WVPResult getFFmpegCMDs(@RequestParam String mediaServerId){
logger.debug("鑾峰彇鑺傜偣[ {} ]ffmpeg.cmd妯℃澘", mediaServerId );
@@ -100,13 +95,11 @@
return result;
}
- @ApiOperation("绉婚櫎浠ｇ悊")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "app", value = "搴旂敤鍚�", required = true, dataTypeClass = String.class),
- @ApiImplicitParam(name = "stream", value = "娴両D", required = true, dataTypeClass = String.class),
- })
@DeleteMapping(value = "/del")
@ResponseBody
+ @Operation(summary = "绉婚櫎浠ｇ悊")
+ @Parameter(name = "app", description = "搴旂敤鍚�", required = true)
+ @Parameter(name = "stream", description = "娴乮d", required = true)
public WVPResult del(@RequestParam String app, @RequestParam String stream){
logger.info("绉婚櫎浠ｇ悊锛� " + app + "/" + stream);
WVPResult<Object> result = new WVPResult<>();
@@ -121,13 +114,11 @@
return result;
}
- @ApiOperation("鍚敤浠ｇ悊")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "app", value = "搴旂敤鍚�", dataTypeClass = String.class),
- @ApiImplicitParam(name = "stream", value = "娴両D", dataTypeClass = String.class),
- })
@GetMapping(value = "/start")
@ResponseBody
+ @Operation(summary = "鍚敤浠ｇ悊")
+ @Parameter(name = "app", description = "搴旂敤鍚�", required = true)
+ @Parameter(name = "stream", description = "娴乮d", required = true)
public Object start(String app, String stream){
logger.info("鍚敤浠ｇ悊锛� " + app + "/" + stream);
boolean result = streamProxyService.start(app, stream);
@@ -137,13 +128,11 @@
return result?"success":"fail";
}
- @ApiOperation("鍋滅敤浠ｇ悊")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "app", value = "搴旂敤鍚�", dataTypeClass = String.class),
- @ApiImplicitParam(name = "stream", value = "娴両D", dataTypeClass = String.class),
- })
@GetMapping(value = "/stop")
@ResponseBody
+ @Operation(summary = "鍋滅敤浠ｇ悊")
+ @Parameter(name = "app", description = "搴旂敤鍚�", required = true)
+ @Parameter(name = "stream", description = "娴乮d", required = true)
public Object stop(String app, String stream){
logger.info("鍋滅敤浠ｇ悊锛� " + app + "/" + stream);
boolean result = streamProxyService.stop(app, stream);
--
Gitblit v1.8.0