From 0a12bfc2e9594345a0a6cf136bcf234c62450d9d Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期六, 14 十月 2023 16:31:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/media/controller/MediaController.java | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 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 a4e65f3..e24e4e6 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
@@ -7,6 +7,7 @@
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.media.domain.Config;
import com.ruoyi.media.domain.StreamInfo;
import com.ruoyi.media.domain.Vtdu;
import com.ruoyi.media.service.IMediaService;
@@ -22,7 +23,7 @@
import java.util.stream.Collectors;
/**
- * @Description:
+ * @Description: 娴佸獟浣撲笟鍔�
* @ClassName: controller
* @Author: 鍒樿嫃涔�
* @Date: 2023骞�07鏈�13鏃�9:26
@@ -56,9 +57,9 @@
map.get("rtspUrl");
Vtdu vtdu = new Vtdu();
vtdu.setName(streamInfo.getName());
- vtdu.setSourceUrl(streamInfo.getRtspSource());
+ vtdu.setRtspSource(streamInfo.getRtspSource());
vtdu.setIsCode(streamInfo.getIsCode());
- vtdu.setCodeType(streamInfo.getMode());
+ vtdu.setMode(streamInfo.getMode());
vtdu.setRtspUrl(map.get("rtspUrl"));
vtdu.setRtmpUrl(map.get("rtmpUrl"));
vtdu.setWebrtcUrl(map.get("webrtcUrl"));
@@ -75,17 +76,16 @@
@PreAuthorize("@ss.hasPermi('media:stream:edit')")
@PutMapping
public AjaxResult edit(@RequestBody StreamInfo streamInfo) {
- mediaService.removePath(new String[]{streamInfo.getName()});
- vtduService.deleteVtduByName(streamInfo.getName());
- Map<String, String> map = mediaService.addPath(streamInfo.getName(), streamInfo.getRtspSource(), streamInfo.getMode(), streamInfo.getIsCode());
+ Map<String, String> map = mediaService.editPath(streamInfo.getName(), streamInfo.getRtspSource(), streamInfo.getMode(), streamInfo.getIsCode());
Vtdu vtdu = new Vtdu();
vtdu.setName(streamInfo.getName());
- vtdu.setSourceUrl(streamInfo.getRtspSource());
+ vtdu.setRtspSource(streamInfo.getRtspSource());
vtdu.setIsCode(streamInfo.getIsCode());
- vtdu.setCodeType(streamInfo.getMode());
+ vtdu.setMode(streamInfo.getMode());
vtdu.setRtspUrl(map.get("rtspUrl"));
vtdu.setRtmpUrl(map.get("rtmpUrl"));
vtdu.setWebrtcUrl(map.get("webrtcUrl"));
+ vtduService.updateVtdu(vtdu);
return AjaxResult.success(map);
}
@@ -179,8 +179,6 @@
return getDataTable(mediaService.getPushStreamList());
}
-
-
/**
* 鑾峰彇鎷夋祦鍒楄〃
*/
@@ -192,4 +190,14 @@
startPage();
return getDataTable(mediaService.getPullStreamList());
}
+
+ /**
+ * 閰嶇疆娴佸獟浣撳弬鏁�
+ */
+ @PostMapping("/setConfig")
+ @ApiOperation("閰嶇疆娴佸獟浣撳弬鏁�")
+ @ApiOperationSupport(order = 8)
+ public AjaxResult setConfig(@RequestBody Config config) {
+ return AjaxResult.success(mediaService.setConfig(config));
+ }
}
--
Gitblit v1.9.3