Merge branch 'wvp-28181-2.0' into wvp-28181-2.0

hotcoffie

2021-12-01 a16b4f71ec5a4d3d526c9c35a1e1f7843a49e921

 src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java

@@ -73,9 +73,9 @@
    })
    public PageInfo<ParentPlatform> platforms(@PathVariable int page, @PathVariable int count){

        if (logger.isDebugEnabled()) {
            logger.debug("查询所有上级设备API调用");
        }
//        if (logger.isDebugEnabled()) {
//            logger.debug("查询所有上级设备API调用");
//        }
        return storager.queryParentPlatformList(page, count);
    }

@@ -187,9 +187,9 @@
    @ResponseBody
    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);
    }
@@ -224,9 +224,9 @@
                                              @RequestParam(required = false) Boolean choosed,
                                              @RequestParam(required = false) Boolean channelType){

        if (logger.isDebugEnabled()) {
            logger.debug("查询所有所有通道API调用");
        }
//        if (logger.isDebugEnabled()) {
//            logger.debug("查询所有所有通道API调用");
//        }
        PageInfo<ChannelReduce> channelReduces = null;
        if (platformId != null ) {
            channelReduces = storager.queryAllChannelList(page, count, query, online, channelType, platformId, choosed);