From 5d901b5e3f033e8b04e53420d68626cbd87431c8 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 06 五月 2022 10:12:34 +0800
Subject: [PATCH] 使用阿里代码规范。规范代码写法

---
 src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java |  495 +++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 430 insertions(+), 65 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 c692af4..a3f1d6a 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
@@ -1,10 +1,17 @@
 package com.genersoft.iot.vmp.vmanager.gb28181.platform;
 
+import com.alibaba.fastjson.JSON;
 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.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.transmit.cmd.ISIPCommanderForPlatform;
 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.vmanager.bean.WVPResult;
 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;
@@ -21,6 +28,8 @@
 import org.springframework.web.bind.annotation.*;
 import com.genersoft.iot.vmp.conf.SipConfig;
 
+import java.util.List;
+
 /**
  * 绾ц仈骞冲彴绠$悊
  */
@@ -33,35 +42,67 @@
     private final static Logger logger = LoggerFactory.getLogger(PlatformController.class);
 
     @Autowired
-    private IVideoManagerStorager storager;
+    private UserSetting userSetting;
+
+    @Autowired
+    private IVideoManagerStorage storager;
 
     @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("鑾峰彇鍥芥爣鏈嶅姟鐨勯厤缃�")
     @GetMapping("/server_config")
     public ResponseEntity<JSONObject> serverConfig() {
         JSONObject result = new JSONObject();
-        result.put("deviceIp", sipConfig.getSipIp());
-        result.put("devicePort", sipConfig.getSipPort());
-        result.put("username", sipConfig.getSipId());
-        result.put("password", sipConfig.getSipPassword());
+        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
+     */
+    @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
      */
@@ -71,16 +112,94 @@
             @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) {
+
+        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
+     */
+    @ApiOperation("娣诲姞涓婄骇骞冲彴淇℃伅")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "parentPlatform", value = "涓婄骇骞冲彴淇℃伅", dataTypeClass = ParentPlatform.class),
+    })
+    @PostMapping("/add")
+    @ResponseBody
+    public ResponseEntity<WVPResult<String>> addPlatform(@RequestBody ParentPlatform parentPlatform) {
 
         if (logger.isDebugEnabled()) {
-            logger.debug("鏌ヨ鎵�鏈変笂绾ц澶嘇PI璋冪敤");
+            logger.debug("淇濆瓨涓婄骇骞冲彴淇℃伅API璋冪敤");
         }
-        return storager.queryParentPlatformList(page, count);
+        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())
+        ) {
+            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() + " 宸插瓨鍦�");
+            return new ResponseEntity<>(wvpResult, HttpStatus.OK);
+        }
+        boolean updateResult = storager.updateParentPlatform(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);
+        }
     }
 
     /**
      * 淇濆瓨涓婄骇骞冲彴淇℃伅
+     *
      * @param parentPlatform
      * @return
      */
@@ -90,27 +209,28 @@
     })
     @PostMapping("/save")
     @ResponseBody
-    public ResponseEntity<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())
-        ){
-            return new ResponseEntity<>("missing parameters", HttpStatus.BAD_REQUEST);
+                || 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);
         }
-        // TODO 妫�鏌ユ槸鍚﹀凡缁忓瓨鍦�,涓旀敞鍐屾垚鍔�, 濡傛灉娉ㄥ唽鎴愬姛,闇�瑕佸厛娉ㄩ攢涔嬪墠鍐�,淇敼骞舵敞鍐�
-
-        // ParentPlatform parentPlatformOld = storager.queryParentPlatById(parentPlatform.getDeviceGBId());
+        parentPlatform.setCharacterSet(parentPlatform.getCharacterSet().toUpperCase());
         ParentPlatform parentPlatformOld = storager.queryParentPlatByServerGBId(parentPlatform.getServerGBId());
 
         boolean updateResult = storager.updateParentPlatform(parentPlatform);
@@ -118,20 +238,36 @@
         if (updateResult) {
             // 淇濆瓨鏃跺惎鐢ㄥ氨鍙戦�佹敞鍐�
             if (parentPlatform.isEnable()) {
-                //  鍙淇濆瓨灏卞彂閫佹敞鍐�
-                commanderForPlatform.register(parentPlatform);
-            } 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);
             }
-            return new ResponseEntity<>("success", HttpStatus.OK);
+            wvpResult.setCode(0);
+            wvpResult.setMsg("success");
+            return new ResponseEntity<>(wvpResult, HttpStatus.OK);
         } else {
-            return new ResponseEntity<>("fail", HttpStatus.OK);
+            wvpResult.setCode(0);
+            wvpResult.setMsg("鍐欏叆鏁版嵁搴撳け璐�");
+            return new ResponseEntity<>(wvpResult, HttpStatus.OK);
         }
     }
 
     /**
      * 鍒犻櫎涓婄骇骞冲彴
-      * @param serverGBId 涓婄骇骞冲彴鍥芥爣ID
+     *
+     * @param serverGBId 涓婄骇骞冲彴鍥芥爣ID
      * @return
      */
     @ApiOperation("鍒犻櫎涓婄骇骞冲彴")
