From 985082d33930868c3cc1723f28fd9aaae9013a8f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 16 八月 2023 09:11:22 +0800
Subject: [PATCH] 添加缺少的内容

---
 src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java |  555 +++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 411 insertions(+), 144 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java
old mode 100644
new mode 100755
index 84431dd..870dee0
--- 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,31 +1,44 @@
 package com.genersoft.iot.vmp.vmanager.gb28181.platform;
 
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.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.conf.exception.ControllerException;
 import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
+import com.genersoft.iot.vmp.gb28181.bean.ParentPlatformCatch;
+import com.genersoft.iot.vmp.gb28181.bean.PlatformCatalog;
+import com.genersoft.iot.vmp.gb28181.bean.SubscribeHolder;
 import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommanderForPlatform;
+import com.genersoft.iot.vmp.service.*;
 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.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;
 
 /**
  * 绾ц仈骞冲彴绠$悊
  */
-@Api(tags = "绾ц仈骞冲彴绠$悊")
-@CrossOrigin
+@Tag(name  = "绾ц仈骞冲彴绠$悊")
+
 @RestController
 @RequestMapping("/api/platform")
 public class PlatformController {
@@ -33,250 +46,504 @@
     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;
+
+	@Autowired
+	private IPlatformService platformService;
+
+	@Autowired
+	private IDeviceChannelService deviceChannelService;
+
+	@Autowired
+	private IGbStreamService gbStreamService;
 
     /**
      * 鑾峰彇鍥芥爣鏈嶅姟鐨勯厤缃�
+     *
      * @return
      */
-    @ApiOperation("鑾峰彇鍥芥爣鏈嶅姟鐨勯厤缃�")
+    @Operation(summary = "鑾峰彇鍥芥爣鏈嶅姟鐨勯厤缃�")
     @GetMapping("/server_config")
-    public ResponseEntity<JSONObject> serverConfig() {
+    public 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());
-        return new ResponseEntity<>(result, HttpStatus.OK);
+        result.put("deviceIp", sipConfig.getIp());
+        result.put("devicePort", sipConfig.getPort());
+        result.put("username", sipConfig.getId());
+        result.put("password", sipConfig.getPassword());
+        return result;
+    }
+
+    /**
+     * 鑾峰彇绾ц仈鏈嶅姟鍣ㄤ俊鎭�
+     *
+     * @return
+     */
+    @Operation(summary = "鑾峰彇绾ц仈鏈嶅姟鍣ㄤ俊鎭�")
+    @Parameter(name = "id", description = "骞冲彴鍥芥爣缂栧彿", required = true)
+    @GetMapping("/info/{id}")
+    public ParentPlatform getPlatform(@PathVariable String id) {
+        ParentPlatform parentPlatform = platformService.queryPlatformByServerGBId(id);
+        if (parentPlatform != null) {
+            return  parentPlatform;
+        } else {
+            throw new ControllerException(ErrorCode.ERROR100.getCode(), "鏈煡璇㈠埌姝ゅ钩鍙�");
+        }
     }
 
     /**
      * 鍒嗛〉鏌ヨ绾ц仈骞冲彴
-     * @param page 褰撳墠椤�
+     *
+     * @param page  褰撳墠椤�
      * @param count 姣忛〉鏉℃暟
      * @return
      */
-    @ApiOperation("鍒嗛〉鏌ヨ绾ц仈骞冲彴")
     @GetMapping("/query/{count}/{page}")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "page", value = "褰撳墠椤�", dataTypeClass = Integer.class),
-            @ApiImplicitParam(name = "count", value = "姣忛〉鏉℃暟", dataTypeClass = Integer.class),
-    })
-    public PageInfo<ParentPlatform> platforms(@PathVariable int page, @PathVariable int count){
+    @Operation(summary = "鍒嗛〉鏌ヨ绾ц仈骞冲彴")
+    @Parameter(name = "page", description = "褰撳墠椤�", required = true)
+    @Parameter(name = "count", description = "姣忛〉鏉℃暟", required = true)
+    public PageInfo<ParentPlatform> platforms(@PathVariable int page, @PathVariable int count) {
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("鏌ヨ鎵�鏈変笂绾ц澶嘇PI璋冪敤");
+        PageInfo<ParentPlatform> parentPlatformPageInfo = platformService.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 storager.queryParentPlatformList(page, count);
+        return parentPlatformPageInfo;
     }
 
     /**
-     * 淇濆瓨涓婄骇骞冲彴淇℃伅
+     * 娣诲姞涓婄骇骞冲彴淇℃伅
+     *
      * @param parentPlatform
      * @return
      */
-    @ApiOperation("淇濆瓨涓婄骇骞冲彴淇℃伅")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "parentPlatform", value = "涓婄骇骞冲彴淇℃伅", dataTypeClass = ParentPlatform.class),
-    })
-    @PostMapping("/save")
+    @Operation(summary = "娣诲姞涓婄骇骞冲彴淇℃伅")
+    @PostMapping("/add")
     @ResponseBody
