From 2e98b20bea4463e4465e3c19059d0744a09aec06 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 27 Jun 2023 14:34:41 +0800
Subject: [PATCH] gb28181版本升级-补充
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java | 469 ++++++++++++++++++++++++----------------------------------
1 files changed, 196 insertions(+), 273 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 b26ae76..a1cb871 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
@@ -4,37 +4,40 @@
import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.common.VideoManagerConstants;
import com.genersoft.iot.vmp.conf.DynamicTask;
-import com.genersoft.iot.vmp.conf.UserSetup;
+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;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommanderForPlatform;
+import com.genersoft.iot.vmp.service.IPlatformChannelService;
+import com.genersoft.iot.vmp.service.IPlatformService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
-import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
-import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
+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.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;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.util.StringUtils;
+import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
import com.genersoft.iot.vmp.conf.SipConfig;
+import javax.sip.InvalidArgumentException;
+import javax.sip.SipException;
+import java.text.ParseException;
import java.util.List;
-import java.util.Locale;
/**
* 级联平台管理
*/
-@Api(tags = "级联平台管理")
+@Tag(name = "级联平台管理")
@CrossOrigin
@RestController
@RequestMapping("/api/platform")
@@ -43,10 +46,13 @@
private final static Logger logger = LoggerFactory.getLogger(PlatformController.class);
@Autowired
- private UserSetup userSetup;
+ private UserSetting userSetting;
@Autowired
- private IVideoManagerStorager storager;
+ private IVideoManagerStorage storager;
+
+ @Autowired
+ private IPlatformChannelService platformChannelService;
@Autowired
private IRedisCatchStorage redisCatchStorage;
@@ -63,20 +69,23 @@
@Autowired
private DynamicTask dynamicTask;
+ @Autowired
+ private IPlatformService platformService;
+
/**
* 获取国标服务的配置
*
* @return
*/
- @ApiOperation("获取国标服务的配置")
+ @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;
}
/**
@@ -84,20 +93,16 @@
*
* @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);
- WVPResult<ParentPlatform> wvpResult = new WVPResult<>();
+ public ParentPlatform getPlatform(@PathVariable String id) {
+ ParentPlatform parentPlatform = platformService.queryPlatformByServerGBId(id);
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);
}
/**
@@ -107,18 +112,16 @@
* @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);
+ PageInfo<ParentPlatform> parentPlatformPageInfo = platformService.queryParentPlatformList(page, count);
if (parentPlatformPageInfo.getList().size() > 0) {
for (ParentPlatform platform : parentPlatformPageInfo.getList()) {
- platform.setGpsSubscribe(subscribeHolder.getMobilePositionSubscribe(platform.getServerGBId()) != null);
+ platform.setMobilePositionSubscribe(subscribeHolder.getMobilePositionSubscribe(platform.getServerGBId()) != null);
platform.setCatalogSubscribe(subscribeHolder.getCatalogSubscribe(platform.getServerGBId()) != null);
}
}
@@ -131,70 +134,42 @@
* @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) {
+ public void 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() + " 已存在");
}
- boolean updateResult = storager.updateParentPlatform(parentPlatform);
+ parentPlatform.setCreateTime(DateUtil.getNow());
+ parentPlatform.setUpdateTime(DateUtil.getNow());
+ boolean updateResult = platformService.add(parentPlatform);
- if (updateResult) {
- // 保存时启用就发送注册
- if (parentPlatform.isEnable()) {
- if (parentPlatformOld != null && parentPlatformOld.isStatus()) {
- commanderForPlatform.unregister(parentPlatformOld, null, eventResult -> {
- // 只要保存就发送注册
- commanderForPlatform.register(parentPlatform, null, null);
- });
- } else {
- // 只要保存就发送注册
- commanderForPlatform.register(parentPlatform, null, null);
- }
-
- } 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);
- } else {
- wvpResult.setCode(-1);
- wvpResult.setMsg("写入数据库失败");
- return new ResponseEntity<>(wvpResult, HttpStatus.OK);
+ if (!updateResult) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(),"写入数据库失败");
}
}
@@ -204,64 +179,78 @@
* @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) {
+ public void 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());
+ 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()) {
- commanderForPlatform.unregister(parentPlatformOld, null, null);
+ try {
+ commanderForPlatform.unregister(parentPlatformOld, null, null);
+ } catch (InvalidArgumentException | ParseException | SipException e) {
+ logger.error("[命令发送失败] 国标级联 注销: {}", e.getMessage());
+ }
try {
Thread.sleep(500);
} catch (InterruptedException e) {
- e.printStackTrace();
+ logger.error("[线程休眠失败] : {}", e.getMessage());
}
// 只要保存就发送注册
- commanderForPlatform.register(parentPlatform, null, null);
+ try {
+ commanderForPlatform.register(parentPlatform, null, null);
+ } catch (InvalidArgumentException | ParseException | SipException e) {
+ logger.error("[命令发送失败] 国标级联 注册: {}", e.getMessage());
+ }
+
} else {
// 只要保存就发送注册
- commanderForPlatform.register(parentPlatform, null, null);
+ try {
+ commanderForPlatform.register(parentPlatform, null, null);
+ } catch (InvalidArgumentException | ParseException | SipException e) {
+ logger.error("[命令发送失败] 国标级联 注册: {}", e.getMessage());
+ }
}
} else if (parentPlatformOld != null && parentPlatformOld.isEnable() && !parentPlatform.isEnable()) { // 关闭启用时注销
- commanderForPlatform.unregister(parentPlatformOld, null, null);
+ try {
+ commanderForPlatform.unregister(parentPlatformOld, null, null);
+ } catch (InvalidArgumentException | ParseException | SipException e) {
+ logger.error("[命令发送失败] 国标级联 注销: {}", e.getMessage());
+ }
+ // 停止订阅相关的定时任务
+ subscribeHolder.removeAllSubscribe(parentPlatform.getServerGBId());
}
- wvpResult.setCode(0);
- wvpResult.setMsg("success");
- return new ResponseEntity<>(wvpResult, HttpStatus.OK);
} else {
- wvpResult.setCode(0);
- wvpResult.setMsg("写入数据库失败");
- return new ResponseEntity<>(wvpResult, HttpStatus.OK);
+ throw new ControllerException(ErrorCode.ERROR100.getCode(),"写入数据库失败");
}
}
@@ -271,48 +260,50 @@
* @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) {
+ public void 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);
+ if (parentPlatform == null) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "平台不存在");
+ }
// 发送离线消息,无论是否成功都删除缓存
- commanderForPlatform.unregister(parentPlatform, (event -> {
- // 清空redis缓存
- redisCatchStorage.delPlatformCatchInfo(parentPlatform.getServerGBId());
- redisCatchStorage.delPlatformKeepalive(parentPlatform.getServerGBId());
- redisCatchStorage.delPlatformRegister(parentPlatform.getServerGBId());
- }), (event -> {
- // 清空redis缓存
- redisCatchStorage.delPlatformCatchInfo(parentPlatform.getServerGBId());
- redisCatchStorage.delPlatformKeepalive(parentPlatform.getServerGBId());
- redisCatchStorage.delPlatformRegister(parentPlatform.getServerGBId());
- }));
+ try {
+ commanderForPlatform.unregister(parentPlatform, (event -> {
+ // 清空redis缓存
+ redisCatchStorage.delPlatformCatchInfo(parentPlatform.getServerGBId());
+ redisCatchStorage.delPlatformKeepalive(parentPlatform.getServerGBId());
+ redisCatchStorage.delPlatformRegister(parentPlatform.getServerGBId());
+ }), (event -> {
+ // 清空redis缓存
+ redisCatchStorage.delPlatformCatchInfo(parentPlatform.getServerGBId());
+ redisCatchStorage.delPlatformKeepalive(parentPlatform.getServerGBId());
+ redisCatchStorage.delPlatformRegister(parentPlatform.getServerGBId());
+ }));
+ } catch (InvalidArgumentException | ParseException | SipException e) {
+ logger.error("[命令发送失败] 国标级联 注销: {}", e.getMessage());
+ }
boolean deleteResult = storager.deleteParentPlatform(parentPlatform);
storager.delCatalogByPlatformId(parentPlatform.getServerGBId());
storager.delRelationByPlatformId(parentPlatform.getServerGBId());
// 停止发送位置订阅定时任务
- String key = VideoManagerConstants.SIP_SUBSCRIBE_PREFIX + userSetup.getServerId() + "_MobilePosition_" + parentPlatform.getServerGBId();
+ String key = VideoManagerConstants.SIP_SUBSCRIBE_PREFIX + userSetting.getServerId() + "_MobilePosition_" + parentPlatform.getServerGBId();
dynamicTask.stop(key);
// 删除缓存的订阅信息
subscribeHolder.removeAllSubscribe(parentPlatform.getServerGBId());
- if (deleteResult) {
- return new ResponseEntity<>("success", HttpStatus.OK);
- } else {
- return new ResponseEntity<>("fail", HttpStatus.OK);
+ if (!deleteResult) {
+ throw new ControllerException(ErrorCode.ERROR100);
}
}
@@ -322,19 +313,14 @@
* @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) {
+ public Boolean 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);
+ return parentPlatform != null;
}
/**
@@ -348,16 +334,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,
@@ -367,16 +351,13 @@
@RequestParam(required = false) Boolean online,
@RequestParam(required = false) Boolean channelType) {
-// if (logger.isDebugEnabled()) {
-// logger.debug("查询所有所有通道API调用");
-// }
- 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,20 +371,18 @@
* @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) {
+ public void updateChannelForGB(@RequestBody UpdateChannelParam param) {
if (logger.isDebugEnabled()) {
logger.debug("给上级平台添加国标通道API调用");
}
- int result = storager.updateChannelForGB(param.getPlatformId(), param.getChannelReduces(), param.getCatalogId());
-
- return new ResponseEntity<>(String.valueOf(result > 0), HttpStatus.OK);
+ int result = platformChannelService.updateChannelForGB(param.getPlatformId(), param.getChannelReduces(), param.getCatalogId());
+ if (result <= 0) {
+ throw new ControllerException(ErrorCode.ERROR100);
+ }
}
/**
@@ -412,20 +391,19 @@
* @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) {
+ 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);
+ }
}
/**
@@ -435,30 +413,25 @@
* @param parentId 目录父ID
* @return
*/
- @ApiOperation("获取目录")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "platformId", value = "平台ID", dataTypeClass = String.class, required = true),
- @ApiImplicitParam(name = "parentId", value = "目录父ID", 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) {
+ public List<PlatformCatalog> getCatalogByPlatform(String platformId, String parentId) {
if (logger.isDebugEnabled()) {
logger.debug("查询目录,platformId: {}, parentId: {}", platformId, parentId);
}
- List<PlatformCatalog> platformCatalogList = storager.getChildrenCatalogByPlatform(platformId, parentId);
- // 查询下属的国标通道
-// List<PlatformCatalog> catalogsForChannel = storager.queryChannelInParentPlatformAndCatalog(platformId, parentId);
- // 查询下属的直播流通道
-// List<PlatformCatalog> catalogsForStream = storager.queryStreamInParentPlatformAndCatalog(platformId, parentId);
-// platformCatalogList.addAll(catalogsForChannel);
-// platformCatalogList.addAll(catalogsForStream);
- WVPResult<List<PlatformCatalog>> result = new WVPResult<>();
- result.setCode(0);
- result.setMsg("success");
- result.setData(platformCatalogList);
- return new ResponseEntity<>(result, HttpStatus.OK);
+ ParentPlatform platform = storager.queryParentPlatByServerGBId(platformId);
+ if (platform == null) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "平台未找到");
+ }
+ if (platformId.equals(parentId)) {
+ parentId = platform.getDeviceGBId();
+ }
+
+ return storager.getChildrenCatalogByPlatform(platformId, parentId);
}
/**
@@ -467,35 +440,22 @@
* @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) {
+ 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);
}
}
@@ -505,32 +465,22 @@
* @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) {
+ 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(), "写入数据库失败");
}
}
@@ -538,27 +488,23 @@
* 删除目录
*
* @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) {
+ 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);
// 如果删除的是默认目录则根目录设置为默认目录
@@ -567,16 +513,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(), "写入数据库失败");
}
}
@@ -586,27 +526,18 @@
* @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) {
+ 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(), "写入数据库失败");
}
}
@@ -618,28 +549,20 @@
* @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) {
+ 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.9.3