From 07b182da98ac54fffa8f36b8db27d6212e1e0bf7 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期二, 26 十二月 2023 15:38:40 +0800 Subject: [PATCH] Merge branch 'wvp-28181-2.0' into feature/record --- src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java | 34 ++++++++++++++++++---------------- 1 files changed, 18 insertions(+), 16 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 870dee0..471d3df 100755 --- 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 @@ -6,6 +6,7 @@ import com.genersoft.iot.vmp.conf.DynamicTask; import com.genersoft.iot.vmp.conf.UserSetting; import com.genersoft.iot.vmp.conf.exception.ControllerException; +import com.genersoft.iot.vmp.conf.security.JwtUtils; import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform; import com.genersoft.iot.vmp.gb28181.bean.ParentPlatformCatch; import com.genersoft.iot.vmp.gb28181.bean.PlatformCatalog; @@ -21,6 +22,7 @@ import com.github.pagehelper.PageInfo; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -83,7 +85,7 @@ * * @return */ - @Operation(summary = "鑾峰彇鍥芥爣鏈嶅姟鐨勯厤缃�") + @Operation(summary = "鑾峰彇鍥芥爣鏈嶅姟鐨勯厤缃�", security = @SecurityRequirement(name = JwtUtils.HEADER)) @GetMapping("/server_config") public JSONObject serverConfig() { JSONObject result = new JSONObject(); @@ -99,7 +101,7 @@ * * @return */ - @Operation(summary = "鑾峰彇绾ц仈鏈嶅姟鍣ㄤ俊鎭�") + @Operation(summary = "鑾峰彇绾ц仈鏈嶅姟鍣ㄤ俊鎭�", security = @SecurityRequirement(name = JwtUtils.HEADER)) @Parameter(name = "id", description = "骞冲彴鍥芥爣缂栧彿", required = true) @GetMapping("/info/{id}") public ParentPlatform getPlatform(@PathVariable String id) { @@ -119,7 +121,7 @@ * @return */ @GetMapping("/query/{count}/{page}") - @Operation(summary = "鍒嗛〉鏌ヨ绾ц仈骞冲彴") + @Operation(summary = "鍒嗛〉鏌ヨ绾ц仈骞冲彴", security = @SecurityRequirement(name = JwtUtils.HEADER)) @Parameter(name = "page", description = "褰撳墠椤�", required = true) @Parameter(name = "count", description = "姣忛〉鏉℃暟", required = true) public PageInfo<ParentPlatform> platforms(@PathVariable int page, @PathVariable int count) { @@ -140,7 +142,7 @@ * @param parentPlatform * @return */ - @Operation(summary = "娣诲姞涓婄骇骞冲彴淇℃伅") + @Operation(summary = "娣诲姞涓婄骇骞冲彴淇℃伅", security = @SecurityRequirement(name = JwtUtils.HEADER)) @PostMapping("/add") @ResponseBody public void addPlatform(@RequestBody ParentPlatform parentPlatform) { @@ -185,7 +187,7 @@ * @param parentPlatform * @return */ - @Operation(summary = "淇濆瓨涓婄骇骞冲彴淇℃伅") + @Operation(summary = "淇濆瓨涓婄骇骞冲彴淇℃伅", security = @SecurityRequirement(name = JwtUtils.HEADER)) @PostMapping("/save") @ResponseBody public void savePlatform(@RequestBody ParentPlatform parentPlatform) { @@ -216,7 +218,7 @@ * @param serverGBId 涓婄骇骞冲彴鍥芥爣ID * @return */ - @Operation(summary = "鍒犻櫎涓婄骇骞冲彴") + @Operation(summary = "鍒犻櫎涓婄骇骞冲彴", security = @SecurityRequirement(name = JwtUtils.HEADER)) @Parameter(name = "serverGBId", description = "涓婄骇骞冲彴鐨勫浗鏍囩紪鍙�") @DeleteMapping("/delete/{serverGBId}") @ResponseBody @@ -273,7 +275,7 @@ * @param serverGBId 涓婄骇骞冲彴鍥芥爣ID * @return */ - @Operation(summary = "鏌ヨ涓婄骇骞冲彴鏄惁瀛樺湪") + @Operation(summary = "鏌ヨ涓婄骇骞冲彴鏄惁瀛樺湪", security = @SecurityRequirement(name = JwtUtils.HEADER)) @Parameter(name = "serverGBId", description = "涓婄骇骞冲彴鐨勫浗鏍囩紪鍙�") @GetMapping("/exit/{serverGBId}") @ResponseBody @@ -294,7 +296,7 @@ * @param channelType 閫氶亾绫诲瀷 * @return */ - @Operation(summary = "鏌ヨ涓婄骇骞冲彴鏄惁瀛樺湪") + @Operation(summary = "鏌ヨ涓婄骇骞冲彴鏄惁瀛樺湪", security = @SecurityRequirement(name = JwtUtils.HEADER)) @Parameter(name = "page", description = "褰撳墠椤�", required = true) @Parameter(name = "count", description = "姣忛〉鏉℃暟", required = true) @Parameter(name = "platformId", description = "涓婄骇骞冲彴鐨勫浗鏍囩紪鍙�") @@ -331,7 +333,7 @@ * @param param 閫氶亾鍏宠仈鍙傛暟 * @return */ - @Operation(summary = "鍚戜笂绾у钩鍙版坊鍔犲浗鏍囬�氶亾") + @Operation(summary = "鍚戜笂绾у钩鍙版坊鍔犲浗鏍囬�氶亾", security = @SecurityRequirement(name = JwtUtils.HEADER)) @PostMapping("/update_channel_for_gb") @ResponseBody public void updateChannelForGB(@RequestBody UpdateChannelParam param) { @@ -360,7 +362,7 @@ * @param param 閫氶亾鍏宠仈鍙傛暟 * @return */ - @Operation(summary = "浠庝笂绾у钩鍙扮Щ闄ゅ浗鏍囬�氶亾") + @Operation(summary = "浠庝笂绾у钩鍙扮Щ闄ゅ浗鏍囬�氶亾", security = @SecurityRequirement(name = JwtUtils.HEADER)) @DeleteMapping("/del_channel_for_gb") @ResponseBody public void delChannelForGB(@RequestBody UpdateChannelParam param) { @@ -389,7 +391,7 @@ * @param parentId 鐩綍鐖禝D * @return */ - @Operation(summary = "鑾峰彇鐩綍") + @Operation(summary = "鑾峰彇鐩綍", security = @SecurityRequirement(name = JwtUtils.HEADER)) @Parameter(name = "platformId", description = "涓婄骇骞冲彴鐨勫浗鏍囩紪鍙�", required = true) @Parameter(name = "parentId", description = "鐖剁骇鐩綍鐨勫浗鏍囩紪鍙�", required = true) @GetMapping("/catalog") @@ -420,7 +422,7 @@ * @param platformCatalog 鐩綍 * @return */ - @Operation(summary = "娣诲姞鐩綍") + @Operation(summary = "娣诲姞鐩綍", security = @SecurityRequirement(name = JwtUtils.HEADER)) @PostMapping("/catalog/add") @ResponseBody public void addCatalog(@RequestBody PlatformCatalog platformCatalog) { @@ -445,7 +447,7 @@ * @param platformCatalog 鐩綍 * @return */ - @Operation(summary = "缂栬緫鐩綍") + @Operation(summary = "缂栬緫鐩綍", security = @SecurityRequirement(name = JwtUtils.HEADER)) @PostMapping("/catalog/edit") @ResponseBody public void editCatalog(@RequestBody PlatformCatalog platformCatalog) { @@ -471,7 +473,7 @@ * @param platformId 骞冲彴Id * @return */ - @Operation(summary = "鍒犻櫎鐩綍") + @Operation(summary = "鍒犻櫎鐩綍", security = @SecurityRequirement(name = JwtUtils.HEADER)) @Parameter(name = "id", description = "鐩綍Id", required = true) @Parameter(name = "platformId", description = "骞冲彴Id", required = true) @DeleteMapping("/catalog/del") @@ -506,7 +508,7 @@ * @param platformCatalog 鍏宠仈鐨勪俊鎭� * @return */ - @Operation(summary = "鍒犻櫎鍏宠仈") + @Operation(summary = "鍒犻櫎鍏宠仈", security = @SecurityRequirement(name = JwtUtils.HEADER)) @DeleteMapping("/catalog/relation/del") @ResponseBody public void delRelation(@RequestBody PlatformCatalog platformCatalog) { @@ -529,7 +531,7 @@ * @param catalogId 鐩綍Id * @return */ - @Operation(summary = "淇敼榛樿鐩綍") + @Operation(summary = "淇敼榛樿鐩綍", security = @SecurityRequirement(name = JwtUtils.HEADER)) @Parameter(name = "catalogId", description = "鐩綍Id", required = true) @Parameter(name = "platformId", description = "骞冲彴Id", required = true) @PostMapping("/catalog/default/update") -- Gitblit v1.8.0