From 1fe9f918a907193e84e16de1c4c2d51c2f25c5ec Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: 星期四, 11 七月 2024 22:45:52 +0800
Subject: [PATCH] 测试页兼容流媒体1.8.4
---
ard-work/src/main/java/com/ruoyi/media/controller/MediaController.java | 27 ++++++++++-----------------
1 files changed, 10 insertions(+), 17 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 6b39d98..6d89b58 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
@@ -4,10 +4,12 @@
import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.BaseEntity;
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.Paths;
import com.ruoyi.media.domain.StreamInfo;
import com.ruoyi.media.domain.Vtdu;
import com.ruoyi.media.service.IMediaService;
@@ -112,7 +114,7 @@
@PreAuthorize("@ss.hasPermi('media:stream:remove')")
@DeleteMapping("/{sessionId}")
public AjaxResult removePullStreamSession(@PathVariable String sessionId) {
- List<StreamInfo> pullStreamList = mediaService.getPullStreamList();
+ List<StreamInfo> pullStreamList = mediaService.getPullStreamList(1,1000);
StreamInfo streamInfo = pullStreamList.stream()
.filter(object -> object.getId().equals(sessionId))
.collect(Collectors.toList()).get(0);
@@ -143,9 +145,9 @@
@GetMapping("/path/list")
@ApiOperation("鑾峰彇褰撳墠閫氶亾鍒楄〃")
@ApiOperationSupport(order = 5)
- public TableDataInfo getPaths() {
+ public TableDataInfo getPaths(Integer pageNum,Integer pageSize) {
startPage();
- return getDataTable(mediaService.paths());
+ return getDataTable(mediaService.paths(pageNum,pageSize));
}
/**
@@ -154,7 +156,7 @@
@GetMapping("/getRtspSessionById")
@ApiOperation("鎸塈D鏌ヨ鎷夋祦璇︽儏")
public AjaxResult getRtspSessionById(String sessionId) {
- List<StreamInfo> pullStreamList = mediaService.getPullStreamList();
+ List<StreamInfo> pullStreamList = mediaService.getPullStreamList(1,1000);
StreamInfo streamInfo = pullStreamList.stream()
.filter(object -> object.getId().equals(sessionId))
.collect(Collectors.toList()).get(0);
@@ -176,9 +178,9 @@
@GetMapping("/pushList")
@ApiOperation("鑾峰彇鎺ㄦ祦鍒楄〃")
@ApiOperationSupport(order = 6)
- public TableDataInfo getPushStreamList() {
+ public TableDataInfo getPushStreamList(Integer pageNum,Integer pageSize) {
startPage();
- return getDataTable(mediaService.getPushStreamList());
+ return getDataTable(mediaService.getPushStreamList(pageNum,pageSize));
}
/**
@@ -188,18 +190,9 @@
@GetMapping("/pullList")
@ApiOperation("鑾峰彇鎷夋祦鍒楄〃")
@ApiOperationSupport(order = 7)
- public TableDataInfo getPullStreamList() {
+ public TableDataInfo getPullStreamList(Integer pageNum,Integer pageSize) {
startPage();
- return getDataTable(mediaService.getPullStreamList());
+ return getDataTable(mediaService.getPullStreamList(pageNum,pageSize));
}
- /**
- * 閰嶇疆娴佸獟浣撳弬鏁�
- */
- @PostMapping("/setConfig")
- @ApiOperation("閰嶇疆娴佸獟浣撳弬鏁�")
- @ApiOperationSupport(order = 8)
- public AjaxResult setConfig(@RequestBody Config config) {
- return AjaxResult.success(mediaService.setConfig(config));
- }
}
--
Gitblit v1.9.3