From c0b167404dbc4e98ccb8b84f94f48c96bcb3df02 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Fri, 12 Dec 2025 09:37:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-admin/src/main/java/com/ard/web/controller/vtdu/MediaMTXController.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/ard-admin/src/main/java/com/ard/web/controller/vtdu/MediaMTXController.java b/ard-admin/src/main/java/com/ard/web/controller/vtdu/MediaMTXController.java
index 290b433..e1a1efc 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/vtdu/MediaMTXController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/vtdu/MediaMTXController.java
@@ -5,12 +5,13 @@
import com.ard.common.core.page.TableDataInfo;
import com.ard.vtdu.domain.ArdVtdu;
import com.ard.vtdu.domain.Conf;
-import com.ard.vtdu.service.IMediaMTXService;
+import com.ard.vtdu.service.IArdMediaService;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
+
import javax.annotation.Resource;
import java.util.Arrays;
@@ -27,14 +28,14 @@
public class MediaMTXController extends BaseController {
@Resource
- private IMediaMTXService mediaService;
+ private IArdMediaService mediaService;
/**
* 增加通道
*/
@PostMapping()
@ApiOperation("增加通道")
- @ApiOperationSupport(includeParameters = {"ardVtdu.name", "ardVtdu.rtspSource", "ardVtdu.mode", "ardVtdu.isCode", "ardVtdu.isRecord"}, order = 1)
+ @ApiOperationSupport(includeParameters = {"ardVtdu.name", "ardVtdu.rtspSource"}, order = 1)
public AjaxResult addPath(@RequestBody ArdVtdu ardVtdu) {
if (StringUtils.isEmpty(ardVtdu.getName())) {
return AjaxResult.error("通道名称不能为空");
@@ -50,7 +51,7 @@
* 修改通道
*/
@ApiOperation("修改通道")
- @ApiOperationSupport(includeParameters = {"ardVtdu.name", "ardVtdu.rtspSource", "ardVtdu.mode", "ardVtdu.isCode", "ardVtdu.isRecord"}, order = 2)
+ @ApiOperationSupport(includeParameters = {"ardVtdu.name", "ardVtdu.rtspSource"}, order = 2)
@PutMapping
public AjaxResult edit(@RequestBody ArdVtdu ardVtdu) {
return AjaxResult.success(mediaService.editPath(ardVtdu));
@@ -128,7 +129,8 @@
@GetMapping("/pushList")
@ApiOperation("获取推流列表")
@ApiOperationSupport(order = 6)
- public TableDataInfo getPushStreamList(Integer pageNum, Integer pageSize) {
+ public TableDataInfo getPushStreamList(@RequestParam(value = "pageNum", required = false) Integer pageNum,
+ @RequestParam(value = "pageSize", required = false) Integer pageSize) {
TableDataInfo tableDataInfo = mediaService.getPushStreamList(pageNum, pageSize);
return tableDataInfo;
}
@@ -140,7 +142,8 @@
@GetMapping("/getPullWebrtcStreamList")
@ApiOperation("获取WebRtc拉流列表")
@ApiOperationSupport(order = 7)
- public TableDataInfo getPullWebrtcStreamList(Integer pageNum, Integer pageSize) {
+ public TableDataInfo getPullWebrtcStreamList(@RequestParam(value = "pageNum", required = false) Integer pageNum,
+ @RequestParam(value = "pageSize", required = false) Integer pageSize) {
return mediaService.getPullWebrtcStreamList(pageNum, pageSize);
}
@@ -151,7 +154,8 @@
@GetMapping("/getPullRtspStreamList")
@ApiOperation("获取rtsp拉流列表")
@ApiOperationSupport(order = 8)
- public TableDataInfo getPullRtspStreamList(Integer pageNum, Integer pageSize) {
+ public TableDataInfo getPullRtspStreamList(@RequestParam(value = "pageNum", required = false) Integer pageNum,
+ @RequestParam(value = "pageSize", required = false) Integer pageSize) {
return mediaService.getPullRtspStreamList(pageNum, pageSize);
}
@@ -162,7 +166,8 @@
@GetMapping("/getPullRtmpStreamList")
@ApiOperation("获取rtmp拉流列表")
@ApiOperationSupport(order = 9)
- public TableDataInfo getPullRtmpStreamList(Integer pageNum, Integer pageSize) {
+ public TableDataInfo getPullRtmpStreamList(@RequestParam(value = "pageNum", required = false) Integer pageNum,
+ @RequestParam(value = "pageSize", required = false) Integer pageSize) {
return mediaService.getPullRtmpStreamList(pageNum, pageSize);
}
--
Gitblit v1.9.3