规范数据库，给各个标设置主键ID

src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/gbStream/GbStreamController.java

@@ -67,6 +67,8 @@ public class GbStreamController {
             mediaServerId = null;
         }
 
+        // catalogId 为null 查询未在平台下分配的数据
+        // catalogId 不为null 查询平台下这个，目录下的通道
         return gbStreamService.getAll(page, count, platformId, catalogId, query, pushing, mediaServerId);
     }
 

src/main/java/com/genersoft/iot/vmp/vmanager/streamProxy/StreamProxyController.java

@@ -71,6 +71,7 @@ public class StreamProxyController {
         logger.info("添加代理： " + JSONObject.toJSONString(param));
         if (StringUtils.isEmpty(param.getMediaServerId())) param.setMediaServerId("auto");
         if (StringUtils.isEmpty(param.getType())) param.setType("default");
+        if (StringUtils.isEmpty(param.getGbId())) param.setGbId(null);
         WVPResult<StreamInfo> result = streamProxyService.save(param);
         return result;
     }