From 1a9e49d9ff210e39f6297150db758906a4f02e6f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 19 八月 2022 17:11:51 +0800
Subject: [PATCH] 依赖包版本升级
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java | 122 +++++++++++++---------------------------
1 files changed, 39 insertions(+), 83 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java
index 7a22693..8b5229c 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java
@@ -18,10 +18,9 @@
import com.genersoft.iot.vmp.vmanager.gb28181.platform.bean.ChannelReduce;
import com.genersoft.iot.vmp.vmanager.gb28181.platform.bean.UpdateChannelParam;
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;
@@ -36,7 +35,7 @@
/**
* 绾ц仈骞冲彴绠＄悊
*/
-@Api(tags = "绾ц仈骞冲彴绠＄悊")
+@Tag(name = "绾ц仈骞冲彴绠＄悊")
@CrossOrigin
@RestController
@RequestMapping("/api/platform")
@@ -73,7 +72,7 @@
*
* @return
*/
- @ApiOperation("鑾峰彇鍥芥爣鏈嶅姟鐨勯厤缃�")
+ @Operation(summary = "鑾峰彇鍥芥爣鏈嶅姟鐨勯厤缃�")
@GetMapping("/server_config")
public ResponseEntity<JSONObject> serverConfig() {
JSONObject result = new JSONObject();
@@ -89,7 +88,8 @@
*
* @return
*/
- @ApiOperation("鑾峰彇鍥芥爣鏈嶅姟鐨勯厤缃�")
+ @Operation(summary = "鑾峰彇绾ц仈鏈嶅姟鍣ㄤ俊鎭�")
+ @Parameter(name = "id", description = "骞冲彴鍥芥爣缂栧彿", required = true)
@GetMapping("/info/{id}")
public ResponseEntity<WVPResult<ParentPlatform>> getPlatform(@PathVariable String id) {
ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(id);
@@ -112,12 +112,10 @@
* @param count 姣忛〉鏉℃暟
* @return
*/
- @ApiOperation("鍒嗛〉鏌ヨ绾ц仈骞冲彴")
@GetMapping("/query/{count}/{page}")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "page", value = "褰撳墠椤�", dataTypeClass = Integer.class),
- @ApiImplicitParam(name = "count", value = "姣忛〉鏉℃暟", dataTypeClass = Integer.class),
- })
+ @Operation(summary = "鍒嗛〉鏌ヨ绾ц仈骞冲彴")
+ @Parameter(name = "page", description = "褰撳墠椤�", required = true)
+ @Parameter(name = "count", description = "姣忛〉鏉℃暟", required = true)
public PageInfo<ParentPlatform> platforms(@PathVariable int page, @PathVariable int count) {
PageInfo<ParentPlatform> parentPlatformPageInfo = storager.queryParentPlatformList(page, count);
@@ -136,10 +134,7 @@
* @param parentPlatform
* @return
*/
- @ApiOperation("娣诲姞涓婄骇骞冲彴淇℃伅")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "parentPlatform", value = "涓婄骇骞冲彴淇℃伅", dataTypeClass = ParentPlatform.class),
- })
+ @Operation(summary = "娣诲姞涓婄骇骞冲彴淇℃伅")
@PostMapping("/add")
@ResponseBody
public ResponseEntity<WVPResult<String>> addPlatform(@RequestBody ParentPlatform parentPlatform) {
@@ -211,10 +206,7 @@
* @param parentPlatform
* @return
*/
- @ApiOperation("淇濆瓨涓婄骇骞冲彴淇℃伅")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "parentPlatform", value = "涓婄骇骞冲彴淇℃伅", dataTypeClass = ParentPlatform.class),
- })
+ @Operation(summary = "淇濆瓨涓婄骇骞冲彴淇℃伅")
@PostMapping("/save")
@ResponseBody
public ResponseEntity<WVPResult<String>> savePlatform(@RequestBody ParentPlatform parentPlatform) {
@@ -286,10 +278,8 @@
* @param serverGBId 涓婄骇骞冲彴鍥芥爣ID
* @return
*/
- @ApiOperation("鍒犻櫎涓婄骇骞冲彴")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "serverGBId", value = "涓婄骇骞冲彴鍥芥爣ID", dataTypeClass = String.class),
- })
+ @Operation(summary = "鍒犻櫎涓婄骇骞冲彴")
+ @Parameter(name = "serverGBId", description = "涓婄骇骞冲彴鐨勫浗鏍囩紪鍙�")
@DeleteMapping("/delete/{serverGBId}")
@ResponseBody
public ResponseEntity<String> deletePlatform(@PathVariable String serverGBId) {
@@ -339,17 +329,12 @@
* @param serverGBId 涓婄骇骞冲彴鍥芥爣ID
* @return
*/
- @ApiOperation("鏌ヨ涓婄骇骞冲彴鏄惁瀛樺湪")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "serverGBId", value = "涓婄骇骞冲彴鍥芥爣ID", dataTypeClass = String.class),
- })
+ @Operation(summary = "鏌ヨ涓婄骇骞冲彴鏄惁瀛樺湪")
+ @Parameter(name = "serverGBId", description = "涓婄骇骞冲彴鐨勫浗鏍囩紪鍙�")
@GetMapping("/exit/{serverGBId}")
@ResponseBody
public ResponseEntity<String> exitPlatform(@PathVariable String serverGBId) {
-// if (logger.isDebugEnabled()) {
-// logger.debug("鏌ヨ涓婄骇骞冲彴鏄惁瀛樺湪API璋冪敤锛�" + serverGBId);
-// }
ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(serverGBId);
return new ResponseEntity<>(String.valueOf(parentPlatform != null), HttpStatus.OK);
}
@@ -365,16 +350,14 @@
* @param channelType 閫氶亾绫诲瀷
* @return
*/
- @ApiOperation("鍒嗛〉鏌ヨ绾ц仈骞冲彴鐨勬墍鏈夋墍鏈夐�氶亾")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "page", value = "褰撳墠椤�", dataTypeClass = Integer.class),
- @ApiImplicitParam(name = "count", value = "姣忛〉鏉℃暟", dataTypeClass = Integer.class),
- @ApiImplicitParam(name = "platformId", value = "涓婄骇骞冲彴ID", dataTypeClass = String.class),
- @ApiImplicitParam(name = "catalogId", value = "鐩綍ID", dataTypeClass = String.class),
- @ApiImplicitParam(name = "query", value = "鏌ヨ鍐呭", dataTypeClass = String.class),
- @ApiImplicitParam(name = "online", value = "鏄惁鍦ㄧ嚎", dataTypeClass = Boolean.class),
- @ApiImplicitParam(name = "channelType", value = "閫氶亾绫诲瀷", dataTypeClass = Boolean.class),
- })
+ @Operation(summary = "鏌ヨ涓婄骇骞冲彴鏄惁瀛樺湪")
+ @Parameter(name = "page", description = "褰撳墠椤�", required = true)
+ @Parameter(name = "count", description = "姣忛〉鏉℃暟", required = true)
+ @Parameter(name = "platformId", description = "涓婄骇骞冲彴鐨勫浗鏍囩紪鍙�")
+ @Parameter(name = "catalogId", description = "鐩綍ID")
+ @Parameter(name = "query", description = "鏌ヨ鍐呭")
+ @Parameter(name = "online", description = "鏄惁鍦ㄧ嚎")
+ @Parameter(name = "channelType", description = "閫氶亾绫诲瀷")
@GetMapping("/channel_list")
@ResponseBody
public PageInfo<ChannelReduce> channelList(int page, int count,
@@ -384,9 +367,6 @@
@RequestParam(required = false) Boolean online,
@RequestParam(required = false) Boolean channelType) {
-// if (logger.isDebugEnabled()) {
-// logger.debug("鏌ヨ鎵�鏈夋墍鏈夐�氶亾API璋冪敤");
-// }
if (StringUtils.isEmpty(platformId)) {
platformId = null;
}
@@ -407,10 +387,7 @@
* @param param 閫氶亾鍏宠仈鍙傛暟
* @return
*/
- @ApiOperation("鍚戜笂绾у钩鍙版坊鍔犲浗鏍囬�氶亾")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "param", value = "閫氶亾鍏宠仈鍙傛暟", dataTypeClass = UpdateChannelParam.class),
- })
+ @Operation(summary = "鍚戜笂绾у钩鍙版坊鍔犲浗鏍囬�氶亾")
@PostMapping("/update_channel_for_gb")
@ResponseBody
public ResponseEntity<String> updateChannelForGB(@RequestBody UpdateChannelParam param) {
@@ -429,10 +406,7 @@
* @param param 閫氶亾鍏宠仈鍙傛暟
* @return
*/
- @ApiOperation("浠庝笂绾у钩鍙扮Щ闄ゅ浗鏍囬�氶亾")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "param", value = "閫氶亾鍏宠仈鍙傛暟", dataTypeClass = UpdateChannelParam.class),
- })
+ @Operation(summary = "浠庝笂绾у钩鍙扮Щ闄ゅ浗鏍囬�氶亾")
@DeleteMapping("/del_channel_for_gb")
@ResponseBody
public ResponseEntity<String> delChannelForGB(@RequestBody UpdateChannelParam param) {
@@ -452,11 +426,9 @@
* @param parentId 鐩綍鐖禝D
* @return
*/
- @ApiOperation("鑾峰彇鐩綍")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "platformId", value = "骞冲彴ID", dataTypeClass = String.class, required = true),
- @ApiImplicitParam(name = "parentId", value = "鐩綍鐖禝D", dataTypeClass = String.class, required = true),
- })
+ @Operation(summary = "鑾峰彇鐩綍")
+ @Parameter(name = "platformId", description = "涓婄骇骞冲彴鐨勫浗鏍囩紪鍙�", required = true)
+ @Parameter(name = "parentId", description = "鐖剁骇鐩綍鐨勫浗鏍囩紪鍙�", required = true)
@GetMapping("/catalog")
@ResponseBody
public ResponseEntity<WVPResult<List<PlatformCatalog>>> getCatalogByPlatform(String platformId, String parentId) {
@@ -472,11 +444,6 @@
parentId = platform.getDeviceGBId();
}
List<PlatformCatalog> platformCatalogList = storager.getChildrenCatalogByPlatform(platformId, parentId);
-// if (platform.getTreeType().equals(TreeType.BUSINESS_GROUP)) {
-// platformCatalogList = storager.getChildrenCatalogByPlatform(platformId, parentId);
-// }else {
-//
-// }
WVPResult<List<PlatformCatalog>> result = new WVPResult<>();
result.setCode(0);
@@ -491,10 +458,7 @@
* @param platformCatalog 鐩綍
* @return
*/
- @ApiOperation("娣诲姞鐩綍")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "platformCatalog", value = "鐩綍淇℃伅", dataTypeClass = PlatformCatalog.class, required = true),
- })
+ @Operation(summary = "娣诲姞鐩綍")
@PostMapping("/catalog/add")
@ResponseBody
public ResponseEntity<WVPResult<List<PlatformCatalog>>> addCatalog(@RequestBody PlatformCatalog platformCatalog) {
@@ -528,10 +492,7 @@
* @param platformCatalog 鐩綍
* @return
*/
- @ApiOperation("缂栬緫鐩綍")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "platformCatalog", value = "鐩綍淇℃伅", dataTypeClass = PlatformCatalog.class, required = true),
- })
+ @Operation(summary = "缂栬緫鐩綍")
@PostMapping("/catalog/edit")
@ResponseBody
public ResponseEntity<WVPResult<List<PlatformCatalog>>> editCatalog(@RequestBody PlatformCatalog platformCatalog) {
@@ -561,12 +522,12 @@
* 鍒犻櫎鐩綍
*
* @param id 鐩綍Id
+ * @param platformId 骞冲彴Id
* @return
*/
- @ApiOperation("鍒犻櫎鐩綍")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "鐩綍Id", dataTypeClass = String.class, required = true),
- })
+ @Operation(summary = "鍒犻櫎鐩綍")
+ @Parameter(name = "id", description = "鐩綍Id", required = true)
+ @Parameter(name = "platformId", description = "骞冲彴Id", required = true)
@DeleteMapping("/catalog/del")
@ResponseBody
public ResponseEntity<WVPResult<String>> delCatalog(String id, String platformId) {
@@ -609,10 +570,7 @@
* @param platformCatalog 鍏宠仈鐨勪俊鎭�
* @return
*/
- @ApiOperation("鍒犻櫎鍏宠仈")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "platformCatalog", value = "鍏宠仈鐨勪俊鎭�", dataTypeClass = PlatformCatalog.class, required = true),
- })
+ @Operation(summary = "鍒犻櫎鍏宠仈")
@DeleteMapping("/catalog/relation/del")
@ResponseBody
public ResponseEntity<WVPResult<List<PlatformCatalog>>> delRelation(@RequestBody PlatformCatalog platformCatalog) {
@@ -641,11 +599,9 @@
* @param catalogId 鐩綍Id
* @return
*/
- @ApiOperation("淇敼榛樿鐩綍")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "platformId", value = "骞冲彴Id", dataTypeClass = String.class, required = true),
- @ApiImplicitParam(name = "catalogId", value = "鐩綍Id", dataTypeClass = String.class, required = true),
- })
+ @Operation(summary = "淇敼榛樿鐩綍")
+ @Parameter(name = "catalogId", description = "鐩綍Id", required = true)
+ @Parameter(name = "platformId", description = "骞冲彴Id", required = true)
@PostMapping("/catalog/default/update")
@ResponseBody
public ResponseEntity<WVPResult<String>> setDefaultCatalog(String platformId, String catalogId) {
--
Gitblit v1.8.0