From b1d9ea8082cbd8871ef9b3d2f505a5ab85bac6f3 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 17 六月 2024 10:06:51 +0800
Subject: [PATCH] Merge pull request #1492 from iwanlebron/master
---
src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java
index 459f3cc..010b2f2 100755
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java
@@ -112,7 +112,7 @@
@ResponseBody
@Operation(summary = "涓涓�涓帹娴�", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "app", description = "搴旂敤鍚�", required = true)
- @Parameter(name = "stream", description = "娴乮d", required = true)
+ @Parameter(name = "streamId", description = "娴乮d", required = true)
public void stop(String app, String streamId){
if (!streamPushService.stop(app, streamId)){
throw new ControllerException(ErrorCode.ERROR100);
@@ -249,7 +249,7 @@
if (push != null && !push.isSelf()) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "鏉ヨ嚜鍏朵粬骞冲彴鐨勬帹娴佷俊鎭�");
}
- StreamInfo streamInfo = mediaService.getStreamInfoByAppAndStreamWithCheck(app, stream, mediaServerId, authority);
+ StreamInfo streamInfo = mediaServerService.getStreamInfoByAppAndStreamWithCheck(app, stream, mediaServerId, authority);
if (streamInfo == null){
throw new ControllerException(ErrorCode.ERROR100.getCode(), "鑾峰彇鎾斁鍦板潃澶辫触");
}
@@ -274,7 +274,7 @@
stream.setStatus(false);
stream.setPushIng(false);
stream.setAliveSecond(0L);
- stream.setTotalReaderCount("0");
+ stream.setTotalReaderCount(0);
if (!streamPushService.add(stream)) {
throw new ControllerException(ErrorCode.ERROR100);
}
--
Gitblit v1.8.0