From 221f99c764b51c3cd284c6e5a41492c26c5c7ffc Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期五, 09 九月 2022 17:06:19 +0800 Subject: [PATCH] 优化sip消息 --- 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 = "鏄惁姝e湪鎺ㄦ祦", required = false , dataTypeClass = Boolean.class), - @ApiImplicitParam(name="mediaServerId", value = "娴佸獟浣揑D", 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 = "娴佸獟浣揑D") @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 涓簄ull 鏌ヨ鏈湪骞冲彴涓嬪垎閰嶇殑鏁版嵁 // 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.8.0