From 3b5a37c270e5b6649b9a168ee753c2b3353a257a Mon Sep 17 00:00:00 2001
From: zouyaoji <370681295@qq.com>
Date: 星期六, 06 八月 2022 11:27:02 +0800
Subject: [PATCH] 前端显示媒体服务器配置时报错修复
---
src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 46 insertions(+), 8 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 300f952..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
@@ -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({
@@ -260,29 +264,63 @@
})
@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();
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 (push != null && !push.isSelf()) {
+ 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.setMsg("success");
result.setData(streamInfo);
}else {
result.setCode(-1);
- result.setMsg("fail");
+ result.setMsg("鑾峰彇鎾斁鍦板潃澶辫触");
}
+
return result;
}
+ /**
+ * 鑾峰彇鎺ㄦ祦鎾斁鍦板潃
+ * @param stream 鎺ㄦ祦淇℃伅
+ * @return
+ */
+ @ApiOperation("鑾峰彇鎺ㄦ祦鎾斁鍦板潃")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "stream", value = "鎺ㄦ祦淇℃伅", dataTypeClass = StreamPushItem.class),
+ })
+ @PostMapping(value = "/add")
+ @ResponseBody
+ public WVPResult<StreamInfo> add(@RequestBody StreamPushItem stream){
+ if (StringUtils.isEmpty(stream.getGbId())) {
+ return new WVPResult<>(400, "鍥芥爣ID涓嶅彲涓虹┖", null);
+ }
+ if (StringUtils.isEmpty(stream.getApp()) && StringUtils.isEmpty(stream.getStream())) {
+ return new WVPResult<>(400, "app鎴杝tream涓嶅彲涓虹┖", null);
+ }
+ stream.setStatus(false);
+ stream.setPushIng(false);
+ stream.setAliveSecond(0L);
+ stream.setTotalReaderCount("0");
+ boolean result = streamPushService.add(stream);
+
+ if (result) {
+ return new WVPResult<>(0, "success", null);
+ }else {
+ return new WVPResult<>(-1, "fail", null);
+ }
+ }
}
--
Gitblit v1.8.0