From 0dfce85d2f981c1793472468ace0773af9f30e01 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 15 三月 2022 15:40:15 +0800
Subject: [PATCH] 必须提前在zlm上配置port_range属性，不然自动配置此属性可能不成功
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/gbStream/GbStreamController.java | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/gbStream/GbStreamController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/gbStream/GbStreamController.java
index fcfc847..46be681 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/gbStream/GbStreamController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/gbStream/GbStreamController.java
@@ -12,6 +12,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
@Api(tags = "瑙嗛娴佸叧鑱斿埌绾ц仈骞冲彴")
@@ -33,19 +34,42 @@
* 鏌ヨ鍥芥爣閫氶亾
* @param page 褰撳墠椤�
* @param count 姣忛〉鏉℃暟
+ * @param platformId 骞冲彴ID
* @return
*/
@ApiOperation("鏌ヨ鍥芥爣閫氶亾")
@ApiImplicitParams({
@ApiImplicitParam(name = "page", value = "褰撳墠椤�", required = true , dataTypeClass = Integer.class),
@ApiImplicitParam(name = "count", value = "姣忛〉鏉℃暟", required = true , dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "platformId", value = "骞冲彴ID", required = true , dataTypeClass = String.class),
+ @ApiImplicitParam(name = "catalogId", value = "鐩綍ID", required = false , dataTypeClass = String.class),
+ @ApiImplicitParam(name="query", value = "鏌ヨ鍐呭", required = false , dataTypeClass = String.class),
+ @ApiImplicitParam(name="pushing", value = "鏄惁姝ｅ湪鎺ㄦ祦", required = false , dataTypeClass = Boolean.class),
+ @ApiImplicitParam(name="mediaServerId", value = "娴佸獟浣揑D", required = false , dataTypeClass = String.class),
+
})
@GetMapping(value = "/list")
@ResponseBody
- public PageInfo<GbStream> list(@RequestParam(required = false)Integer page,
- @RequestParam(required = false)Integer count){
+ public PageInfo<GbStream> list(@RequestParam(required = true)Integer page,
+ @RequestParam(required = true)Integer count,
+ @RequestParam(required = true)String platformId,
+ @RequestParam(required = false)String catalogId,
+ @RequestParam(required = false)String query,
+ @RequestParam(required = false)Boolean pushing,
+ @RequestParam(required = false)String mediaServerId){
+ if (StringUtils.isEmpty(catalogId)) {
+ catalogId = null;
+ }
+ if (StringUtils.isEmpty(query)) {
+ query = null;
+ }
+ if (StringUtils.isEmpty(mediaServerId)) {
+ mediaServerId = null;
+ }
- return gbStreamService.getAll(page, count);
+ // catalogId 涓簄ull 鏌ヨ鏈湪骞冲彴涓嬪垎閰嶇殑鏁版嵁
+ // catalogId 涓嶄负null 鏌ヨ骞冲彴涓嬭繖涓紝鐩綍涓嬬殑閫氶亾
+ return gbStreamService.getAll(page, count, platformId, catalogId, query, pushing, mediaServerId);
}
@@ -62,7 +86,7 @@
@DeleteMapping(value = "/del")
@ResponseBody
public Object del(@RequestBody GbStreamParam gbStreamParam){
- if (gbStreamService.delPlatformInfo(gbStreamParam.getGbStreams())) {
+ if (gbStreamService.delPlatformInfo(gbStreamParam.getPlatformId(), gbStreamParam.getGbStreams())) {
return "success";
}else {
return "fail";
@@ -82,7 +106,7 @@
@PostMapping(value = "/add")
@ResponseBody
public Object add(@RequestBody GbStreamParam gbStreamParam){
- if (gbStreamService.addPlatformInfo(gbStreamParam.getGbStreams(), gbStreamParam.getPlatformId())) {
+ if (gbStreamService.addPlatformInfo(gbStreamParam.getGbStreams(), gbStreamParam.getPlatformId(), gbStreamParam.getCatalogId())) {
return "success";
}else {
return "fail";
--
Gitblit v1.8.0