From 5e4a673ecc95d6fb06aec6c5e2f3ec4ffb72584b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 01 八月 2022 14:33:51 +0800
Subject: [PATCH] 修复视频播放点击音量报错 #557，修复编解码信息获取失败
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java | 288 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 197 insertions(+), 91 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 532d928..7a22693 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
@@ -2,13 +2,18 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
-import com.genersoft.iot.vmp.gb28181.bean.CatalogData;
-import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
+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.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.bean.TreeType;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommanderForPlatform;
+import com.genersoft.iot.vmp.service.IPlatformChannelService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
-import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
+import com.genersoft.iot.vmp.utils.DateUtil;
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;
@@ -40,19 +45,32 @@
private final static Logger logger = LoggerFactory.getLogger(PlatformController.class);
@Autowired
- private IVideoManagerStorager storager;
+ private UserSetting userSetting;
+
+ @Autowired
+ private IVideoManagerStorage storager;
+
+ @Autowired
+ private IPlatformChannelService platformChannelService;
@Autowired
private IRedisCatchStorage redisCatchStorage;
@Autowired
+ private SubscribeHolder subscribeHolder;
+
+ @Autowired
private ISIPCommanderForPlatform commanderForPlatform;
+ @Autowired
+ private SipConfig sipConfig;
+
@Autowired
- private SipConfig sipConfig;
+ private DynamicTask dynamicTask;
/**
* 鑾峰彇鍥芥爣鏈嶅姟鐨勯厤缃�
+ *
* @return
*/
@ApiOperation("鑾峰彇鍥芥爣鏈嶅姟鐨勯厤缃�")
@@ -67,8 +85,30 @@
}
/**
+ * 鑾峰彇绾ц仈鏈嶅姟鍣ㄤ俊鎭�
+ *
+ * @return
+ */
+ @ApiOperation("鑾峰彇鍥芥爣鏈嶅姟鐨勯厤缃�")
+ @GetMapping("/info/{id}")
+ public ResponseEntity<WVPResult<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);
+ } else {
+ wvpResult.setCode(-1);
+ wvpResult.setMsg("鏈煡璇㈠埌姝ゅ钩鍙�");
+ }
+ return new ResponseEntity<>(wvpResult, HttpStatus.OK);
+ }
+
+ /**
* 鍒嗛〉鏌ヨ绾ц仈骞冲彴
- * @param page 褰撳墠椤�
+ *
+ * @param page 褰撳墠椤�
* @param count 姣忛〉鏉℃暟
* @return
*/
@@ -78,16 +118,21 @@
@ApiImplicitParam(name = "page", value = "褰撳墠椤�", dataTypeClass = Integer.class),
@ApiImplicitParam(name = "count", value = "姣忛〉鏉℃暟", dataTypeClass = Integer.class),
})
- public PageInfo<ParentPlatform> platforms(@PathVariable int page, @PathVariable int count){
+ public PageInfo<ParentPlatform> platforms(@PathVariable int page, @PathVariable int count) {
-// if (logger.isDebugEnabled()) {
-// logger.debug("鏌ヨ鎵�鏈変笂绾ц澶嘇PI璋冪敤");
-// }
- return storager.queryParentPlatformList(page, count);
+ PageInfo<ParentPlatform> parentPlatformPageInfo = storager.queryParentPlatformList(page, count);
+ if (parentPlatformPageInfo.getList().size() > 0) {
+ for (ParentPlatform platform : parentPlatformPageInfo.getList()) {
+ platform.setMobilePositionSubscribe(subscribeHolder.getMobilePositionSubscribe(platform.getServerGBId()) != null);
+ platform.setCatalogSubscribe(subscribeHolder.getCatalogSubscribe(platform.getServerGBId()) != null);
+ }
+ }
+ return parentPlatformPageInfo;
}
/**
* 娣诲姞涓婄骇骞冲彴淇℃伅
+ *
* @param parentPlatform
* @return
*/
@@ -97,42 +142,57 @@
})
@PostMapping("/add")
@ResponseBody
- public ResponseEntity<WVPResult<String>> addPlatform(@RequestBody ParentPlatform parentPlatform){
+ public ResponseEntity<WVPResult<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())
- ){
+ || 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())
+ ) {
wvpResult.setCode(-1);
wvpResult.setMsg("missing parameters");
+ return new ResponseEntity<>(wvpResult, HttpStatus.BAD_REQUEST);
+ }
+ if (parentPlatform.getServerPort() < 0 || parentPlatform.getServerPort() > 65535) {
+ wvpResult.setCode(-1);
+ wvpResult.setMsg("error severPort");
return new ResponseEntity<>(wvpResult, HttpStatus.BAD_REQUEST);
}
ParentPlatform parentPlatformOld = storager.queryParentPlatByServerGBId(parentPlatform.getServerGBId());
if (parentPlatformOld != null) {
wvpResult.setCode(-1);
- wvpResult.setMsg("骞冲彴 "+parentPlatform.getServerGBId()+" 宸插瓨鍦�");
+ wvpResult.setMsg("骞冲彴 " + parentPlatform.getServerGBId() + " 宸插瓨鍦�");
return new ResponseEntity<>(wvpResult, HttpStatus.OK);
}
+ parentPlatform.setCreateTime(DateUtil.getNow());
+ parentPlatform.setUpdateTime(DateUtil.getNow());
boolean updateResult = storager.updateParentPlatform(parentPlatform);
if (updateResult) {
// 淇濆瓨鏃跺惎鐢ㄥ氨鍙戦�佹敞鍐�
if (parentPlatform.isEnable()) {
- // 鍙淇濆瓨灏卞彂閫佹敞鍐�
- commanderForPlatform.register(parentPlatform, null, null);
- } else if (parentPlatformOld != null && parentPlatformOld.isEnable() && !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);
@@ -147,6 +207,7 @@
/**
* 淇濆瓨涓婄骇骞冲彴淇℃伅
+ *
* @param parentPlatform
* @return
*/
@@ -156,38 +217,58 @@
})
@PostMapping("/save")
@ResponseBody
- public ResponseEntity<WVPResult<String>> savePlatform(@RequestBody ParentPlatform parentPlatform){
+ public ResponseEntity<WVPResult<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())
- ){
+ || 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())
+ ) {
wvpResult.setCode(-1);
wvpResult.setMsg("missing parameters");
return new ResponseEntity<>(wvpResult, HttpStatus.BAD_REQUEST);
}
+ 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()) {
- // 鍙淇濆瓨灏卞彂閫佹敞鍐�
- commanderForPlatform.register(parentPlatform, null, null);
- } else if (parentPlatformOld != null && parentPlatformOld.isEnable() && !parentPlatform.isEnable()){ // 鍏抽棴鍚敤鏃舵敞閿�
- commanderForPlatform.unregister(parentPlatform, null, null);
+ if (parentPlatformOld != null && parentPlatformOld.isStatus()) {
+ commanderForPlatform.unregister(parentPlatformOld, null, null);
+ try {
+ Thread.sleep(500);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ // 鍙淇濆瓨灏卞彂閫佹敞鍐�
+ commanderForPlatform.register(parentPlatform, null, null);
+ } else {
+ // 鍙淇濆瓨灏卞彂閫佹敞鍐�
+ commanderForPlatform.register(parentPlatform, null, null);
+ }
+ } else if (parentPlatformOld != null && parentPlatformOld.isEnable() && !parentPlatform.isEnable()) { // 鍏抽棴鍚敤鏃舵敞閿�
+ commanderForPlatform.unregister(parentPlatformOld, null, null);
+ // 鍋滄璁㈤槄鐩稿叧鐨勫畾鏃朵换鍔�
+ subscribeHolder.removeAllSubscribe(parentPlatform.getServerGBId());
}
wvpResult.setCode(0);
wvpResult.setMsg("success");
@@ -201,7 +282,8 @@
/**
* 鍒犻櫎涓婄骇骞冲彴
- * @param serverGBId 涓婄骇骞冲彴鍥芥爣ID
+ *
+ * @param serverGBId 涓婄骇骞冲彴鍥芥爣ID
* @return
*/
@ApiOperation("鍒犻櫎涓婄骇骞冲彴")
@@ -210,17 +292,19 @@
})
@DeleteMapping("/delete/{serverGBId}")
@ResponseBody
- public ResponseEntity<String> deletePlatform(@PathVariable String serverGBId){
+ public ResponseEntity<String> deletePlatform(@PathVariable String serverGBId) {
if (logger.isDebugEnabled()) {
logger.debug("鍒犻櫎涓婄骇骞冲彴API璋冪敤");
}
if (StringUtils.isEmpty(serverGBId)
- ){
+ ) {
return new ResponseEntity<>("missing parameters", HttpStatus.BAD_REQUEST);
}
ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(serverGBId);
- if (parentPlatform == null) return new ResponseEntity<>("fail", HttpStatus.OK);
+ if (parentPlatform == null) {
+ return new ResponseEntity<>("fail", HttpStatus.OK);
+ }
// 鍙戦�佺绾挎秷鎭�,鏃犺鏄惁鎴愬姛閮藉垹闄ょ紦瀛�
commanderForPlatform.unregister(parentPlatform, (event -> {
// 娓呯┖redis缂撳瓨
@@ -237,17 +321,21 @@
boolean deleteResult = storager.deleteParentPlatform(parentPlatform);
storager.delCatalogByPlatformId(parentPlatform.getServerGBId());
storager.delRelationByPlatformId(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 {
+ } else {
return new ResponseEntity<>("fail", HttpStatus.OK);
}
}
/**
* 鏌ヨ涓婄骇骞冲彴鏄惁瀛樺湪
+ *
* @param serverGBId 涓婄骇骞冲彴鍥芥爣ID
* @return
*/
@@ -257,7 +345,7 @@
})
@GetMapping("/exit/{serverGBId}")
@ResponseBody
- public ResponseEntity<String> exitPlatform(@PathVariable String serverGBId){
+ public ResponseEntity<String> exitPlatform(@PathVariable String serverGBId) {
// if (logger.isDebugEnabled()) {
// logger.debug("鏌ヨ涓婄骇骞冲彴鏄惁瀛樺湪API璋冪敤锛�" + serverGBId);
@@ -268,12 +356,12 @@
/**
* 鍒嗛〉鏌ヨ绾ц仈骞冲彴鐨勬墍鏈夋墍鏈夐�氶亾
- * @param page 褰撳墠椤�
- * @param count 姣忛〉鏉℃暟
- * @param platformId 涓婄骇骞冲彴ID
- * @param query 鏌ヨ鍐呭
- * @param online 鏄惁鍦ㄧ嚎
- * @param choosed 鏄惁宸查�変腑
+ *
+ * @param page 褰撳墠椤�
+ * @param count 姣忛〉鏉℃暟
+ * @param platformId 涓婄骇骞冲彴ID
+ * @param query 鏌ヨ鍐呭
+ * @param online 鏄惁鍦ㄧ嚎
* @param channelType 閫氶亾绫诲瀷
* @return
*/
@@ -282,35 +370,40 @@
@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 = "choosed", value = "鏄惁宸查�変腑", dataTypeClass = Boolean.class),
@ApiImplicitParam(name = "channelType", value = "閫氶亾绫诲瀷", dataTypeClass = Boolean.class),
})
@GetMapping("/channel_list")
@ResponseBody
public PageInfo<ChannelReduce> channelList(int page, int count,
- @RequestParam(required = false) String platformId,
- @RequestParam(required = false) String query,
- @RequestParam(required = false) Boolean online,
- @RequestParam(required = false) Boolean choosed,
- @RequestParam(required = false) Boolean channelType){
+ @RequestParam(required = false) String platformId,
+ @RequestParam(required = false) String catalogId,
+ @RequestParam(required = false) String query,
+ @RequestParam(required = false) Boolean online,
+ @RequestParam(required = false) Boolean channelType) {
// if (logger.isDebugEnabled()) {
// logger.debug("鏌ヨ鎵�鏈夋墍鏈夐�氶亾API璋冪敤");
// }
- PageInfo<ChannelReduce> channelReduces = null;
- if (platformId != null ) {
- channelReduces = storager.queryAllChannelList(page, count, query, online, channelType, platformId, choosed);
- }else {
- channelReduces = storager.queryAllChannelList(page, count, query, online, channelType, null, false);
+ if (StringUtils.isEmpty(platformId)) {
+ platformId = null;
}
+ if (StringUtils.isEmpty(query)) {
+ query = null;
+ }
+ if (StringUtils.isEmpty(platformId) || StringUtils.isEmpty(catalogId)) {
+ catalogId = null;
+ }
+ PageInfo<ChannelReduce> channelReduces = storager.queryAllChannelList(page, count, query, online, channelType, platformId, catalogId);
return channelReduces;
}
/**
* 鍚戜笂绾у钩鍙版坊鍔犲浗鏍囬�氶亾
+ *
* @param param 閫氶亾鍏宠仈鍙傛暟
* @return
*/
@@ -320,18 +413,19 @@
})
@PostMapping("/update_channel_for_gb")
@ResponseBody
- public ResponseEntity<String> updateChannelForGB(@RequestBody UpdateChannelParam param){
+ public ResponseEntity<String> updateChannelForGB(@RequestBody UpdateChannelParam param) {
if (logger.isDebugEnabled()) {
logger.debug("缁欎笂绾у钩鍙版坊鍔犲浗鏍囬�氶亾API璋冪敤");
}
- int result = storager.updateChannelForGB(param.getPlatformId(), param.getChannelReduces(), param.getCatalogId());
+ int result = platformChannelService.updateChannelForGB(param.getPlatformId(), param.getChannelReduces(), param.getCatalogId());
return new ResponseEntity<>(String.valueOf(result > 0), HttpStatus.OK);
}
/**
* 浠庝笂绾у钩鍙扮Щ闄ゅ浗鏍囬�氶亾
+ *
* @param param 閫氶亾鍏宠仈鍙傛暟
* @return
*/
@@ -341,7 +435,7 @@
})
@DeleteMapping("/del_channel_for_gb")
@ResponseBody
- public ResponseEntity<String> delChannelForGB(@RequestBody UpdateChannelParam param){
+ public ResponseEntity<String> delChannelForGB(@RequestBody UpdateChannelParam param) {
if (logger.isDebugEnabled()) {
logger.debug("缁欎笂绾у钩鍙板垹闄ゅ浗鏍囬�氶亾API璋冪敤");
@@ -353,8 +447,9 @@
/**
* 鑾峰彇鐩綍
+ *
* @param platformId 骞冲彴ID
- * @param parentId 鐩綍鐖禝D
+ * @param parentId 鐩綍鐖禝D
* @return
*/
@ApiOperation("鑾峰彇鐩綍")
@@ -364,18 +459,25 @@
})
@GetMapping("/catalog")
@ResponseBody
- public ResponseEntity<WVPResult<List<PlatformCatalog>>> getCatalogByPlatform(String platformId, String parentId){
+ public ResponseEntity<WVPResult<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);
+ }
+ if (platformId.equals(parentId)) {
+ parentId = platform.getDeviceGBId();
+ }
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);
+// if (platform.getTreeType().equals(TreeType.BUSINESS_GROUP)) {
+// platformCatalogList = storager.getChildrenCatalogByPlatform(platformId, parentId);
+// }else {
+//
+// }
+
WVPResult<List<PlatformCatalog>> result = new WVPResult<>();
result.setCode(0);
result.setMsg("success");
@@ -385,6 +487,7 @@
/**
* 娣诲姞鐩綍
+ *
* @param platformCatalog 鐩綍
* @return
*/
@@ -394,7 +497,7 @@
})
@PostMapping("/catalog/add")
@ResponseBody
- public ResponseEntity<WVPResult<List<PlatformCatalog>>> addCatalog(@RequestBody PlatformCatalog platformCatalog){
+ public ResponseEntity<WVPResult<List<PlatformCatalog>>> addCatalog(@RequestBody PlatformCatalog platformCatalog) {
if (logger.isDebugEnabled()) {
logger.debug("娣诲姞鐩綍,{}", JSON.toJSONString(platformCatalog));
@@ -402,10 +505,9 @@
PlatformCatalog platformCatalogInStore = storager.getCatalog(platformCatalog.getId());
WVPResult<List<PlatformCatalog>> result = new WVPResult<>();
-
if (platformCatalogInStore != null) {
result.setCode(-1);
- result.setMsg( platformCatalog.getId() + " already exists");
+ result.setMsg(platformCatalog.getId() + " already exists");
return new ResponseEntity<>(result, HttpStatus.OK);
}
int addResult = storager.addCatalog(platformCatalog);
@@ -413,7 +515,7 @@
result.setCode(0);
result.setMsg("success");
return new ResponseEntity<>(result, HttpStatus.OK);
- }else {
+ } else {
result.setCode(-500);
result.setMsg("save error");
return new ResponseEntity<>(result, HttpStatus.OK);
@@ -422,6 +524,7 @@
/**
* 缂栬緫鐩綍
+ *
* @param platformCatalog 鐩綍
* @return
*/
@@ -431,7 +534,7 @@
})
@PostMapping("/catalog/edit")
@ResponseBody
- public ResponseEntity<WVPResult<List<PlatformCatalog>>> editCatalog(@RequestBody PlatformCatalog platformCatalog){
+ public ResponseEntity<WVPResult<List<PlatformCatalog>>> editCatalog(@RequestBody PlatformCatalog platformCatalog) {
if (logger.isDebugEnabled()) {
logger.debug("缂栬緫鐩綍,{}", JSON.toJSONString(platformCatalog));
@@ -441,14 +544,14 @@
result.setCode(0);
if (platformCatalogInStore == null) {
- result.setMsg( platformCatalog.getId() + " not exists");
+ result.setMsg(platformCatalog.getId() + " not exists");
return new ResponseEntity<>(result, HttpStatus.OK);
}
int addResult = storager.updateCatalog(platformCatalog);
if (addResult > 0) {
result.setMsg("success");
return new ResponseEntity<>(result, HttpStatus.OK);
- }else {
+ } else {
result.setMsg("save error");
return new ResponseEntity<>(result, HttpStatus.OK);
}
@@ -456,6 +559,7 @@
/**
* 鍒犻櫎鐩綍
+ *
* @param id 鐩綍Id
* @return
*/
@@ -465,7 +569,7 @@
})
@DeleteMapping("/catalog/del")
@ResponseBody
- public ResponseEntity<WVPResult<String>> delCatalog(String id, String platformId){
+ public ResponseEntity<WVPResult<String>> delCatalog(String id, String platformId) {
if (logger.isDebugEnabled()) {
logger.debug("鍒犻櫎鐩綍,{}", id);
@@ -493,7 +597,7 @@
if (delResult > 0) {
result.setMsg("success");
return new ResponseEntity<>(result, HttpStatus.OK);
- }else {
+ } else {
result.setMsg("save error");
return new ResponseEntity<>(result, HttpStatus.OK);
}
@@ -501,6 +605,7 @@
/**
* 鍒犻櫎鍏宠仈
+ *
* @param platformCatalog 鍏宠仈鐨勪俊鎭�
* @return
*/
@@ -510,7 +615,7 @@
})
@DeleteMapping("/catalog/relation/del")
@ResponseBody
- public ResponseEntity<WVPResult<List<PlatformCatalog>>> delRelation(@RequestBody PlatformCatalog platformCatalog){
+ public ResponseEntity<WVPResult<List<PlatformCatalog>>> delRelation(@RequestBody PlatformCatalog platformCatalog) {
if (logger.isDebugEnabled()) {
logger.debug("鍒犻櫎鍏宠仈,{}", JSON.toJSONString(platformCatalog));
@@ -522,7 +627,7 @@
if (delResult > 0) {
result.setMsg("success");
return new ResponseEntity<>(result, HttpStatus.OK);
- }else {
+ } else {
result.setMsg("save error");
return new ResponseEntity<>(result, HttpStatus.OK);
}
@@ -531,8 +636,9 @@
/**
* 淇敼榛樿鐩綍
+ *
* @param platformId 骞冲彴Id
- * @param catalogId 鐩綍Id
+ * @param catalogId 鐩綍Id
* @return
*/
@ApiOperation("淇敼榛樿鐩綍")
@@ -542,7 +648,7 @@
})
@PostMapping("/catalog/default/update")
@ResponseBody
- public ResponseEntity<WVPResult<String>> setDefaultCatalog(String platformId, String catalogId){
+ public ResponseEntity<WVPResult<String>> setDefaultCatalog(String platformId, String catalogId) {
if (logger.isDebugEnabled()) {
logger.debug("淇敼榛樿鐩綍,{},{}", platformId, catalogId);
@@ -554,7 +660,7 @@
if (updateResult > 0) {
result.setMsg("success");
return new ResponseEntity<>(result, HttpStatus.OK);
- }else {
+ } else {
result.setMsg("save error");
return new ResponseEntity<>(result, HttpStatus.OK);
}
--
Gitblit v1.8.0