From 76817b8c752b12030ab285bcb5b2effebfa9a248 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期六, 26 八月 2023 17:29:14 +0800
Subject: [PATCH] 流媒体增加webrtc和rtmp协议推拉流
---
ard-work/src/main/java/com/ruoyi/media/controller/MediaController.java | 87 +++++++++++++++++++++++++++++--------------
1 files changed, 59 insertions(+), 28 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/media/controller/MediaController.java b/ard-work/src/main/java/com/ruoyi/media/controller/MediaController.java
index 088a8b5..ca50877 100644
--- a/ard-work/src/main/java/com/ruoyi/media/controller/MediaController.java
+++ b/ard-work/src/main/java/com/ruoyi/media/controller/MediaController.java
@@ -1,9 +1,14 @@
package com.ruoyi.media.controller;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.ruoyi.common.annotation.Anonymous;
+import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.device.camera.domain.ArdCameras;
import com.ruoyi.media.domain.StreamInfo;
import com.ruoyi.media.service.IMediaService;
import io.swagger.annotations.Api;
@@ -12,6 +17,9 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
/**
* @Description:
@@ -23,27 +31,56 @@
@RestController
@Api(tags = "娴佸獟浣撴帴鍙�")
@RequestMapping("/media/stream")
+@Anonymous
public class MediaController extends BaseController {
@Resource
private IMediaService mediaService;
- @PostMapping("/add")
+ @PostMapping()
@ApiOperation("澧炲姞杞爜")
- @ApiOperationSupport(includeParameters = {"streamInfo.name","streamInfo.rtspSource"})
+ @PreAuthorize("@ss.hasPermi('media:stream:add')")
+ @ApiOperationSupport(includeParameters = {"streamInfo.name", "streamInfo.rtspSource", "streamInfo.mode"})
public AjaxResult addPath(@RequestBody StreamInfo streamInfo) {
- String rtsp = mediaService.addPath(streamInfo.getName(), streamInfo.getRtspSource());
+ if (StringUtils.isEmpty(streamInfo.getName())) {
+ return AjaxResult.error("閫氶亾鍚嶇О涓嶈兘涓虹┖");
+ }
+ if (StringUtils.isEmpty(streamInfo.getRtspSource())) {
+ return AjaxResult.error("rtsp鍦板潃涓嶈兘涓虹┖");
+ }
+ String rtsp = mediaService.addPath(streamInfo.getName(), streamInfo.getRtspSource(), streamInfo.getMode(), streamInfo.getIsCode());
return AjaxResult.success(rtsp);
}
- @PostMapping("/remove")
+ /**
+ * 鑾峰彇杞爜璇︾粏淇℃伅
+ */
+ @ApiOperation("鑾峰彇杞爜璇︾粏淇℃伅")
+ @GetMapping(value = "/{name}")
+ public AjaxResult getInfo(@PathVariable("name") String name) {
+ return success(mediaService.getPathInfo(name));
+ }
+
+ /**
+ * 淇敼杞爜
+ */
+ @ApiOperation("淇敼杞爜")
+ @PreAuthorize("@ss.hasPermi('media:stream:edit')")
+ @PutMapping
+ public AjaxResult edit(@RequestBody StreamInfo streamInfo) {
+ mediaService.removePath(new String[]{streamInfo.getName()});
+ String rtsp = mediaService.addPath(streamInfo.getName(), streamInfo.getRtspSource(), streamInfo.getMode(), streamInfo.getIsCode());
+ return AjaxResult.success(rtsp);
+ }
+
+ @DeleteMapping("/path/{names}")
+ @PreAuthorize("@ss.hasPermi('media:stream:remove')")
@ApiOperation("绉婚櫎杞爜")
- @ApiOperationSupport(includeParameters = {"streamInfo.name"})
- public AjaxResult removePath(@RequestBody StreamInfo streamInfo) {
- mediaService.removePath(streamInfo.getName());
+ public AjaxResult removePath(@PathVariable String[] names) {
+ mediaService.removePath(names);
return AjaxResult.success();
}
- @GetMapping("/getPaths")
+ @GetMapping("/path/list")
@ApiOperation("鑾峰彇褰撳墠杞爜鍒楄〃")
public TableDataInfo getPaths() {
startPage();
@@ -87,32 +124,26 @@
startPage();
return getDataTable(mediaService.getPushStreamList());
}
- /**
- * 鏂板娴佸獟浣撴帹娴�
- */
- @PreAuthorize("@ss.hasPermi('media:stream:add')")
- @PostMapping
- @ApiOperationSupport(includeParameters = {"streamInfo.name"})
- public AjaxResult add(@RequestBody StreamInfo streamInfo) throws InterruptedException {
- String rtsp = mediaService.addPath(streamInfo.getName(), streamInfo.getRtspSource());
- return AjaxResult.success(rtsp);
- }
- /**
- * 鍒犻櫎娴佸獟浣撴帹娴�
- */
- @PreAuthorize("@ss.hasPermi('media:stream:remove')")
- @DeleteMapping("/path/{name}")
- public AjaxResult remove(@PathVariable String name) {
- mediaService.removePath(name);
- return AjaxResult.success();
- }
+
/**
* 鍒犻櫎娴佸獟浣撴媺娴�
*/
@PreAuthorize("@ss.hasPermi('media:stream:remove')")
@DeleteMapping("/{id}")
public AjaxResult removePullStreamSession(@PathVariable String id) {
- return AjaxResult.success(mediaService.kickRtspSession(id));
+ List<StreamInfo> pullStreamList = mediaService.getPullStreamList();
+ StreamInfo streamInfo = pullStreamList.stream()
+ .filter(object -> object.getId().equals(id))
+ .collect(Collectors.toList()).get(0);
+ switch (streamInfo.getSessionType()) {
+ case "rtsp":
+ return AjaxResult.success(mediaService.kickRtspSession(id));
+ case "webrtc":
+ return AjaxResult.success(mediaService.kickWebrtcSession(id));
+ case "rtmp":
+ return AjaxResult.success(mediaService.kickRtmpSession(id));
+ }
+ return AjaxResult.error();
}
@PreAuthorize("@ss.hasPermi('media:stream:list')")
--
Gitblit v1.9.3