From c88681c7ad06391fa8cce0b910f45cf4f479889d Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 07 八月 2024 10:41:54 +0800
Subject: [PATCH] 合并分支
---
src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 8202bf5..3717e69 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
@@ -13,7 +13,7 @@
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.StreamPushItem;
-import com.genersoft.iot.vmp.service.IMediaServerService;
+import com.genersoft.iot.vmp.media.service.IMediaServerService;
import com.genersoft.iot.vmp.service.IMediaService;
import com.genersoft.iot.vmp.service.IStreamPushService;
import com.genersoft.iot.vmp.service.impl.StreamPushUploadFileHandler;
@@ -113,8 +113,8 @@
@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 streamId){
- if (!streamPushService.stop(app, streamId)){
+ public void stop(String app, String stream){
+ if (!streamPushService.stop(app, stream)){
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