-    public ResponseEntity<String> savePlatform(@RequestBody ParentPlatform parentPlatform){
+    public void addPlatform(@RequestBody ParentPlatform parentPlatform) {
 
         if (logger.isDebugEnabled()) {
             logger.debug("淇濆瓨涓婄骇骞冲彴淇℃伅API璋冪敤");
         }
-        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);
+        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())
+        ) {
+            throw new ControllerException(ErrorCode.ERROR400);
         }
-        // TODO 妫�鏌ユ槸鍚﹀凡缁忓瓨鍦�,涓旀敞鍐屾垚鍔�, 濡傛灉娉ㄥ唽鎴愬姛,闇�瑕佸厛娉ㄩ攢涔嬪墠鍐�,淇敼骞舵敞鍐�
+        if (parentPlatform.getServerPort() < 0 || parentPlatform.getServerPort() > 65535) {
+            throw new ControllerException(ErrorCode.ERROR400.getCode(), "error severPort");
+        }
 
-        // ParentPlatform parentPlatformOld = storager.queryParentPlatById(parentPlatform.getDeviceGBId());
+
         ParentPlatform parentPlatformOld = storager.queryParentPlatByServerGBId(parentPlatform.getServerGBId());
+        if (parentPlatformOld != null) {
+            throw new ControllerException(ErrorCode.ERROR100.getCode(), "骞冲彴 " + parentPlatform.getServerGBId() + " 宸插瓨鍦�");
+        }
+        parentPlatform.setCreateTime(DateUtil.getNow());
+        parentPlatform.setUpdateTime(DateUtil.getNow());
+        boolean updateResult = platformService.add(parentPlatform);
 
-        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);
-            }
-            return new ResponseEntity<>("success", HttpStatus.OK);
-        } else {
-            return new ResponseEntity<>("fail", HttpStatus.OK);
+        if (!updateResult) {
+            throw new ControllerException(ErrorCode.ERROR100.getCode(),"鍐欏叆鏁版嵁搴撳け璐�");
         }
     }
 
     /**
-     * 鍒犻櫎涓婄骇骞冲彴
-      * @param serverGBId 涓婄骇骞冲彴鍥芥爣ID
+     * 淇濆瓨涓婄骇骞冲彴淇℃伅
+     *
+     * @param parentPlatform
      * @return
      */
