From 1de344674afd6bb35b51b165bbad76dbe6299b7e Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 28 三月 2024 18:08:33 +0800
Subject: [PATCH] 使用冒号分隔redis的key
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java | 109 ++++++++++++++++++------------------------------------
1 files changed, 36 insertions(+), 73 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
old mode 100644
new mode 100755
index 7628f7c..97803f9
--- 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,7 +6,9 @@
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;
import com.genersoft.iot.vmp.gb28181.bean.SubscribeHolder;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommanderForPlatform;
@@ -20,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;
@@ -82,7 +85,7 @@
*
* @return
*/
- @Operation(summary = "鑾峰彇鍥芥爣鏈嶅姟鐨勯厤缃�")
+ @Operation(summary = "鑾峰彇鍥芥爣鏈嶅姟鐨勯厤缃�", security = @SecurityRequirement(name = JwtUtils.HEADER))
@GetMapping("/server_config")
public JSONObject serverConfig() {
JSONObject result = new JSONObject();
@@ -98,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) {
@@ -118,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) {
@@ -139,7 +142,7 @@
* @param parentPlatform
* @return
*/
- @Operation(summary = "娣诲姞涓婄骇骞冲彴淇℃伅")
+ @Operation(summary = "娣诲姞涓婄骇骞冲彴淇℃伅", security = @SecurityRequirement(name = JwtUtils.HEADER))
@PostMapping("/add")
@ResponseBody
public void addPlatform(@RequestBody ParentPlatform parentPlatform) {
@@ -184,7 +187,7 @@
* @param parentPlatform
* @return
*/
- @Operation(summary = "淇濆瓨涓婄骇骞冲彴淇℃伅")
+ @Operation(summary = "淇濆瓨涓婄骇骞冲彴淇℃伅", security = @SecurityRequirement(name = JwtUtils.HEADER))
@PostMapping("/save")
@ResponseBody
public void savePlatform(@RequestBody ParentPlatform parentPlatform) {
@@ -205,58 +208,8 @@
) {
throw new ControllerException(ErrorCode.ERROR400);
}
- parentPlatform.setCharacterSet(parentPlatform.getCharacterSet().toUpperCase());
- ParentPlatform parentPlatformOld = storager.queryParentPlatByServerGBId(parentPlatform.getServerGBId());
- parentPlatform.setUpdateTime(DateUtil.getNow());
- if (!parentPlatformOld.getTreeType().equals(parentPlatform.getTreeType())) {
- // 鐩綍缁撴瀯鍙戠敓鍙樺寲锛屾竻绌轰箣鍓嶇殑鍏宠仈鍏崇郴
- logger.info("淇濆瓨骞冲彴{}鏃跺彂鐜扮洰褰曠粨鏋勫彉鍖栵紝娓呯┖鍏宠仈鍏崇郴", parentPlatform.getDeviceGBId());
- storager.cleanContentForPlatform(parentPlatform.getServerGBId());
- }
- boolean updateResult = storager.updateParentPlatform(parentPlatform);
-
- if (updateResult) {
- // 淇濆瓨鏃跺惎鐢ㄥ氨鍙戦�佹敞鍐�
- if (parentPlatform.isEnable()) {
- if (parentPlatformOld != null && parentPlatformOld.isStatus()) {
- try {
- commanderForPlatform.unregister(parentPlatformOld, null, null);
- } catch (InvalidArgumentException | ParseException | SipException e) {
- logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 娉ㄩ攢: {}", e.getMessage());
- }
- try {
- Thread.sleep(500);
- } catch (InterruptedException e) {
- logger.error("[绾跨▼浼戠湢澶辫触] : {}", e.getMessage());
- }
- // 鍙淇濆瓨灏卞彂閫佹敞鍐�
- try {
- commanderForPlatform.register(parentPlatform, null, null);
- } catch (InvalidArgumentException | ParseException | SipException e) {
- logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 娉ㄥ唽: {}", e.getMessage());
- }
-
- } else {
- // 鍙淇濆瓨灏卞彂閫佹敞鍐�
- try {
- commanderForPlatform.register(parentPlatform, null, null);
- } catch (InvalidArgumentException | ParseException | SipException e) {
- logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 娉ㄥ唽: {}", e.getMessage());
- }
- }
- } else if (parentPlatformOld != null && parentPlatformOld.isEnable() && !parentPlatform.isEnable()) { // 鍏抽棴鍚敤鏃舵敞閿�
- try {
- commanderForPlatform.unregister(parentPlatformOld, null, null);
- } catch (InvalidArgumentException | ParseException | SipException e) {
- logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 娉ㄩ攢: {}", e.getMessage());
- }
- // 鍋滄璁㈤槄鐩稿叧鐨勫畾鏃朵换鍔�
- subscribeHolder.removeAllSubscribe(parentPlatform.getServerGBId());
- }
- } else {
- throw new ControllerException(ErrorCode.ERROR100.getCode(),"鍐欏叆鏁版嵁搴撳け璐�");
- }
+ platformService.update(parentPlatform);
}
/**
@@ -265,7 +218,7 @@
* @param serverGBId 涓婄骇骞冲彴鍥芥爣ID
* @return
*/
- @Operation(summary = "鍒犻櫎涓婄骇骞冲彴")
+ @Operation(summary = "鍒犻櫎涓婄骇骞冲彴", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "serverGBId", description = "涓婄骇骞冲彴鐨勫浗鏍囩紪鍙�")
@DeleteMapping("/delete/{serverGBId}")
@ResponseBody
@@ -279,12 +232,18 @@
throw new ControllerException(ErrorCode.ERROR400);
}
ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(serverGBId);
+ ParentPlatformCatch parentPlatformCatch = redisCatchStorage.queryPlatformCatchInfo(serverGBId);
if (parentPlatform == null) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "骞冲彴涓嶅瓨鍦�");
}
+ if (parentPlatformCatch == null) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "骞冲彴涓嶅瓨鍦�");
+ }
+ parentPlatform.setEnable(false);
+ storager.updateParentPlatform(parentPlatform);
// 鍙戦�佺绾挎秷鎭�,鏃犺鏄惁鎴愬姛閮藉垹闄ょ紦瀛�
try {
- commanderForPlatform.unregister(parentPlatform, (event -> {
+ commanderForPlatform.unregister(parentPlatform, parentPlatformCatch.getSipTransactionInfo(), (event -> {
// 娓呯┖redis缂撳瓨
redisCatchStorage.delPlatformCatchInfo(parentPlatform.getServerGBId());
redisCatchStorage.delPlatformKeepalive(parentPlatform.getServerGBId());
@@ -318,7 +277,7 @@
* @param serverGBId 涓婄骇骞冲彴鍥芥爣ID
* @return
*/
- @Operation(summary = "鏌ヨ涓婄骇骞冲彴鏄惁瀛樺湪")
+ @Operation(summary = "鏌ヨ涓婄骇骞冲彴鏄惁瀛樺湪", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "serverGBId", description = "涓婄骇骞冲彴鐨勫浗鏍囩紪鍙�")
@GetMapping("/exit/{serverGBId}")
@ResponseBody
@@ -339,7 +298,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 = "涓婄骇骞冲彴鐨勫浗鏍囩紪鍙�")
@@ -376,7 +335,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) {
@@ -405,7 +364,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) {
@@ -434,7 +393,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")
@@ -448,8 +407,12 @@
if (platform == null) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "骞冲彴鏈壘鍒�");
}
- if (platformId.equals(parentId)) {
- parentId = platform.getDeviceGBId();
+// if (platformId.equals(parentId)) {
+// parentId = platform.getDeviceGBId();
+// }
+
+ if (platformId.equals(platform.getDeviceGBId())) {
+ parentId = null;
}
return storager.getChildrenCatalogByPlatform(platformId, parentId);
@@ -461,7 +424,7 @@
* @param platformCatalog 鐩綍
* @return
*/
- @Operation(summary = "娣诲姞鐩綍")
+ @Operation(summary = "娣诲姞鐩綍", security = @SecurityRequirement(name = JwtUtils.HEADER))
@PostMapping("/catalog/add")
@ResponseBody
public void addCatalog(@RequestBody PlatformCatalog platformCatalog) {
@@ -469,7 +432,7 @@
if (logger.isDebugEnabled()) {
logger.debug("娣诲姞鐩綍,{}", JSON.toJSONString(platformCatalog));
}
- PlatformCatalog platformCatalogInStore = storager.getCatalog(platformCatalog.getId());
+ PlatformCatalog platformCatalogInStore = storager.getCatalog(platformCatalog.getPlatformId(), platformCatalog.getId());
if (platformCatalogInStore != null) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), platformCatalog.getId() + " already exists");
@@ -486,7 +449,7 @@
* @param platformCatalog 鐩綍
* @return
*/
- @Operation(summary = "缂栬緫鐩綍")
+ @Operation(summary = "缂栬緫鐩綍", security = @SecurityRequirement(name = JwtUtils.HEADER))
@PostMapping("/catalog/edit")
@ResponseBody
public void editCatalog(@RequestBody PlatformCatalog platformCatalog) {
@@ -494,7 +457,7 @@
if (logger.isDebugEnabled()) {
logger.debug("缂栬緫鐩綍,{}", JSON.toJSONString(platformCatalog));
}
- PlatformCatalog platformCatalogInStore = storager.getCatalog(platformCatalog.getId());
+ PlatformCatalog platformCatalogInStore = storager.getCatalog(platformCatalog.getPlatformId(), platformCatalog.getId());
if (platformCatalogInStore == null) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), platformCatalog.getId() + " not exists");
@@ -512,7 +475,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")
@@ -527,7 +490,7 @@
throw new ControllerException(ErrorCode.ERROR400);
}
- int delResult = storager.delCatalog(id);
+ int delResult = storager.delCatalog(platformId, id);
// 濡傛灉鍒犻櫎鐨勬槸榛樿鐩綍鍒欐牴鐩綍璁剧疆涓洪粯璁ょ洰褰�
PlatformCatalog parentPlatform = storager.queryDefaultCatalogInPlatform(platformId);
@@ -547,7 +510,7 @@
* @param platformCatalog 鍏宠仈鐨勪俊鎭�
* @return
*/
- @Operation(summary = "鍒犻櫎鍏宠仈")
+ @Operation(summary = "鍒犻櫎鍏宠仈", security = @SecurityRequirement(name = JwtUtils.HEADER))
@DeleteMapping("/catalog/relation/del")
@ResponseBody
public void delRelation(@RequestBody PlatformCatalog platformCatalog) {
@@ -570,7 +533,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