Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修复添加业务分组失败

pull/608/head
648540858 2022-09-08 17:51:12 +08:00
parent 394c40d8bb
commit feb9996538
3 changed files with 341 additions and 448 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

302
sql/mysql.sql
View File

@ -1,6 +1,6 @@
-- MySQL dump 10.13 Distrib 8.0.29, for Linux (x86_64) -- MySQL dump 10.13 Distrib 8.0.29, for Linux (x86_64)
-- --
-- Host: 127.0.0.1 Database: wvp2 -- Host: 127.0.0.1 Database: 242wvp
-- ------------------------------------------------------ -- ------------------------------------------------------
-- Server version 8.0.29-0ubuntu0.22.04.3 -- Server version 8.0.29-0ubuntu0.22.04.3
@ -22,8 +22,7 @@
DROP TABLE IF EXISTS `device`; DROP TABLE IF EXISTS `device`;
/*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET @saved_cs_client = @@character_set_client */;
/*!50503 SET character_set_client = utf8mb4 */; /*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `device` CREATE TABLE `device` (
(
`id` int NOT NULL AUTO_INCREMENT, `id` int NOT NULL AUTO_INCREMENT,
`deviceId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `deviceId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
@ -47,15 +46,11 @@ CREATE TABLE `device`
`mobilePositionSubmissionInterval` int DEFAULT '5', `mobilePositionSubmissionInterval` int DEFAULT '5',
`subscribeCycleForAlarm` int DEFAULT NULL, `subscribeCycleForAlarm` int DEFAULT NULL,
`ssrcCheck` int DEFAULT '0', `ssrcCheck` int DEFAULT '0',
`geoCoordSys` varchar(50) COLLATE utf8mb4_general_ci NOT NULL, `geoCoordSys` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`treeType` varchar(50) COLLATE utf8mb4_general_ci NOT NULL, `treeType` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
PRIMARY KEY (`id`) USING BTREE, PRIMARY KEY (`id`),
UNIQUE KEY `device_deviceId_uindex` (`deviceId`) USING BTREE UNIQUE KEY `device_deviceId_uindex` (`deviceId`)
) ENGINE = InnoDB ) ENGINE=InnoDB AUTO_INCREMENT=36 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
AUTO_INCREMENT = 53
DEFAULT CHARSET = utf8mb4
COLLATE = utf8mb4_general_ci
ROW_FORMAT = DYNAMIC;
/*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET character_set_client = @saved_cs_client */;
-- --
@ -63,10 +58,8 @@ CREATE TABLE `device`
-- --
LOCK TABLES `device` WRITE; LOCK TABLES `device` WRITE;
/*!40000 ALTER TABLE `device` /*!40000 ALTER TABLE `device` DISABLE KEYS */;
DISABLE KEYS */; /*!40000 ALTER TABLE `device` ENABLE KEYS */;
/*!40000 ALTER TABLE `device`
ENABLE KEYS */;
UNLOCK TABLES; UNLOCK TABLES;
-- --
@ -76,8 +69,7 @@ UNLOCK TABLES;
DROP TABLE IF EXISTS `device_alarm`; DROP TABLE IF EXISTS `device_alarm`;
/*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET @saved_cs_client = @@character_set_client */;
/*!50503 SET character_set_client = utf8mb4 */; /*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `device_alarm` CREATE TABLE `device_alarm` (
(
`id` int NOT NULL AUTO_INCREMENT, `id` int NOT NULL AUTO_INCREMENT,
`deviceId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `deviceId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`channelId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `channelId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
@ -88,12 +80,9 @@ CREATE TABLE `device_alarm`
`longitude` double DEFAULT NULL, `longitude` double DEFAULT NULL,
`latitude` double DEFAULT NULL, `latitude` double DEFAULT NULL,
`alarmType` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, `alarmType` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
`createTime` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL, `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
DEFAULT CHARSET = utf8mb4
COLLATE = utf8mb4_general_ci
ROW_FORMAT = DYNAMIC;
/*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET character_set_client = @saved_cs_client */;
-- --
@ -101,10 +90,8 @@ CREATE TABLE `device_alarm`
-- --
LOCK TABLES `device_alarm` WRITE; LOCK TABLES `device_alarm` WRITE;
/*!40000 ALTER TABLE `device_alarm` /*!40000 ALTER TABLE `device_alarm` DISABLE KEYS */;
DISABLE KEYS */; /*!40000 ALTER TABLE `device_alarm` ENABLE KEYS */;
/*!40000 ALTER TABLE `device_alarm`
ENABLE KEYS */;
UNLOCK TABLES; UNLOCK TABLES;
-- --
@ -114,8 +101,7 @@ UNLOCK TABLES;
DROP TABLE IF EXISTS `device_channel`; DROP TABLE IF EXISTS `device_channel`;
/*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET @saved_cs_client = @@character_set_client */;
/*!50503 SET character_set_client = utf8mb4 */; /*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `device_channel` CREATE TABLE `device_channel` (
(
`id` int NOT NULL AUTO_INCREMENT, `id` int NOT NULL AUTO_INCREMENT,
`channelId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `channelId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
@ -152,15 +138,11 @@ CREATE TABLE `device_channel`
`longitudeWgs84` double DEFAULT NULL, `longitudeWgs84` double DEFAULT NULL,
`latitudeWgs84` double DEFAULT NULL, `latitudeWgs84` double DEFAULT NULL,
`businessGroupId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, `businessGroupId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
`gpsTime` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL, `gpsTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
PRIMARY KEY (`id`) USING BTREE, PRIMARY KEY (`id`),
UNIQUE KEY `device_channel_id_uindex` (`id`) USING BTREE, UNIQUE KEY `device_channel_id_uindex` (`id`),
UNIQUE KEY `device_channel_pk` (`channelId`, `deviceId`) USING BTREE UNIQUE KEY `device_channel_pk` (`channelId`,`deviceId`)
) ENGINE = InnoDB ) ENGINE=InnoDB AUTO_INCREMENT=60163 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
AUTO_INCREMENT = 19496
DEFAULT CHARSET = utf8mb4
COLLATE = utf8mb4_general_ci
ROW_FORMAT = DYNAMIC;
/*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET character_set_client = @saved_cs_client */;
-- --
@ -168,10 +150,8 @@ CREATE TABLE `device_channel`
-- --
LOCK TABLES `device_channel` WRITE; LOCK TABLES `device_channel` WRITE;
/*!40000 ALTER TABLE `device_channel` /*!40000 ALTER TABLE `device_channel` DISABLE KEYS */;
DISABLE KEYS */; /*!40000 ALTER TABLE `device_channel` ENABLE KEYS */;
/*!40000 ALTER TABLE `device_channel`
ENABLE KEYS */;
UNLOCK TABLES; UNLOCK TABLES;
-- --
@ -181,11 +161,10 @@ UNLOCK TABLES;
DROP TABLE IF EXISTS `device_mobile_position`; DROP TABLE IF EXISTS `device_mobile_position`;
/*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET @saved_cs_client = @@character_set_client */;
/*!50503 SET character_set_client = utf8mb4 */; /*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `device_mobile_position` CREATE TABLE `device_mobile_position` (
(
`id` int NOT NULL AUTO_INCREMENT, `id` int NOT NULL AUTO_INCREMENT,
`deviceId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `deviceId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`channelId` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL, `channelId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`deviceName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, `deviceName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
`time` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `time` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`longitude` double NOT NULL, `longitude` double NOT NULL,
@ -198,13 +177,9 @@ CREATE TABLE `device_mobile_position`
`latitudeGcj02` double DEFAULT NULL, `latitudeGcj02` double DEFAULT NULL,
`longitudeWgs84` double DEFAULT NULL, `longitudeWgs84` double DEFAULT NULL,
`latitudeWgs84` double DEFAULT NULL, `latitudeWgs84` double DEFAULT NULL,
`createTime` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL, `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (`id`)
) ENGINE = InnoDB ) ENGINE=InnoDB AUTO_INCREMENT=55589 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
AUTO_INCREMENT = 6956
DEFAULT CHARSET = utf8mb4
COLLATE = utf8mb4_general_ci
ROW_FORMAT = DYNAMIC;
/*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET character_set_client = @saved_cs_client */;
-- --
@ -212,10 +187,8 @@ CREATE TABLE `device_mobile_position`
-- --
LOCK TABLES `device_mobile_position` WRITE; LOCK TABLES `device_mobile_position` WRITE;
/*!40000 ALTER TABLE `device_mobile_position` /*!40000 ALTER TABLE `device_mobile_position` DISABLE KEYS */;
DISABLE KEYS */; /*!40000 ALTER TABLE `device_mobile_position` ENABLE KEYS */;
/*!40000 ALTER TABLE `device_mobile_position`
ENABLE KEYS */;
UNLOCK TABLES; UNLOCK TABLES;
-- --
@ -225,8 +198,7 @@ UNLOCK TABLES;
DROP TABLE IF EXISTS `gb_stream`; DROP TABLE IF EXISTS `gb_stream`;
/*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET @saved_cs_client = @@character_set_client */;
/*!50503 SET character_set_client = utf8mb4 */; /*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `gb_stream` CREATE TABLE `gb_stream` (
(
`gbStreamId` int NOT NULL AUTO_INCREMENT, `gbStreamId` int NOT NULL AUTO_INCREMENT,
`app` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `app` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`stream` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `stream` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
@ -236,16 +208,11 @@ CREATE TABLE `gb_stream`
`latitude` double DEFAULT NULL, `latitude` double DEFAULT NULL,
`streamType` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, `streamType` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
`mediaServerId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, `mediaServerId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
`createTime` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL, `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
`gpsTime` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
PRIMARY KEY (`gbStreamId`) USING BTREE, PRIMARY KEY (`gbStreamId`) USING BTREE,
UNIQUE KEY `app` (`app`,`stream`) USING BTREE, UNIQUE KEY `app` (`app`,`stream`) USING BTREE,
UNIQUE KEY `gbId` (`gbId`) USING BTREE UNIQUE KEY `gbId` (`gbId`) USING BTREE
) ENGINE = InnoDB ) ENGINE=InnoDB AUTO_INCREMENT=301057 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
AUTO_INCREMENT = 301754
DEFAULT CHARSET = utf8mb4
COLLATE = utf8mb4_general_ci
ROW_FORMAT = DYNAMIC;
/*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET character_set_client = @saved_cs_client */;
-- --
@ -253,10 +220,8 @@ CREATE TABLE `gb_stream`
-- --
LOCK TABLES `gb_stream` WRITE; LOCK TABLES `gb_stream` WRITE;
/*!40000 ALTER TABLE `gb_stream` /*!40000 ALTER TABLE `gb_stream` DISABLE KEYS */;
DISABLE KEYS */; /*!40000 ALTER TABLE `gb_stream` ENABLE KEYS */;
/*!40000 ALTER TABLE `gb_stream`
ENABLE KEYS */;
UNLOCK TABLES; UNLOCK TABLES;
-- --
@ -266,8 +231,7 @@ UNLOCK TABLES;
DROP TABLE IF EXISTS `log`; DROP TABLE IF EXISTS `log`;
/*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET @saved_cs_client = @@character_set_client */;
/*!50503 SET character_set_client = utf8mb4 */; /*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `log` CREATE TABLE `log` (
(
`id` int NOT NULL AUTO_INCREMENT, `id` int NOT NULL AUTO_INCREMENT,
`name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
@ -278,11 +242,7 @@ CREATE TABLE `log`
`username` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `username` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB ) ENGINE=InnoDB AUTO_INCREMENT=727574 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
AUTO_INCREMENT = 42703
DEFAULT CHARSET = utf8mb4
COLLATE = utf8mb4_general_ci
ROW_FORMAT = DYNAMIC;
/*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET character_set_client = @saved_cs_client */;
-- --
@ -290,10 +250,8 @@ CREATE TABLE `log`
-- --
LOCK TABLES `log` WRITE; LOCK TABLES `log` WRITE;
/*!40000 ALTER TABLE `log` /*!40000 ALTER TABLE `log` DISABLE KEYS */;
DISABLE KEYS */; /*!40000 ALTER TABLE `log` ENABLE KEYS */;
/*!40000 ALTER TABLE `log`
ENABLE KEYS */;
UNLOCK TABLES; UNLOCK TABLES;
-- --
@ -303,8 +261,7 @@ UNLOCK TABLES;
DROP TABLE IF EXISTS `media_server`; DROP TABLE IF EXISTS `media_server`;
/*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET @saved_cs_client = @@character_set_client */;
/*!50503 SET character_set_client = utf8mb4 */; /*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `media_server` CREATE TABLE `media_server` (
(
`id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`ip` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `ip` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`hookIp` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `hookIp` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
@ -330,10 +287,7 @@ CREATE TABLE `media_server`
`hookAliveInterval` int NOT NULL, `hookAliveInterval` int NOT NULL,
PRIMARY KEY (`id`) USING BTREE, PRIMARY KEY (`id`) USING BTREE,
UNIQUE KEY `media_server_i` (`ip`,`httpPort`) USING BTREE UNIQUE KEY `media_server_i` (`ip`,`httpPort`) USING BTREE
) ENGINE = InnoDB ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
DEFAULT CHARSET = utf8mb4
COLLATE = utf8mb4_general_ci
ROW_FORMAT = DYNAMIC;
/*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET character_set_client = @saved_cs_client */;
-- --
@ -341,10 +295,8 @@ CREATE TABLE `media_server`
-- --
LOCK TABLES `media_server` WRITE; LOCK TABLES `media_server` WRITE;
/*!40000 ALTER TABLE `media_server` /*!40000 ALTER TABLE `media_server` DISABLE KEYS */;
DISABLE KEYS */; /*!40000 ALTER TABLE `media_server` ENABLE KEYS */;
/*!40000 ALTER TABLE `media_server`
ENABLE KEYS */;
UNLOCK TABLES; UNLOCK TABLES;
-- --
@ -354,8 +306,7 @@ UNLOCK TABLES;
DROP TABLE IF EXISTS `parent_platform`; DROP TABLE IF EXISTS `parent_platform`;
/*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET @saved_cs_client = @@character_set_client */;
/*!50503 SET character_set_client = utf8mb4 */; /*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `parent_platform` CREATE TABLE `parent_platform` (
(
`id` int NOT NULL AUTO_INCREMENT, `id` int NOT NULL AUTO_INCREMENT,
`enable` int DEFAULT NULL, `enable` int DEFAULT NULL,
`name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
@ -379,17 +330,13 @@ CREATE TABLE `parent_platform`
`startOfflinePush` int DEFAULT '0', `startOfflinePush` int DEFAULT '0',
`administrativeDivision` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `administrativeDivision` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`catalogGroup` int DEFAULT '1', `catalogGroup` int DEFAULT '1',
`createTime` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL, `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
`updateTime` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL, `updateTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
`treeType` varchar(50) COLLATE utf8mb4_general_ci NOT NULL, `treeType` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
PRIMARY KEY (`id`) USING BTREE, PRIMARY KEY (`id`),
UNIQUE KEY `parent_platform_id_uindex` (`id`) USING BTREE, UNIQUE KEY `parent_platform_id_uindex` (`id`),
UNIQUE KEY `parent_platform_pk` (`serverGBId`) USING BTREE UNIQUE KEY `parent_platform_pk` (`serverGBId`)
) ENGINE = InnoDB ) ENGINE=InnoDB AUTO_INCREMENT=41 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
AUTO_INCREMENT = 40
DEFAULT CHARSET = utf8mb4
COLLATE = utf8mb4_general_ci
ROW_FORMAT = DYNAMIC;
/*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET character_set_client = @saved_cs_client */;
-- --
@ -397,10 +344,8 @@ CREATE TABLE `parent_platform`
-- --
LOCK TABLES `parent_platform` WRITE; LOCK TABLES `parent_platform` WRITE;
/*!40000 ALTER TABLE `parent_platform` /*!40000 ALTER TABLE `parent_platform` DISABLE KEYS */;
DISABLE KEYS */; /*!40000 ALTER TABLE `parent_platform` ENABLE KEYS */;
/*!40000 ALTER TABLE `parent_platform`
ENABLE KEYS */;
UNLOCK TABLES; UNLOCK TABLES;
-- --
@ -410,19 +355,15 @@ UNLOCK TABLES;
DROP TABLE IF EXISTS `platform_catalog`; DROP TABLE IF EXISTS `platform_catalog`;
/*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET @saved_cs_client = @@character_set_client */;
/*!50503 SET character_set_client = utf8mb4 */; /*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `platform_catalog` CREATE TABLE `platform_catalog` (
(
`id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`platformId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `platformId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`parentId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, `parentId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
`civilCode` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL, `civilCode` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
`businessGroupId` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL, `businessGroupId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
DEFAULT CHARSET = utf8mb4
COLLATE = utf8mb4_general_ci
ROW_FORMAT = DYNAMIC;
/*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET character_set_client = @saved_cs_client */;
-- --
@ -430,10 +371,8 @@ CREATE TABLE `platform_catalog`
-- --
LOCK TABLES `platform_catalog` WRITE; LOCK TABLES `platform_catalog` WRITE;
/*!40000 ALTER TABLE `platform_catalog` /*!40000 ALTER TABLE `platform_catalog` DISABLE KEYS */;
DISABLE KEYS */; /*!40000 ALTER TABLE `platform_catalog` ENABLE KEYS */;
/*!40000 ALTER TABLE `platform_catalog`
ENABLE KEYS */;
UNLOCK TABLES; UNLOCK TABLES;
-- --
@ -443,18 +382,13 @@ UNLOCK TABLES;
DROP TABLE IF EXISTS `platform_gb_channel`; DROP TABLE IF EXISTS `platform_gb_channel`;
/*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET @saved_cs_client = @@character_set_client */;
/*!50503 SET character_set_client = utf8mb4 */; /*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `platform_gb_channel` CREATE TABLE `platform_gb_channel` (
(
`id` int NOT NULL AUTO_INCREMENT, `id` int NOT NULL AUTO_INCREMENT,
`platformId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `platformId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`catalogId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `catalogId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`deviceChannelId` int NOT NULL, `deviceChannelId` int NOT NULL,
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (`id`)
) ENGINE = InnoDB ) ENGINE=InnoDB AUTO_INCREMENT=51 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
AUTO_INCREMENT = 4915
DEFAULT CHARSET = utf8mb4
COLLATE = utf8mb4_general_ci
ROW_FORMAT = DYNAMIC;
/*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET character_set_client = @saved_cs_client */;
-- --
@ -462,10 +396,8 @@ CREATE TABLE `platform_gb_channel`
-- --
LOCK TABLES `platform_gb_channel` WRITE; LOCK TABLES `platform_gb_channel` WRITE;
/*!40000 ALTER TABLE `platform_gb_channel` /*!40000 ALTER TABLE `platform_gb_channel` DISABLE KEYS */;
DISABLE KEYS */; /*!40000 ALTER TABLE `platform_gb_channel` ENABLE KEYS */;
/*!40000 ALTER TABLE `platform_gb_channel`
ENABLE KEYS */;
UNLOCK TABLES; UNLOCK TABLES;
-- --
@ -475,19 +407,14 @@ UNLOCK TABLES;
DROP TABLE IF EXISTS `platform_gb_stream`; DROP TABLE IF EXISTS `platform_gb_stream`;
/*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET @saved_cs_client = @@character_set_client */;
/*!50503 SET character_set_client = utf8mb4 */; /*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `platform_gb_stream` CREATE TABLE `platform_gb_stream` (
(
`platformId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `platformId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`catalogId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `catalogId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`gbStreamId` int NOT NULL, `gbStreamId` int NOT NULL,
`id` int NOT NULL AUTO_INCREMENT, `id` int NOT NULL AUTO_INCREMENT,
PRIMARY KEY (`id`) USING BTREE, PRIMARY KEY (`id`),
UNIQUE KEY `platform_gb_stream_pk` (`platformId`, `catalogId`, `gbStreamId`) USING BTREE UNIQUE KEY `platform_gb_stream_pk` (`platformId`,`catalogId`,`gbStreamId`)
) ENGINE = InnoDB ) ENGINE=InnoDB AUTO_INCREMENT=301759 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
AUTO_INCREMENT = 302149
DEFAULT CHARSET = utf8mb4
COLLATE = utf8mb4_general_ci
ROW_FORMAT = DYNAMIC;
/*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET character_set_client = @saved_cs_client */;
-- --
@ -495,10 +422,8 @@ CREATE TABLE `platform_gb_stream`
-- --
LOCK TABLES `platform_gb_stream` WRITE; LOCK TABLES `platform_gb_stream` WRITE;
/*!40000 ALTER TABLE `platform_gb_stream` /*!40000 ALTER TABLE `platform_gb_stream` DISABLE KEYS */;
DISABLE KEYS */; /*!40000 ALTER TABLE `platform_gb_stream` ENABLE KEYS */;
/*!40000 ALTER TABLE `platform_gb_stream`
ENABLE KEYS */;
UNLOCK TABLES; UNLOCK TABLES;
-- --
@ -508,8 +433,7 @@ UNLOCK TABLES;
DROP TABLE IF EXISTS `stream_proxy`; DROP TABLE IF EXISTS `stream_proxy`;
/*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET @saved_cs_client = @@character_set_client */;
/*!50503 SET character_set_client = utf8mb4 */; /*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `stream_proxy` CREATE TABLE `stream_proxy` (
(
`id` int NOT NULL AUTO_INCREMENT, `id` int NOT NULL AUTO_INCREMENT,
`type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`app` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `app` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
@ -528,14 +452,10 @@ CREATE TABLE `stream_proxy`
`enable_remove_none_reader` bit(1) NOT NULL, `enable_remove_none_reader` bit(1) NOT NULL,
`createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
`updateTime` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL, `updateTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
PRIMARY KEY (`id`) USING BTREE, PRIMARY KEY (`id`),
UNIQUE KEY `stream_proxy_pk` (`app`, `stream`) USING BTREE UNIQUE KEY `stream_proxy_pk` (`app`,`stream`)
) ENGINE = InnoDB ) ENGINE=InnoDB AUTO_INCREMENT=545 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
AUTO_INCREMENT = 66
DEFAULT CHARSET = utf8mb4
COLLATE = utf8mb4_general_ci
ROW_FORMAT = DYNAMIC;
/*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET character_set_client = @saved_cs_client */;
-- --
@ -543,10 +463,8 @@ CREATE TABLE `stream_proxy`
-- --
LOCK TABLES `stream_proxy` WRITE; LOCK TABLES `stream_proxy` WRITE;
/*!40000 ALTER TABLE `stream_proxy` /*!40000 ALTER TABLE `stream_proxy` DISABLE KEYS */;
DISABLE KEYS */; /*!40000 ALTER TABLE `stream_proxy` ENABLE KEYS */;
/*!40000 ALTER TABLE `stream_proxy`
ENABLE KEYS */;
UNLOCK TABLES; UNLOCK TABLES;
-- --
@ -556,30 +474,25 @@ UNLOCK TABLES;
DROP TABLE IF EXISTS `stream_push`; DROP TABLE IF EXISTS `stream_push`;
/*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET @saved_cs_client = @@character_set_client */;
/*!50503 SET character_set_client = utf8mb4 */; /*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `stream_push` CREATE TABLE `stream_push` (
(
`id` int NOT NULL AUTO_INCREMENT, `id` int NOT NULL AUTO_INCREMENT,
`app` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `app` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`stream` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `stream` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`totalReaderCount` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, `totalReaderCount` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
`originType` int DEFAULT NULL, `originType` int DEFAULT NULL,
`originTypeStr` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, `originTypeStr` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
`createTime` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL, `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
`aliveSecond` int DEFAULT NULL, `aliveSecond` int DEFAULT NULL,
`mediaServerId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, `mediaServerId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
`serverId` varchar(50) COLLATE utf8mb4_general_ci NOT NULL, `serverId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`pushTime` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL, `pushTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
`updateTime` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
`status` int DEFAULT NULL, `status` int DEFAULT NULL,
`updateTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
`pushIng` int DEFAULT NULL, `pushIng` int DEFAULT NULL,
`self` int DEFAULT NULL, `self` int DEFAULT NULL,
PRIMARY KEY (`id`) USING BTREE, PRIMARY KEY (`id`),
UNIQUE KEY `stream_push_pk` (`app`, `stream`) USING BTREE UNIQUE KEY `stream_push_pk` (`app`,`stream`)
) ENGINE = InnoDB ) ENGINE=InnoDB AUTO_INCREMENT=310546 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
AUTO_INCREMENT = 305415
DEFAULT CHARSET = utf8mb4
COLLATE = utf8mb4_general_ci
ROW_FORMAT = DYNAMIC;
/*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET character_set_client = @saved_cs_client */;
-- --
@ -587,10 +500,8 @@ CREATE TABLE `stream_push`
-- --
LOCK TABLES `stream_push` WRITE; LOCK TABLES `stream_push` WRITE;
/*!40000 ALTER TABLE `stream_push` /*!40000 ALTER TABLE `stream_push` DISABLE KEYS */;
DISABLE KEYS */; /*!40000 ALTER TABLE `stream_push` ENABLE KEYS */;
/*!40000 ALTER TABLE `stream_push`
ENABLE KEYS */;
UNLOCK TABLES; UNLOCK TABLES;
-- --
@ -600,22 +511,17 @@ UNLOCK TABLES;
DROP TABLE IF EXISTS `user`; DROP TABLE IF EXISTS `user`;
/*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET @saved_cs_client = @@character_set_client */;
/*!50503 SET character_set_client = utf8mb4 */; /*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `user` CREATE TABLE `user` (
(
`id` int NOT NULL AUTO_INCREMENT, `id` int NOT NULL AUTO_INCREMENT,
`username` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `username` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`password` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `password` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`roleId` int NOT NULL, `roleId` int NOT NULL,
`createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`updateTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `updateTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`pushKey` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL, `pushKey` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
PRIMARY KEY (`id`) USING BTREE, PRIMARY KEY (`id`) USING BTREE,
UNIQUE KEY `user_username_uindex` (`username`) USING BTREE UNIQUE KEY `user_username_uindex` (`username`) USING BTREE
) ENGINE = InnoDB ) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
AUTO_INCREMENT = 2
DEFAULT CHARSET = utf8mb4
COLLATE = utf8mb4_general_ci
ROW_FORMAT = DYNAMIC;
/*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET character_set_client = @saved_cs_client */;
-- --
@ -623,13 +529,9 @@ CREATE TABLE `user`
-- --
LOCK TABLES `user` WRITE; LOCK TABLES `user` WRITE;
/*!40000 ALTER TABLE `user` /*!40000 ALTER TABLE `user` DISABLE KEYS */;
DISABLE KEYS */; INSERT INTO `user` VALUES (1,'admin','21232f297a57a5a743894a0e4a801fc3',1,'2021 - 04 - 13 14:14:57','2021 - 04 - 13 14:14:57','3e80d1762a324d5b0ff636e0bd16f1e3');
INSERT INTO `user` /*!40000 ALTER TABLE `user` ENABLE KEYS */;
VALUES (1, 'admin', '21232f297a57a5a743894a0e4a801fc3', 1, '2021 - 04 - 13 14:14:57', '2021 - 04 - 13 14:14:57',
'01685cb9573ae25ec6c52142402da7c5');
/*!40000 ALTER TABLE `user`
ENABLE KEYS */;
UNLOCK TABLES; UNLOCK TABLES;
-- --
@ -639,19 +541,14 @@ UNLOCK TABLES;
DROP TABLE IF EXISTS `user_role`; DROP TABLE IF EXISTS `user_role`;
/*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET @saved_cs_client = @@character_set_client */;
/*!50503 SET character_set_client = utf8mb4 */; /*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `user_role` CREATE TABLE `user_role` (
(
`id` int NOT NULL AUTO_INCREMENT, `id` int NOT NULL AUTO_INCREMENT,
`name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`authority` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `authority` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`updateTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `updateTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB ) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
AUTO_INCREMENT = 2
DEFAULT CHARSET = utf8mb4
COLLATE = utf8mb4_general_ci
ROW_FORMAT = DYNAMIC;
/*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET character_set_client = @saved_cs_client */;
-- --
@ -659,12 +556,9 @@ CREATE TABLE `user_role`
-- --
LOCK TABLES `user_role` WRITE; LOCK TABLES `user_role` WRITE;
/*!40000 ALTER TABLE `user_role` /*!40000 ALTER TABLE `user_role` DISABLE KEYS */;
DISABLE KEYS */; INSERT INTO `user_role` VALUES (1,'admin','0','2021-04-13 14:14:57','2021-04-13 14:14:57');
INSERT INTO `user_role` /*!40000 ALTER TABLE `user_role` ENABLE KEYS */;
VALUES (1, 'admin', '0 ', '2021 - 04 - 13 14:14:57', '2021 - 04 - 13 14:14:57');
/*!40000 ALTER TABLE `user_role`
ENABLE KEYS */;
UNLOCK TABLES; UNLOCK TABLES;
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
@ -676,4 +570,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2022-07-27 14:51:08 -- Dump completed on 2022-09-08 16:46:27

1
src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java
View File

@ -428,7 +428,6 @@ public class StreamPushServiceImpl implements IStreamPushService {
platformId, platformForEvent.get(platformId), CatalogEvent.ADD); platformId, platformForEvent.get(platformId), CatalogEvent.ADD);
} }
} }
} }
} }

2
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java
View File

@ -695,7 +695,7 @@ public class VideoManagerStorageImpl implements IVideoManagerStorage {
return 0; return 0;
} }
if (platform.getTreeType().equals(TreeType.BUSINESS_GROUP)) { if (platform.getTreeType().equals(TreeType.BUSINESS_GROUP)) {
if (platformCatalog.getPlatformId().equals(platformCatalog.getParentId())) { if (platform.getDeviceGBId().equals(platformCatalog.getParentId())) {
// 第一层节点 // 第一层节点
platformCatalog.setBusinessGroupId(platformCatalog.getId()); platformCatalog.setBusinessGroupId(platformCatalog.getId());
platformCatalog.setParentId(platform.getDeviceGBId()); platformCatalog.setParentId(platform.getDeviceGBId());