From 2591997dfc8995a788b07dd41f42aac77c6fc4fb Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 12 八月 2022 10:00:18 +0800
Subject: [PATCH] 修复文档错误
---
src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java | 9 ++++-----
1 files changed, 4 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 6c11169..c978ae6 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
@@ -264,9 +264,8 @@
})
@GetMapping(value = "/getPlayUrl")
@ResponseBody
- public WVPResult<StreamInfo> getPlayUrl(HttpServletRequest request, @RequestParam String app,
- @RequestParam String stream,
- @RequestParam(required = false) String mediaServerId){
+ public WVPResult<StreamInfo> getPlayUrl(@RequestParam String app,@RequestParam String stream,
+ @RequestParam(required = false) String mediaServerId){
boolean authority = false;
// 鏄惁鐧婚檰鐢ㄦ埛, 鐧婚檰鐢ㄦ埛杩斿洖瀹屾暣淇℃伅
LoginUser userInfo = SecurityUtils.getUserInfo();
@@ -275,7 +274,7 @@
}
WVPResult<StreamInfo> result = new WVPResult<>();
StreamPushItem push = streamPushService.getPush(app, stream);
- if (!userSetting.getServerId().equals(push.getServerId()) ) {
+ if (push != null && !push.isSelf()) {
result.setCode(-1);
result.setMsg("鏉ヨ嚜鍏朵粬骞冲彴鐨勬帹娴佷俊鎭�");
return result;
@@ -283,7 +282,7 @@
StreamInfo streamInfo = mediaService.getStreamInfoByAppAndStreamWithCheck(app, stream, mediaServerId, authority);
if (streamInfo != null){
result.setCode(0);
- result.setMsg("scccess");
+ result.setMsg("success");
result.setData(streamInfo);
}else {
result.setCode(-1);
--
Gitblit v1.8.0