From de6baa157edf398262ca7babbf68e325d3021041 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 24 五月 2024 08:51:09 +0800
Subject: [PATCH] 合并271分支
---
src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java | 4 ++--
1 files changed, 2 insertions(+), 2 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..2ea4b87 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
@@ -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