From 5461b8ebf2f8bf66a9d34351eb8783484304958a Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 22 八月 2022 16:17:28 +0800
Subject: [PATCH] 支持全局异常和统一返回结果，未完待续
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java | 217 +++++++++++++++++++----------------------------------
1 files changed, 79 insertions(+), 138 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 8b5229c..14b7a37 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
@@ -5,6 +5,7 @@
import com.genersoft.iot.vmp.common.VideoManagerConstants;
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.gb28181.bean.ParentPlatform;
import com.genersoft.iot.vmp.gb28181.bean.PlatformCatalog;
import com.genersoft.iot.vmp.gb28181.bean.SubscribeHolder;
@@ -14,6 +15,7 @@
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import com.genersoft.iot.vmp.utils.DateUtil;
+import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import com.genersoft.iot.vmp.vmanager.gb28181.platform.bean.ChannelReduce;
import com.genersoft.iot.vmp.vmanager.gb28181.platform.bean.UpdateChannelParam;
@@ -26,6 +28,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
+import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import com.genersoft.iot.vmp.conf.SipConfig;
@@ -74,13 +77,13 @@
*/
@Operation(summary = "鑾峰彇鍥芥爣鏈嶅姟鐨勯厤缃�")
@GetMapping("/server_config")
- public ResponseEntity<JSONObject> serverConfig() {
+ public JSONObject serverConfig() {
JSONObject result = new JSONObject();
result.put("deviceIp", sipConfig.getIp());
result.put("devicePort", sipConfig.getPort());
result.put("username", sipConfig.getId());
result.put("password", sipConfig.getPassword());
- return new ResponseEntity<>(result, HttpStatus.OK);
+ return result;
}
/**
@@ -91,18 +94,14 @@
@Operation(summary = "鑾峰彇绾ц仈鏈嶅姟鍣ㄤ俊鎭�")
@Parameter(name = "id", description = "骞冲彴鍥芥爣缂栧彿", required = true)
@GetMapping("/info/{id}")
- public ResponseEntity<WVPResult<ParentPlatform>> getPlatform(@PathVariable String id) {
+ public ParentPlatform getPlatform(@PathVariable String id) {
ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(id);
WVPResult<ParentPlatform> wvpResult = new WVPResult<>();
if (parentPlatform != null) {
- wvpResult.setCode(0);
- wvpResult.setMsg("success");
- wvpResult.setData(parentPlatform);
+ return parentPlatform;
} else {
- wvpResult.setCode(-1);
- wvpResult.setMsg("鏈煡璇㈠埌姝ゅ钩鍙�");
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "鏈煡璇㈠埌姝ゅ钩鍙�");
}
- return new ResponseEntity<>(wvpResult, HttpStatus.OK);
}
/**
@@ -137,38 +136,31 @@
@Operation(summary = "娣诲姞涓婄骇骞冲彴淇℃伅")
@PostMapping("/add")
@ResponseBody
- public ResponseEntity<WVPResult<String>> addPlatform(@RequestBody ParentPlatform parentPlatform) {
+ public String addPlatform(@RequestBody ParentPlatform parentPlatform) {
if (logger.isDebugEnabled()) {
logger.debug("淇濆瓨涓婄骇骞冲彴淇℃伅API璋冪敤");
}
- WVPResult<String> wvpResult = new WVPResult<>();
- if (StringUtils.isEmpty(parentPlatform.getName())
- || StringUtils.isEmpty(parentPlatform.getServerGBId())
- || StringUtils.isEmpty(parentPlatform.getServerGBDomain())
- || StringUtils.isEmpty(parentPlatform.getServerIP())
- || StringUtils.isEmpty(parentPlatform.getServerPort())
- || StringUtils.isEmpty(parentPlatform.getDeviceGBId())
- || StringUtils.isEmpty(parentPlatform.getExpires())
- || StringUtils.isEmpty(parentPlatform.getKeepTimeout())
- || StringUtils.isEmpty(parentPlatform.getTransport())
- || StringUtils.isEmpty(parentPlatform.getCharacterSet())
+ if (ObjectUtils.isEmpty(parentPlatform.getName())
+ || ObjectUtils.isEmpty(parentPlatform.getServerGBId())
+ || ObjectUtils.isEmpty(parentPlatform.getServerGBDomain())
+ || ObjectUtils.isEmpty(parentPlatform.getServerIP())
+ || ObjectUtils.isEmpty(parentPlatform.getServerPort())
+ || ObjectUtils.isEmpty(parentPlatform.getDeviceGBId())
+ || ObjectUtils.isEmpty(parentPlatform.getExpires())
+ || ObjectUtils.isEmpty(parentPlatform.getKeepTimeout())
+ || ObjectUtils.isEmpty(parentPlatform.getTransport())
+ || ObjectUtils.isEmpty(parentPlatform.getCharacterSet())
) {
- wvpResult.setCode(-1);
- wvpResult.setMsg("missing parameters");
- return new ResponseEntity<>(wvpResult, HttpStatus.BAD_REQUEST);
+ throw new ControllerException(ErrorCode.ERROR400);
}
if (parentPlatform.getServerPort() < 0 || parentPlatform.getServerPort() > 65535) {
- wvpResult.setCode(-1);
- wvpResult.setMsg("error severPort");
- return new ResponseEntity<>(wvpResult, HttpStatus.BAD_REQUEST);
+ throw new ControllerException(ErrorCode.ERROR400.getCode(), "error severPort");
}
ParentPlatform parentPlatformOld = storager.queryParentPlatByServerGBId(parentPlatform.getServerGBId());
if (parentPlatformOld != null) {
- wvpResult.setCode(-1);
- wvpResult.setMsg("骞冲彴 " + parentPlatform.getServerGBId() + " 宸插瓨鍦�");
- return new ResponseEntity<>(wvpResult, HttpStatus.OK);
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "骞冲彴 " + parentPlatform.getServerGBId() + " 宸插瓨鍦�");
}
parentPlatform.setCreateTime(DateUtil.getNow());
parentPlatform.setUpdateTime(DateUtil.getNow());
@@ -190,13 +182,9 @@
} else if (parentPlatformOld != null && parentPlatformOld.isEnable() && !parentPlatform.isEnable()) { // 鍏抽棴鍚敤鏃舵敞閿�
commanderForPlatform.unregister(parentPlatform, null, null);
}
- wvpResult.setCode(0);
- wvpResult.setMsg("success");
- return new ResponseEntity<>(wvpResult, HttpStatus.OK);
+ return null;
} else {
- wvpResult.setCode(-1);
- wvpResult.setMsg("鍐欏叆鏁版嵁搴撳け璐�");
- return new ResponseEntity<>(wvpResult, HttpStatus.OK);
+ throw new ControllerException(ErrorCode.ERROR100.getCode(),"鍐欏叆鏁版嵁搴撳け璐�");
}
}
@@ -209,26 +197,23 @@
@Operation(summary = "淇濆瓨涓婄骇骞冲彴淇℃伅")
@PostMapping("/save")
@ResponseBody
- public ResponseEntity<WVPResult<String>> savePlatform(@RequestBody ParentPlatform parentPlatform) {
+ public String savePlatform(@RequestBody ParentPlatform parentPlatform) {
if (logger.isDebugEnabled()) {
logger.debug("淇濆瓨涓婄骇骞冲彴淇℃伅API璋冪敤");
}
- WVPResult<String> wvpResult = new WVPResult<>();
- if (StringUtils.isEmpty(parentPlatform.getName())
- || StringUtils.isEmpty(parentPlatform.getServerGBId())
- || StringUtils.isEmpty(parentPlatform.getServerGBDomain())
- || StringUtils.isEmpty(parentPlatform.getServerIP())
- || StringUtils.isEmpty(parentPlatform.getServerPort())
- || StringUtils.isEmpty(parentPlatform.getDeviceGBId())
- || StringUtils.isEmpty(parentPlatform.getExpires())
- || StringUtils.isEmpty(parentPlatform.getKeepTimeout())
- || StringUtils.isEmpty(parentPlatform.getTransport())
- || StringUtils.isEmpty(parentPlatform.getCharacterSet())
+ if (ObjectUtils.isEmpty(parentPlatform.getName())
+ || ObjectUtils.isEmpty(parentPlatform.getServerGBId())
+ || ObjectUtils.isEmpty(parentPlatform.getServerGBDomain())
+ || ObjectUtils.isEmpty(parentPlatform.getServerIP())
+ || ObjectUtils.isEmpty(parentPlatform.getServerPort())
+ || ObjectUtils.isEmpty(parentPlatform.getDeviceGBId())
+ || ObjectUtils.isEmpty(parentPlatform.getExpires())
+ || ObjectUtils.isEmpty(parentPlatform.getKeepTimeout())
+ || ObjectUtils.isEmpty(parentPlatform.getTransport())
+ || ObjectUtils.isEmpty(parentPlatform.getCharacterSet())
) {
- wvpResult.setCode(-1);
- wvpResult.setMsg("missing parameters");
- return new ResponseEntity<>(wvpResult, HttpStatus.BAD_REQUEST);
+ throw new ControllerException(ErrorCode.ERROR400);
}
parentPlatform.setCharacterSet(parentPlatform.getCharacterSet().toUpperCase());
ParentPlatform parentPlatformOld = storager.queryParentPlatByServerGBId(parentPlatform.getServerGBId());
@@ -262,13 +247,9 @@
// 鍋滄璁㈤槄鐩稿叧鐨勫畾鏃朵换鍔�
subscribeHolder.removeAllSubscribe(parentPlatform.getServerGBId());
}
- wvpResult.setCode(0);
- wvpResult.setMsg("success");
- return new ResponseEntity<>(wvpResult, HttpStatus.OK);
+ return null;
} else {
- wvpResult.setCode(0);
- wvpResult.setMsg("鍐欏叆鏁版嵁搴撳け璐�");
- return new ResponseEntity<>(wvpResult, HttpStatus.OK);
+ throw new ControllerException(ErrorCode.ERROR100.getCode(),"鍐欏叆鏁版嵁搴撳け璐�");
}
}
@@ -282,18 +263,18 @@
@Parameter(name = "serverGBId", description = "涓婄骇骞冲彴鐨勫浗鏍囩紪鍙�")
@DeleteMapping("/delete/{serverGBId}")
@ResponseBody
- public ResponseEntity<String> deletePlatform(@PathVariable String serverGBId) {
+ public String deletePlatform(@PathVariable String serverGBId) {
if (logger.isDebugEnabled()) {
logger.debug("鍒犻櫎涓婄骇骞冲彴API璋冪敤");
}
- if (StringUtils.isEmpty(serverGBId)
+ if (ObjectUtils.isEmpty(serverGBId)
) {
- return new ResponseEntity<>("missing parameters", HttpStatus.BAD_REQUEST);
+ throw new ControllerException(ErrorCode.ERROR400);
}
ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(serverGBId);
if (parentPlatform == null) {
- return new ResponseEntity<>("fail", HttpStatus.OK);
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "骞冲彴涓嶅瓨鍦�");
}
// 鍙戦�佺绾挎秷鎭�,鏃犺鏄惁鎴愬姛閮藉垹闄ょ紦瀛�
commanderForPlatform.unregister(parentPlatform, (event -> {
@@ -317,9 +298,9 @@
// 鍒犻櫎缂撳瓨鐨勮闃呬俊鎭�
subscribeHolder.removeAllSubscribe(parentPlatform.getServerGBId());
if (deleteResult) {
- return new ResponseEntity<>("success", HttpStatus.OK);
+ return null;
} else {
- return new ResponseEntity<>("fail", HttpStatus.OK);
+ throw new ControllerException(ErrorCode.ERROR100);
}
}
@@ -333,10 +314,10 @@
@Parameter(name = "serverGBId", description = "涓婄骇骞冲彴鐨勫浗鏍囩紪鍙�")
@GetMapping("/exit/{serverGBId}")
@ResponseBody
- public ResponseEntity<String> exitPlatform(@PathVariable String serverGBId) {
+ public Boolean exitPlatform(@PathVariable String serverGBId) {
ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(serverGBId);
- return new ResponseEntity<>(String.valueOf(parentPlatform != null), HttpStatus.OK);
+ return parentPlatform != null;
}
/**
@@ -367,13 +348,13 @@
@RequestParam(required = false) Boolean online,
@RequestParam(required = false) Boolean channelType) {
- if (StringUtils.isEmpty(platformId)) {
+ if (ObjectUtils.isEmpty(platformId)) {
platformId = null;
}
- if (StringUtils.isEmpty(query)) {
+ if (ObjectUtils.isEmpty(query)) {
query = null;
}
- if (StringUtils.isEmpty(platformId) || StringUtils.isEmpty(catalogId)) {
+ if (ObjectUtils.isEmpty(platformId) || ObjectUtils.isEmpty(catalogId)) {
catalogId = null;
}
PageInfo<ChannelReduce> channelReduces = storager.queryAllChannelList(page, count, query, online, channelType, platformId, catalogId);
@@ -390,14 +371,15 @@
@Operation(summary = "鍚戜笂绾у钩鍙版坊鍔犲浗鏍囬�氶亾")
@PostMapping("/update_channel_for_gb")
@ResponseBody
- public ResponseEntity<String> updateChannelForGB(@RequestBody UpdateChannelParam param) {
+ public void updateChannelForGB(@RequestBody UpdateChannelParam param) {
if (logger.isDebugEnabled()) {
logger.debug("缁欎笂绾у钩鍙版坊鍔犲浗鏍囬�氶亾API璋冪敤");
}
int result = platformChannelService.updateChannelForGB(param.getPlatformId(), param.getChannelReduces(), param.getCatalogId());
-
- return new ResponseEntity<>(String.valueOf(result > 0), HttpStatus.OK);
+ if (result <= 0) {
+ throw new ControllerException(ErrorCode.ERROR100);
+ }
}
/**
@@ -409,14 +391,16 @@
@Operation(summary = "浠庝笂绾у钩鍙扮Щ闄ゅ浗鏍囬�氶亾")
@DeleteMapping("/del_channel_for_gb")
@ResponseBody
- public ResponseEntity<String> delChannelForGB(@RequestBody UpdateChannelParam param) {
+ public void delChannelForGB(@RequestBody UpdateChannelParam param) {
if (logger.isDebugEnabled()) {
logger.debug("缁欎笂绾у钩鍙板垹闄ゅ浗鏍囬�氶亾API璋冪敤");
}
int result = storager.delChannelForGB(param.getPlatformId(), param.getChannelReduces());
- return new ResponseEntity<>(String.valueOf(result > 0), HttpStatus.OK);
+ if (result <= 0) {
+ throw new ControllerException(ErrorCode.ERROR100);
+ }
}
/**
@@ -431,25 +415,20 @@
@Parameter(name = "parentId", description = "鐖剁骇鐩綍鐨勫浗鏍囩紪鍙�", required = true)
@GetMapping("/catalog")
@ResponseBody
- public ResponseEntity<WVPResult<List<PlatformCatalog>>> getCatalogByPlatform(String platformId, String parentId) {
+ public List<PlatformCatalog> getCatalogByPlatform(String platformId, String parentId) {
if (logger.isDebugEnabled()) {
logger.debug("鏌ヨ鐩綍,platformId: {}, parentId: {}", platformId, parentId);
}
ParentPlatform platform = storager.queryParentPlatByServerGBId(platformId);
if (platform == null) {
- return new ResponseEntity<>(new WVPResult<>(400, "骞冲彴鏈壘鍒�", null), HttpStatus.OK);
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "骞冲彴鏈壘鍒�");
}
if (platformId.equals(parentId)) {
parentId = platform.getDeviceGBId();
}
- List<PlatformCatalog> platformCatalogList = storager.getChildrenCatalogByPlatform(platformId, parentId);
- WVPResult<List<PlatformCatalog>> result = new WVPResult<>();
- result.setCode(0);
- result.setMsg("success");
- result.setData(platformCatalogList);
- return new ResponseEntity<>(result, HttpStatus.OK);
+ return storager.getChildrenCatalogByPlatform(platformId, parentId);
}
/**
@@ -461,28 +440,19 @@
@Operation(summary = "娣诲姞鐩綍")
@PostMapping("/catalog/add")
@ResponseBody
- public ResponseEntity<WVPResult<List<PlatformCatalog>>> addCatalog(@RequestBody PlatformCatalog platformCatalog) {
+ public void addCatalog(@RequestBody PlatformCatalog platformCatalog) {
if (logger.isDebugEnabled()) {
logger.debug("娣诲姞鐩綍,{}", JSON.toJSONString(platformCatalog));
}
PlatformCatalog platformCatalogInStore = storager.getCatalog(platformCatalog.getId());
- WVPResult<List<PlatformCatalog>> result = new WVPResult<>();
if (platformCatalogInStore != null) {
- result.setCode(-1);
- result.setMsg(platformCatalog.getId() + " already exists");
- return new ResponseEntity<>(result, HttpStatus.OK);
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), platformCatalog.getId() + " already exists");
}
int addResult = storager.addCatalog(platformCatalog);
- if (addResult > 0) {
- result.setCode(0);
- result.setMsg("success");
- return new ResponseEntity<>(result, HttpStatus.OK);
- } else {
- result.setCode(-500);
- result.setMsg("save error");
- return new ResponseEntity<>(result, HttpStatus.OK);
+ if (addResult <= 0) {
+ throw new ControllerException(ErrorCode.ERROR100);
}
}
@@ -495,26 +465,19 @@
@Operation(summary = "缂栬緫鐩綍")
@PostMapping("/catalog/edit")
@ResponseBody
- public ResponseEntity<WVPResult<List<PlatformCatalog>>> editCatalog(@RequestBody PlatformCatalog platformCatalog) {
+ public void editCatalog(@RequestBody PlatformCatalog platformCatalog) {
if (logger.isDebugEnabled()) {
logger.debug("缂栬緫鐩綍,{}", JSON.toJSONString(platformCatalog));
}
PlatformCatalog platformCatalogInStore = storager.getCatalog(platformCatalog.getId());
- WVPResult<List<PlatformCatalog>> result = new WVPResult<>();
- result.setCode(0);
if (platformCatalogInStore == null) {
- result.setMsg(platformCatalog.getId() + " not exists");
- return new ResponseEntity<>(result, HttpStatus.OK);
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), platformCatalog.getId() + " not exists");
}
int addResult = storager.updateCatalog(platformCatalog);
- if (addResult > 0) {
- result.setMsg("success");
- return new ResponseEntity<>(result, HttpStatus.OK);
- } else {
- result.setMsg("save error");
- return new ResponseEntity<>(result, HttpStatus.OK);
+ if (addResult <= 0) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "鍐欏叆鏁版嵁搴撳け璐�");
}
}
@@ -530,19 +493,15 @@
@Parameter(name = "platformId", description = "骞冲彴Id", required = true)
@DeleteMapping("/catalog/del")
@ResponseBody
- public ResponseEntity<WVPResult<String>> delCatalog(String id, String platformId) {
+ public void delCatalog(String id, String platformId) {
if (logger.isDebugEnabled()) {
logger.debug("鍒犻櫎鐩綍,{}", id);
}
- WVPResult<String> result = new WVPResult<>();
- if (StringUtils.isEmpty(id) || StringUtils.isEmpty(platformId)) {
- result.setCode(-1);
- result.setMsg("param error");
- return new ResponseEntity<>(result, HttpStatus.BAD_REQUEST);
+ if (ObjectUtils.isEmpty(id) || ObjectUtils.isEmpty(platformId)) {
+ throw new ControllerException(ErrorCode.ERROR400);
}
- result.setCode(0);
int delResult = storager.delCatalog(id);
// 濡傛灉鍒犻櫎鐨勬槸榛樿鐩綍鍒欐牴鐩綍璁剧疆涓洪粯璁ょ洰褰�
@@ -551,16 +510,10 @@
// 榛樿鑺傜偣琚Щ闄�
if (parentPlatform == null) {
storager.setDefaultCatalog(platformId, platformId);
- result.setData(platformId);
}
-
- if (delResult > 0) {
- result.setMsg("success");
- return new ResponseEntity<>(result, HttpStatus.OK);
- } else {
- result.setMsg("save error");
- return new ResponseEntity<>(result, HttpStatus.OK);
+ if (delResult <= 0) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "鍐欏叆鏁版嵁搴撳け璐�");
}
}
@@ -573,21 +526,15 @@
@Operation(summary = "鍒犻櫎鍏宠仈")
@DeleteMapping("/catalog/relation/del")
@ResponseBody
- public ResponseEntity<WVPResult<List<PlatformCatalog>>> delRelation(@RequestBody PlatformCatalog platformCatalog) {
+ public void delRelation(@RequestBody PlatformCatalog platformCatalog) {
if (logger.isDebugEnabled()) {
logger.debug("鍒犻櫎鍏宠仈,{}", JSON.toJSONString(platformCatalog));
}
int delResult = storager.delRelation(platformCatalog);
- WVPResult<List<PlatformCatalog>> result = new WVPResult<>();
- result.setCode(0);
- if (delResult > 0) {
- result.setMsg("success");
- return new ResponseEntity<>(result, HttpStatus.OK);
- } else {
- result.setMsg("save error");
- return new ResponseEntity<>(result, HttpStatus.OK);
+ if (delResult <= 0) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "鍐欏叆鏁版嵁搴撳け璐�");
}
}
@@ -604,21 +551,15 @@
@Parameter(name = "platformId", description = "骞冲彴Id", required = true)
@PostMapping("/catalog/default/update")
@ResponseBody
- public ResponseEntity<WVPResult<String>> setDefaultCatalog(String platformId, String catalogId) {
+ public void setDefaultCatalog(String platformId, String catalogId) {
if (logger.isDebugEnabled()) {
logger.debug("淇敼榛樿鐩綍,{},{}", platformId, catalogId);
}
int updateResult = storager.setDefaultCatalog(platformId, catalogId);
- WVPResult<String> result = new WVPResult<>();
- result.setCode(0);
- if (updateResult > 0) {
- result.setMsg("success");
- return new ResponseEntity<>(result, HttpStatus.OK);
- } else {
- result.setMsg("save error");
- return new ResponseEntity<>(result, HttpStatus.OK);
+ if (updateResult <= 0) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "鍐欏叆鏁版嵁搴撳け璐�");
}
}
--
Gitblit v1.8.0