@@ -140,17 +276,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缂撳瓨
@@ -165,17 +303,23 @@
         }));
 
         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
      */
@@ -185,23 +329,23 @@
     })
     @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);
-        }
+//        if (logger.isDebugEnabled()) {
+//            logger.debug("鏌ヨ涓婄骇骞冲彴鏄惁瀛樺湪API璋冪敤锛�" + serverGBId);
+//        }
         ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(serverGBId);
         return new ResponseEntity<>(String.valueOf(parentPlatform != null), HttpStatus.OK);
     }
 
     /**
      * 鍒嗛〉鏌ヨ绾ц仈骞冲彴鐨勬墍鏈夋墍鏈夐�氶亾
-     * @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
      */
@@ -210,35 +354,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璋冪敤");
+//        if (logger.isDebugEnabled()) {
+//            logger.debug("鏌ヨ鎵�鏈夋墍鏈夐�氶亾API璋冪敤");
+//        }
+        if (StringUtils.isEmpty(platformId)) {
+            platformId = null;
         }
-        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(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
      */
@@ -248,18 +397,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());
+        int result = storager.updateChannelForGB(param.getPlatformId(), param.getChannelReduces(), param.getCatalogId());
 
         return new ResponseEntity<>(String.valueOf(result > 0), HttpStatus.OK);
     }
 
     /**
      * 浠庝笂绾у钩鍙扮Щ闄ゅ浗鏍囬�氶亾
+     *
      * @param param 閫氶亾鍏宠仈鍙傛暟
      * @return
      */
@@ -269,7 +419,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璋冪敤");
@@ -279,5 +429,220 @@
         return new ResponseEntity<>(String.valueOf(result > 0), HttpStatus.OK);
     }
 
+    /**
+     * 鑾峰彇鐩綍
+     *
+     * @param platformId 骞冲彴ID
+     * @param parentId   鐩綍鐖禝D
+     * @return
+     */
+    @ApiOperation("鑾峰彇鐩綍")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "platformId", value = "骞冲彴ID", dataTypeClass = String.class, required = true),
+            @ApiImplicitParam(name = "parentId", value = "鐩綍鐖禝D", dataTypeClass = String.class, required = true),
+    })
+    @GetMapping("/catalog")
+    @ResponseBody
+    public ResponseEntity<WVPResult<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);
+    }
+
+    /**
+     * 娣诲姞鐩綍
+     *
+     * @param platformCatalog 鐩綍
+     * @return
+     */
+    @ApiOperation("娣诲姞鐩綍")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "platformCatalog", value = "鐩綍淇℃伅", dataTypeClass = PlatformCatalog.class, required = true),
+    })
+    @PostMapping("/catalog/add")
+    @ResponseBody
+    public ResponseEntity<WVPResult<List<PlatformCatalog>>> 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);
+        }
+        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);
+        }
+    }
+
+    /**
+     * 缂栬緫鐩綍
+     *
+     * @param platformCatalog 鐩綍
+     * @return
+     */
+    @ApiOperation("缂栬緫鐩綍")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "platformCatalog", value = "鐩綍淇℃伅", dataTypeClass = PlatformCatalog.class, required = true),
+    })
+    @PostMapping("/catalog/edit")
+    @ResponseBody
+    public ResponseEntity<WVPResult<List<PlatformCatalog>>> 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);
+        }
+        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);
+        }
+    }
+
+    /**
+     * 鍒犻櫎鐩綍
+     *
+     * @param id 鐩綍Id
+     * @return
+     */
+    @ApiOperation("鍒犻櫎鐩綍")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "鐩綍Id", dataTypeClass = String.class, required = true),
+    })
+    @DeleteMapping("/catalog/del")
+    @ResponseBody
+    public ResponseEntity<WVPResult<String>> 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);
+        }
+        result.setCode(0);
+
+        int delResult = storager.delCatalog(id);
+        // 濡傛灉鍒犻櫎鐨勬槸榛樿鐩綍鍒欐牴鐩綍璁剧疆涓洪粯璁ょ洰褰�
+        PlatformCatalog parentPlatform = storager.queryDefaultCatalogInPlatform(platformId);
+
+        // 榛樿鑺傜偣琚Щ闄�
+        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);
+        }
+    }
+
+    /**
+     * 鍒犻櫎鍏宠仈
+     *
+     * @param platformCatalog 鍏宠仈鐨勪俊鎭�
+     * @return
+     */
+    @ApiOperation("鍒犻櫎鍏宠仈")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "platformCatalog", value = "鍏宠仈鐨勪俊鎭�", dataTypeClass = PlatformCatalog.class, required = true),
+    })
+    @DeleteMapping("/catalog/relation/del")
+    @ResponseBody
+    public ResponseEntity<WVPResult<List<PlatformCatalog>>> 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);
+        }
+    }
+
+
+    /**
+     * 淇敼榛樿鐩綍
+     *
+     * @param platformId 骞冲彴Id
+     * @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),
+    })
+    @PostMapping("/catalog/default/update")
+    @ResponseBody
+    public ResponseEntity<WVPResult<String>> 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);
+        }
+    }
+
 
 }

--
Gitblit v1.8.0