From c77c1a956c0c39575eb6d9a86cb8c137bb8126c8 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 25 七月 2022 11:17:46 +0800
Subject: [PATCH] 修复推流推流状态提示
---
src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 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 1f0884f..6c11169 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java
@@ -4,6 +4,7 @@
import com.alibaba.excel.ExcelReader;
import com.alibaba.excel.read.metadata.ReadSheet;
import com.genersoft.iot.vmp.common.StreamInfo;
+import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.conf.security.SecurityUtils;
import com.genersoft.iot.vmp.conf.security.dto.LoginUser;
import com.genersoft.iot.vmp.gb28181.bean.GbStream;
@@ -62,6 +63,9 @@
@Autowired
private IMediaService mediaService;
+
+ @Autowired
+ private UserSetting userSetting;
@ApiOperation("鎺ㄦ祦鍒楄〃鏌ヨ")
@ApiImplicitParams({
@@ -269,18 +273,23 @@
if (userInfo!= null) {
authority = true;
}
-
- StreamInfo streamInfo = mediaService.getStreamInfoByAppAndStreamWithCheck(app, stream, mediaServerId, authority);
-
WVPResult<StreamInfo> result = new WVPResult<>();
+ StreamPushItem push = streamPushService.getPush(app, stream);
+ if (!userSetting.getServerId().equals(push.getServerId()) ) {
+ result.setCode(-1);
+ result.setMsg("鏉ヨ嚜鍏朵粬骞冲彴鐨勬帹娴佷俊鎭�");
+ return result;
+ }
+ StreamInfo streamInfo = mediaService.getStreamInfoByAppAndStreamWithCheck(app, stream, mediaServerId, authority);
if (streamInfo != null){
result.setCode(0);
result.setMsg("scccess");
result.setData(streamInfo);
}else {
result.setCode(-1);
- result.setMsg("fail");
+ result.setMsg("鑾峰彇鎾斁鍦板潃澶辫触");
}
+
return result;
}
--
Gitblit v1.8.0