From a2cac5ca12f100d052cb31122a84de4bba829bca Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 04 一月 2024 18:34:46 +0800
Subject: [PATCH] Merge branch '2.6.9' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/vmanager/streamProxy/StreamProxyController.java | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 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
old mode 100644
new mode 100755
index 0689f42..9565000
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/streamProxy/StreamProxyController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/streamProxy/StreamProxyController.java
@@ -4,6 +4,7 @@
import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
+import com.genersoft.iot.vmp.conf.security.JwtUtils;
import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
@@ -16,6 +17,7 @@
import com.github.pagehelper.PageInfo;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -52,7 +54,7 @@
private UserSetting userSetting;
- @Operation(summary = "鍒嗛〉鏌ヨ娴佷唬鐞�")
+ @Operation(summary = "鍒嗛〉鏌ヨ娴佷唬鐞�", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "page", description = "褰撳墠椤�")
@Parameter(name = "count", description = "姣忛〉鏌ヨ鏁伴噺")
@Parameter(name = "query", description = "鏌ヨ鍐呭")
@@ -67,7 +69,17 @@
return streamProxyService.getAll(page, count);
}
- @Operation(summary = "淇濆瓨浠ｇ悊", parameters = {
+ @Operation(summary = "鏌ヨ娴佷唬鐞�", security = @SecurityRequirement(name = JwtUtils.HEADER))
+ @Parameter(name = "app", description = "搴旂敤鍚�")
+ @Parameter(name = "stream", description = "娴両d")
+ @GetMapping(value = "/one")
+ @ResponseBody
+ public StreamProxyItem one(String app, String stream){
+
+ return streamProxyService.getStreamProxyByAppAndStream(app, stream);
+ }
+
+ @Operation(summary = "淇濆瓨浠ｇ悊", security = @SecurityRequirement(name = JwtUtils.HEADER), parameters = {
@Parameter(name = "param", description = "浠ｇ悊鍙傛暟", required = true),
})
@PostMapping(value = "/save")
@@ -80,8 +92,15 @@
if (ObjectUtils.isEmpty(param.getType())) {
param.setType("default");
}
+ if (ObjectUtils.isEmpty(param.getRtpType())) {
+ param.setRtpType("1");
+ }
if (ObjectUtils.isEmpty(param.getGbId())) {
param.setGbId(null);
+ }
+ StreamProxyItem streamProxyItem = streamProxyService.getStreamProxyByAppAndStream(param.getApp(), param.getStream());
+ if (streamProxyItem != null) {
+ streamProxyService.del(param.getApp(), param.getStream());
}
RequestMessage requestMessage = new RequestMessage();
@@ -114,7 +133,7 @@
@GetMapping(value = "/ffmpeg_cmd/list")
@ResponseBody
- @Operation(summary = "鑾峰彇ffmpeg.cmd妯℃澘")
+ @Operation(summary = "鑾峰彇ffmpeg.cmd妯℃澘", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "mediaServerId", description = "娴佸獟浣揑D", required = true)
public JSONObject getFFmpegCMDs(@RequestParam String mediaServerId){
logger.debug("鑾峰彇鑺傜偣[ {} ]ffmpeg.cmd妯℃澘", mediaServerId );
@@ -128,7 +147,7 @@
@DeleteMapping(value = "/del")
@ResponseBody
- @Operation(summary = "绉婚櫎浠ｇ悊")
+ @Operation(summary = "绉婚櫎浠ｇ悊", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "app", description = "搴旂敤鍚�", required = true)
@Parameter(name = "stream", description = "娴乮d", required = true)
public void del(@RequestParam String app, @RequestParam String stream){
@@ -142,7 +161,7 @@
@GetMapping(value = "/start")
@ResponseBody
- @Operation(summary = "鍚敤浠ｇ悊")
+ @Operation(summary = "鍚敤浠ｇ悊", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "app", description = "搴旂敤鍚�", required = true)
@Parameter(name = "stream", description = "娴乮d", required = true)
public void start(String app, String stream){
@@ -155,7 +174,7 @@
@GetMapping(value = "/stop")
@ResponseBody
- @Operation(summary = "鍋滅敤浠ｇ悊")
+ @Operation(summary = "鍋滅敤浠ｇ悊", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "app", description = "搴旂敤鍚�", required = true)
@Parameter(name = "stream", description = "娴乮d", required = true)
public void stop(String app, String stream){
--
Gitblit v1.8.0