-    @ApiOperation("鍒犻櫎涓婄骇骞冲彴")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "serverGBId", value = "涓婄骇骞冲彴鍥芥爣ID", dataTypeClass = String.class),
-    })
+    @Operation(summary = "淇濆瓨涓婄骇骞冲彴淇℃伅")
+    @PostMapping("/save")
+    @ResponseBody
+    public void savePlatform(@RequestBody ParentPlatform parentPlatform) {
+
+        if (logger.isDebugEnabled()) {
+            logger.debug("淇濆瓨涓婄骇骞冲彴淇℃伅API璋冪敤");
+        }
+        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())
+        ) {
+            throw new ControllerException(ErrorCode.ERROR400);
+        }
+
+        platformService.update(parentPlatform);
+    }
+
+    /**
+     * 鍒犻櫎涓婄骇骞冲彴
+     *
+     * @param serverGBId 涓婄骇骞冲彴鍥芥爣ID
+     * @return
+     */
+    @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)
-        ){
-            return new ResponseEntity<>("missing parameters", HttpStatus.BAD_REQUEST);
+        if (ObjectUtils.isEmpty(serverGBId)
+        ) {
+            throw new ControllerException(ErrorCode.ERROR400);
         }
         ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(serverGBId);
-        if (parentPlatform == null) return new ResponseEntity<>("fail", HttpStatus.OK);
+        ParentPlatformCatch parentPlatformCatch = redisCatchStorage.queryPlatformCatchInfo(serverGBId);
+        if (parentPlatform == null) {
+            throw new ControllerException(ErrorCode.ERROR100.getCode(), "骞冲彴涓嶅瓨鍦�");
+        }
+        if (parentPlatformCatch == 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, parentPlatformCatch.getSipTransactionInfo(), (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);
-
-
-        if (deleteResult) {
-            return new ResponseEntity<>("success", HttpStatus.OK);
-        }else {
-            return new ResponseEntity<>("fail", HttpStatus.OK);
+        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) {
+            throw new ControllerException(ErrorCode.ERROR100);
         }
     }
 
     /**
      * 鏌ヨ涓婄骇骞冲彴鏄惁瀛樺湪
+     *
      * @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;
     }
 
     /**
      * 鍒嗛〉鏌ヨ绾ц仈骞冲彴鐨勬墍鏈夋墍鏈夐�氶亾
-     * @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
      */
-    @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 = "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),
-    })
+    @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,
-                                              @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 (ObjectUtils.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 (ObjectUtils.isEmpty(query)) {
+            query = null;
         }
+        if (ObjectUtils.isEmpty(platformId) || ObjectUtils.isEmpty(catalogId)) {
+            catalogId = null;
+        }
+        PageInfo<ChannelReduce> channelReduces = storager.queryAllChannelList(page, count, query, online, channelType, platformId, catalogId);
 
         return channelReduces;
     }
 
     /**
      * 鍚戜笂绾у钩鍙版坊鍔犲浗鏍囬�氶亾
+     *
      * @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());
-
-        return new ResponseEntity<>(String.valueOf(result > 0), HttpStatus.OK);
+        int result = 0;
+        if (param.getChannelReduces() == null || param.getChannelReduces().size() == 0) {
+            if (param.isAll()) {
+                logger.info("[鍥芥爣绾ц仈]娣诲姞鎵�鏈夐�氶亾鍒颁笂绾у钩鍙帮紝 {}", param.getPlatformId());
+                List<ChannelReduce> allChannelForDevice = deviceChannelService.queryAllChannelList(param.getPlatformId());
+                result = platformChannelService.updateChannelForGB(param.getPlatformId(), allChannelForDevice, param.getCatalogId());
+            }
+        }else {
+            result = platformChannelService.updateChannelForGB(param.getPlatformId(), param.getChannelReduces(), param.getCatalogId());
+        }
+        if (result <= 0) {
+            throw new ControllerException(ErrorCode.ERROR100);
+        }
     }
 
     /**
      * 浠庝笂绾у钩鍙扮Щ闄ゅ浗鏍囬�氶亾
+     *
      * @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());
+        int result = 0;
+        if (param.getChannelReduces() == null || param.getChannelReduces().size() == 0) {
+            if (param.isAll()) {
+                logger.info("[鍥芥爣绾ц仈]绉婚櫎鎵�鏈夐�氶亾锛屼笂绾у钩鍙帮紝 {}", param.getPlatformId());
+                result = platformChannelService.delAllChannelForGB(param.getPlatformId(), param.getCatalogId());
+            }
+        }else {
+            result = storager.delChannelForGB(param.getPlatformId(), param.getChannelReduces());
+        }
+        if (result <= 0) {
+            throw new ControllerException(ErrorCode.ERROR100);
+        }
+    }
 
-        return new ResponseEntity<>(String.valueOf(result > 0), HttpStatus.OK);
+    /**
+     * 鑾峰彇鐩綍
+     *
+     * @param platformId 骞冲彴ID
+     * @param parentId   鐩綍鐖禝D
+     * @return
+     */
+    @Operation(summary = "鑾峰彇鐩綍")
+    @Parameter(name = "platformId", description = "涓婄骇骞冲彴鐨勫浗鏍囩紪鍙�", required = true)
+    @Parameter(name = "parentId", description = "鐖剁骇鐩綍鐨勫浗鏍囩紪鍙�", required = true)
+    @GetMapping("/catalog")
+    @ResponseBody
+    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) {
+            throw new ControllerException(ErrorCode.ERROR100.getCode(), "骞冲彴鏈壘鍒�");
+        }
+//        if (platformId.equals(parentId)) {
+//            parentId = platform.getDeviceGBId();
+//        }
+
+        if (platformId.equals(platform.getDeviceGBId())) {
+            parentId = null;
+        }
+
+        return storager.getChildrenCatalogByPlatform(platformId, parentId);
+    }
+
+    /**
+     * 娣诲姞鐩綍
+     *
+     * @param platformCatalog 鐩綍
+     * @return
+     */
+    @Operation(summary = "娣诲姞鐩綍")
+    @PostMapping("/catalog/add")
+    @ResponseBody
+    public void addCatalog(@RequestBody PlatformCatalog platformCatalog) {
+
+        if (logger.isDebugEnabled()) {
+            logger.debug("娣诲姞鐩綍,{}", JSON.toJSONString(platformCatalog));
+        }
+        PlatformCatalog platformCatalogInStore = storager.getCatalog(platformCatalog.getPlatformId(), platformCatalog.getId());
+
+        if (platformCatalogInStore != null) {
+            throw new ControllerException(ErrorCode.ERROR100.getCode(), platformCatalog.getId() + " already exists");
+        }
+        int addResult = storager.addCatalog(platformCatalog);
+        if (addResult <= 0) {
+            throw new ControllerException(ErrorCode.ERROR100);
+        }
+    }
+
+    /**
+     * 缂栬緫鐩綍
+     *
+     * @param platformCatalog 鐩綍
+     * @return
+     */
+    @Operation(summary = "缂栬緫鐩綍")
+    @PostMapping("/catalog/edit")
+    @ResponseBody
+    public void editCatalog(@RequestBody PlatformCatalog platformCatalog) {
+
+        if (logger.isDebugEnabled()) {
+            logger.debug("缂栬緫鐩綍,{}", JSON.toJSONString(platformCatalog));
+        }
+        PlatformCatalog platformCatalogInStore = storager.getCatalog(platformCatalog.getPlatformId(), platformCatalog.getId());
+
+        if (platformCatalogInStore == null) {
+            throw new ControllerException(ErrorCode.ERROR100.getCode(), platformCatalog.getId() + " not exists");
+        }
+        int addResult = storager.updateCatalog(platformCatalog);
+        if (addResult <= 0) {
+            throw new ControllerException(ErrorCode.ERROR100.getCode(), "鍐欏叆鏁版嵁搴撳け璐�");
+        }
+    }
+
+    /**
+     * 鍒犻櫎鐩綍
+     *
+     * @param id 鐩綍Id
+     * @param platformId 骞冲彴Id
+     * @return
+     */
+    @Operation(summary = "鍒犻櫎鐩綍")
+    @Parameter(name = "id", description = "鐩綍Id", required = true)
+    @Parameter(name = "platformId", description = "骞冲彴Id", required = true)
+    @DeleteMapping("/catalog/del")
+    @ResponseBody
+    public void delCatalog(String id, String platformId) {
+
+        if (logger.isDebugEnabled()) {
+            logger.debug("鍒犻櫎鐩綍,{}", id);
+        }
+
+        if (ObjectUtils.isEmpty(id) || ObjectUtils.isEmpty(platformId)) {
+            throw new ControllerException(ErrorCode.ERROR400);
+        }
+
+        int delResult = storager.delCatalog(platformId, id);
+        // 濡傛灉鍒犻櫎鐨勬槸榛樿鐩綍鍒欐牴鐩綍璁剧疆涓洪粯璁ょ洰褰�
+        PlatformCatalog parentPlatform = storager.queryDefaultCatalogInPlatform(platformId);
+
+        // 榛樿鑺傜偣琚Щ闄�
+        if (parentPlatform == null) {
+            storager.setDefaultCatalog(platformId, platformId);
+        }
+
+        if (delResult <= 0) {
+            throw new ControllerException(ErrorCode.ERROR100.getCode(), "鍐欏叆鏁版嵁搴撳け璐�");
+        }
+    }
+
+    /**
+     * 鍒犻櫎鍏宠仈
+     *
+     * @param platformCatalog 鍏宠仈鐨勪俊鎭�
+     * @return
+     */
+    @Operation(summary = "鍒犻櫎鍏宠仈")
+    @DeleteMapping("/catalog/relation/del")
+    @ResponseBody
+    public void delRelation(@RequestBody PlatformCatalog platformCatalog) {
+
+        if (logger.isDebugEnabled()) {
+            logger.debug("鍒犻櫎鍏宠仈,{}", JSON.toJSONString(platformCatalog));
+        }
+        int delResult = storager.delRelation(platformCatalog);
+
+        if (delResult <= 0) {
+            throw new ControllerException(ErrorCode.ERROR100.getCode(), "鍐欏叆鏁版嵁搴撳け璐�");
+        }
+    }
+
+
+    /**
+     * 淇敼榛樿鐩綍
+     *
+     * @param platformId 骞冲彴Id
+     * @param catalogId  鐩綍Id
+     * @return
+     */
+    @Operation(summary = "淇敼榛樿鐩綍")
+    @Parameter(name = "catalogId", description = "鐩綍Id", required = true)
+    @Parameter(name = "platformId", description = "骞冲彴Id", required = true)
+    @PostMapping("/catalog/default/update")
+    @ResponseBody
+    public void setDefaultCatalog(String platformId, String catalogId) {
+
+        if (logger.isDebugEnabled()) {
+            logger.debug("淇敼榛樿鐩綍,{},{}", platformId, catalogId);
+        }
+        int updateResult = storager.setDefaultCatalog(platformId, catalogId);
+
+        if (updateResult <= 0) {
+            throw new ControllerException(ErrorCode.ERROR100.getCode(), "鍐欏叆鏁版嵁搴撳け璐�");
+        }
     }
 
 

--
Gitblit v1.8.0