From 2e98b20bea4463e4465e3c19059d0744a09aec06 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 27 Jun 2023 14:34:41 +0800
Subject: [PATCH] gb28181版本升级-补充
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/gbStream/GbStreamController.java | 52 ++++++++++++++++++++--------------------------------
1 files changed, 20 insertions(+), 32 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 46be681..3ba032a 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
@@ -1,21 +1,21 @@
package com.genersoft.iot.vmp.vmanager.gb28181.gbStream;
import com.genersoft.iot.vmp.gb28181.bean.GbStream;
-import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import com.genersoft.iot.vmp.vmanager.gb28181.gbStream.bean.GbStreamParam;
import com.genersoft.iot.vmp.service.IGbStreamService;
import com.github.pagehelper.PageInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
-@Api(tags = "视频流关联到级联平台")
+@Tag(name = "视频流关联到级联平台")
@CrossOrigin
@RestController
@RequestMapping("/api/gbStream")
@@ -27,7 +27,7 @@
private IGbStreamService gbStreamService;
@Autowired
- private IVideoManagerStorager storager;
+ private IVideoManagerStorage storager;
/**
@@ -37,17 +37,13 @@
* @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 = "流媒体ID", required = false , dataTypeClass = String.class),
-
- })
+ @Operation(summary = "查询国标通道")
+ @Parameter(name = "page", description = "当前页", required = true)
+ @Parameter(name = "count", description = "每页条数", required = true)
+ @Parameter(name = "platformId", description = "平台ID", required = true)
+ @Parameter(name = "catalogId", description = "目录ID")
+ @Parameter(name = "query", description = "查询内容")
+ @Parameter(name = "mediaServerId", description = "流媒体ID")
@GetMapping(value = "/list")
@ResponseBody
public PageInfo<GbStream> list(@RequestParam(required = true)Integer page,
@@ -55,21 +51,20 @@
@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)) {
+ if (ObjectUtils.isEmpty(catalogId)) {
catalogId = null;
}
- if (StringUtils.isEmpty(query)) {
+ if (ObjectUtils.isEmpty(query)) {
query = null;
}
- if (StringUtils.isEmpty(mediaServerId)) {
+ if (ObjectUtils.isEmpty(mediaServerId)) {
mediaServerId = null;
}
// catalogId 为null 查询未在平台下分配的数据
// catalogId 不为null 查询平台下这个，目录下的通道
- return gbStreamService.getAll(page, count, platformId, catalogId, query, pushing, mediaServerId);
+ return gbStreamService.getAll(page, count, platformId, catalogId, query, mediaServerId);
}
@@ -78,11 +73,7 @@
* @param gbStreamParam
* @return
*/
- @ApiOperation("移除国标关联")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "gbStreamParam", value = "GbStreamParam", required = true,
- dataTypeClass = GbStreamParam.class),
- })
+ @Operation(summary = "移除国标关联")
@DeleteMapping(value = "/del")
@ResponseBody
public Object del(@RequestBody GbStreamParam gbStreamParam){
@@ -99,10 +90,7 @@
* @param gbStreamParam
* @return
*/
- @ApiOperation("保存国标关联")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "gbStreamParam", value = "GbStreamParam", required = true, dataTypeClass = GbStreamParam.class),
- })
+ @Operation(summary = "保存国标关联")
@PostMapping(value = "/add")
@ResponseBody
public Object add(@RequestBody GbStreamParam gbStreamParam){
--
Gitblit v1.9.3