guzijian / wvp-GB28181-pro · Commits

Commit feb9996538272a507fcafbc1e068ac5676eb342b

Authored by 648540858
1 parent 394c40d8

修复添加业务分组失败

Inline Side-by-side
Showing 3 changed files with 341 additions and 448 deletions
sql/mysql.sql
  View file @feb9996
1 -- MySQL dump 10.13 Distrib 8.0.29, for Linux (x86_64) 1 -- MySQL dump 10.13 Distrib 8.0.29, for Linux (x86_64)
2 -- 2 --
3 --- Host: 127.0.0.1 Database: wvp2 3 +-- Host: 127.0.0.1 Database: 242wvp
4 -- ------------------------------------------------------ 4 -- ------------------------------------------------------
5 -- Server version 8.0.29-0ubuntu0.22.04.3 5 -- Server version 8.0.29-0ubuntu0.22.04.3
6 6
7 -/*!40101 SET @OLD_CHARACTER_SET_CLIENT = @@CHARACTER_SET_CLIENT */;  
8 -/*!40101 SET @OLD_CHARACTER_SET_RESULTS = @@CHARACTER_SET_RESULTS */;  
9 -/*!40101 SET @OLD_COLLATION_CONNECTION = @@COLLATION_CONNECTION */; 7 +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
  8 +/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
  9 +/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
10 /*!50503 SET NAMES utf8mb4 */; 10 /*!50503 SET NAMES utf8mb4 */;
11 -/*!40103 SET @OLD_TIME_ZONE = @@TIME_ZONE */;  
12 -/*!40103 SET TIME_ZONE = ' + 00:00' */;  
13 -/*!40014 SET @OLD_UNIQUE_CHECKS = @@UNIQUE_CHECKS, UNIQUE_CHECKS = 0 */;  
14 -/*!40014 SET @OLD_FOREIGN_KEY_CHECKS = @@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS = 0 */;  
15 -/*!40101 SET @OLD_SQL_MODE = @@SQL_MODE, SQL_MODE = 'NO_AUTO_VALUE_ON_ZERO' */;  
16 -/*!40111 SET @OLD_SQL_NOTES = @@SQL_NOTES, SQL_NOTES = 0 */; 11 +/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
  12 +/*!40103 SET TIME_ZONE='+00:00' */;
  13 +/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
  14 +/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
  15 +/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
  16 +/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
17 17
18 -- 18 --
19 -- Table structure for table `device` 19 -- Table structure for table `device`
20 -- 20 --
21 21
22 DROP TABLE IF EXISTS `device`; 22 DROP TABLE IF EXISTS `device`;
23 -/*!40101 SET @saved_cs_client = @@character_set_client */; 23 +/*!40101 SET @saved_cs_client = @@character_set_client */;
24 /*!50503 SET character_set_client = utf8mb4 */; 24 /*!50503 SET character_set_client = utf8mb4 */;
25 -CREATE TABLE `device`  
26 -(  
27 - `id` int NOT NULL AUTO_INCREMENT,  
28 - `deviceId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
29 - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
30 - `manufacturer` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
31 - `model` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
32 - `firmware` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
33 - `transport` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
34 - `streamMode` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
35 - `online` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
36 - `registerTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
37 - `keepaliveTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
38 - `ip` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
39 - `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
40 - `updateTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
41 - `port` int NOT NULL,  
42 - `expires` int NOT NULL,  
43 - `subscribeCycleForCatalog` int NOT NULL,  
44 - `hostAddress` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
45 - `charset` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
46 - `subscribeCycleForMobilePosition` int DEFAULT NULL,  
47 - `mobilePositionSubmissionInterval` int DEFAULT '5 ',  
48 - `subscribeCycleForAlarm` int DEFAULT NULL,  
49 - `ssrcCheck` int DEFAULT '0 ',  
50 - `geoCoordSys` varchar(50) COLLATE utf8mb4_general_ci NOT NULL,  
51 - `treeType` varchar(50) COLLATE utf8mb4_general_ci NOT NULL,  
52 - PRIMARY KEY (`id`) USING BTREE,  
53 - UNIQUE KEY `device_deviceId_uindex` (`deviceId`) USING BTREE  
54 -) ENGINE = InnoDB  
55 - AUTO_INCREMENT = 53  
56 - DEFAULT CHARSET = utf8mb4  
57 - COLLATE = utf8mb4_general_ci  
58 - ROW_FORMAT = DYNAMIC; 25 +CREATE TABLE `device` (
  26 + `id` int NOT NULL AUTO_INCREMENT,
  27 + `deviceId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  28 + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  29 + `manufacturer` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  30 + `model` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  31 + `firmware` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  32 + `transport` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  33 + `streamMode` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  34 + `online` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  35 + `registerTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  36 + `keepaliveTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  37 + `ip` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  38 + `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  39 + `updateTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  40 + `port` int NOT NULL,
  41 + `expires` int NOT NULL,
  42 + `subscribeCycleForCatalog` int NOT NULL,
  43 + `hostAddress` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  44 + `charset` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  45 + `subscribeCycleForMobilePosition` int DEFAULT NULL,
  46 + `mobilePositionSubmissionInterval` int DEFAULT '5',
  47 + `subscribeCycleForAlarm` int DEFAULT NULL,
  48 + `ssrcCheck` int DEFAULT '0',
  49 + `geoCoordSys` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  50 + `treeType` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  51 + PRIMARY KEY (`id`),
  52 + UNIQUE KEY `device_deviceId_uindex` (`deviceId`)
  53 +) ENGINE=InnoDB AUTO_INCREMENT=36 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
59 /*!40101 SET character_set_client = @saved_cs_client */; 54 /*!40101 SET character_set_client = @saved_cs_client */;
60 55
61 -- 56 --
@@ -63,10 +58,8 @@ CREATE TABLE `device` @@ -63,10 +58,8 @@ CREATE TABLE `device`
63 -- 58 --
64 59
65 LOCK TABLES `device` WRITE; 60 LOCK TABLES `device` WRITE;
66 -/*!40000 ALTER TABLE `device`  
67 - DISABLE KEYS */;  
68 -/*!40000 ALTER TABLE `device`  
69 - ENABLE KEYS */; 61 +/*!40000 ALTER TABLE `device` DISABLE KEYS */;
  62 +/*!40000 ALTER TABLE `device` ENABLE KEYS */;
70 UNLOCK TABLES; 63 UNLOCK TABLES;
71 64
72 -- 65 --
@@ -74,26 +67,22 @@ UNLOCK TABLES; @@ -74,26 +67,22 @@ UNLOCK TABLES;
74 -- 67 --
75 68
76 DROP TABLE IF EXISTS `device_alarm`; 69 DROP TABLE IF EXISTS `device_alarm`;
77 -/*!40101 SET @saved_cs_client = @@character_set_client */; 70 +/*!40101 SET @saved_cs_client = @@character_set_client */;
78 /*!50503 SET character_set_client = utf8mb4 */; 71 /*!50503 SET character_set_client = utf8mb4 */;
79 -CREATE TABLE `device_alarm`  
80 -(  
81 - `id` int NOT NULL AUTO_INCREMENT,  
82 - `deviceId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
83 - `channelId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
84 - `alarmPriority` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
85 - `alarmMethod` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
86 - `alarmTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
87 - `alarmDescription` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
88 - `longitude` double DEFAULT NULL,  
89 - `latitude` double DEFAULT NULL,  
90 - `alarmType` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
91 - `createTime` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,  
92 - PRIMARY KEY (`id`) USING BTREE  
93 -) ENGINE = InnoDB  
94 - DEFAULT CHARSET = utf8mb4  
95 - COLLATE = utf8mb4_general_ci  
96 - ROW_FORMAT = DYNAMIC; 72 +CREATE TABLE `device_alarm` (
  73 + `id` int NOT NULL AUTO_INCREMENT,
  74 + `deviceId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  75 + `channelId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  76 + `alarmPriority` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  77 + `alarmMethod` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  78 + `alarmTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  79 + `alarmDescription` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  80 + `longitude` double DEFAULT NULL,
  81 + `latitude` double DEFAULT NULL,
  82 + `alarmType` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  83 + `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  84 + PRIMARY KEY (`id`) USING BTREE
  85 +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
97 /*!40101 SET character_set_client = @saved_cs_client */; 86 /*!40101 SET character_set_client = @saved_cs_client */;
98 87
99 -- 88 --
@@ -101,10 +90,8 @@ CREATE TABLE `device_alarm` @@ -101,10 +90,8 @@ CREATE TABLE `device_alarm`
101 -- 90 --
102 91
103 LOCK TABLES `device_alarm` WRITE; 92 LOCK TABLES `device_alarm` WRITE;
104 -/*!40000 ALTER TABLE `device_alarm`  
105 - DISABLE KEYS */;  
106 -/*!40000 ALTER TABLE `device_alarm`  
107 - ENABLE KEYS */; 93 +/*!40000 ALTER TABLE `device_alarm` DISABLE KEYS */;
  94 +/*!40000 ALTER TABLE `device_alarm` ENABLE KEYS */;
108 UNLOCK TABLES; 95 UNLOCK TABLES;
109 96
110 -- 97 --
@@ -112,55 +99,50 @@ UNLOCK TABLES; @@ -112,55 +99,50 @@ UNLOCK TABLES;
112 -- 99 --
113 100
114 DROP TABLE IF EXISTS `device_channel`; 101 DROP TABLE IF EXISTS `device_channel`;
115 -/*!40101 SET @saved_cs_client = @@character_set_client */; 102 +/*!40101 SET @saved_cs_client = @@character_set_client */;
116 /*!50503 SET character_set_client = utf8mb4 */; 103 /*!50503 SET character_set_client = utf8mb4 */;
117 -CREATE TABLE `device_channel`  
118 -(  
119 - `id` int NOT NULL AUTO_INCREMENT,  
120 - `channelId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
121 - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
122 - `manufacture` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
123 - `model` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
124 - `owner` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
125 - `civilCode` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
126 - `block` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
127 - `address` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
128 - `parentId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
129 - `safetyWay` int DEFAULT NULL,  
130 - `registerWay` int DEFAULT NULL,  
131 - `certNum` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
132 - `certifiable` int DEFAULT NULL,  
133 - `errCode` int DEFAULT NULL,  
134 - `endTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
135 - `secrecy` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
136 - `ipAddress` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
137 - `port` int DEFAULT NULL,  
138 - `password` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
139 - `PTZType` int DEFAULT NULL,  
140 - `status` int DEFAULT NULL,  
141 - `longitude` double DEFAULT NULL,  
142 - `latitude` double DEFAULT NULL,  
143 - `streamId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
144 - `deviceId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
145 - `parental` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
146 - `hasAudio` bit(1) DEFAULT NULL,  
147 - `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
148 - `updateTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
149 - `subCount` int DEFAULT '0 ',  
150 - `longitudeGcj02` double DEFAULT NULL,  
151 - `latitudeGcj02` double DEFAULT NULL,  
152 - `longitudeWgs84` double DEFAULT NULL,  
153 - `latitudeWgs84` double DEFAULT NULL,  
154 - `businessGroupId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
155 - `gpsTime` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,  
156 - PRIMARY KEY (`id`) USING BTREE,  
157 - UNIQUE KEY `device_channel_id_uindex` (`id`) USING BTREE,  
158 - UNIQUE KEY `device_channel_pk` (`channelId`, `deviceId`) USING BTREE  
159 -) ENGINE = InnoDB  
160 - AUTO_INCREMENT = 19496  
161 - DEFAULT CHARSET = utf8mb4  
162 - COLLATE = utf8mb4_general_ci  
163 - ROW_FORMAT = DYNAMIC; 104 +CREATE TABLE `device_channel` (
  105 + `id` int NOT NULL AUTO_INCREMENT,
  106 + `channelId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  107 + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  108 + `manufacture` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  109 + `model` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  110 + `owner` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  111 + `civilCode` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  112 + `block` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  113 + `address` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  114 + `parentId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  115 + `safetyWay` int DEFAULT NULL,
  116 + `registerWay` int DEFAULT NULL,
  117 + `certNum` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  118 + `certifiable` int DEFAULT NULL,
  119 + `errCode` int DEFAULT NULL,
  120 + `endTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  121 + `secrecy` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  122 + `ipAddress` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  123 + `port` int DEFAULT NULL,
  124 + `password` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  125 + `PTZType` int DEFAULT NULL,
  126 + `status` int DEFAULT NULL,
  127 + `longitude` double DEFAULT NULL,
  128 + `latitude` double DEFAULT NULL,
  129 + `streamId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  130 + `deviceId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  131 + `parental` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  132 + `hasAudio` bit(1) DEFAULT NULL,
  133 + `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  134 + `updateTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  135 + `subCount` int DEFAULT '0',
  136 + `longitudeGcj02` double DEFAULT NULL,
  137 + `latitudeGcj02` double DEFAULT NULL,
  138 + `longitudeWgs84` double DEFAULT NULL,
  139 + `latitudeWgs84` double DEFAULT NULL,
  140 + `businessGroupId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  141 + `gpsTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  142 + PRIMARY KEY (`id`),
  143 + UNIQUE KEY `device_channel_id_uindex` (`id`),
  144 + UNIQUE KEY `device_channel_pk` (`channelId`,`deviceId`)
  145 +) ENGINE=InnoDB AUTO_INCREMENT=60163 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
164 /*!40101 SET character_set_client = @saved_cs_client */; 146 /*!40101 SET character_set_client = @saved_cs_client */;
165 147
166 -- 148 --
@@ -168,10 +150,8 @@ CREATE TABLE `device_channel` @@ -168,10 +150,8 @@ CREATE TABLE `device_channel`
168 -- 150 --
169 151
170 LOCK TABLES `device_channel` WRITE; 152 LOCK TABLES `device_channel` WRITE;
171 -/*!40000 ALTER TABLE `device_channel`  
172 - DISABLE KEYS */;  
173 -/*!40000 ALTER TABLE `device_channel`  
174 - ENABLE KEYS */; 153 +/*!40000 ALTER TABLE `device_channel` DISABLE KEYS */;
  154 +/*!40000 ALTER TABLE `device_channel` ENABLE KEYS */;
175 UNLOCK TABLES; 155 UNLOCK TABLES;
176 156
177 -- 157 --
@@ -179,32 +159,27 @@ UNLOCK TABLES; @@ -179,32 +159,27 @@ UNLOCK TABLES;
179 -- 159 --
180 160
181 DROP TABLE IF EXISTS `device_mobile_position`; 161 DROP TABLE IF EXISTS `device_mobile_position`;
182 -/*!40101 SET @saved_cs_client = @@character_set_client */; 162 +/*!40101 SET @saved_cs_client = @@character_set_client */;
183 /*!50503 SET character_set_client = utf8mb4 */; 163 /*!50503 SET character_set_client = utf8mb4 */;
184 -CREATE TABLE `device_mobile_position`  
185 -(  
186 - `id` int NOT NULL AUTO_INCREMENT,  
187 - `deviceId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
188 - `channelId` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,  
189 - `deviceName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
190 - `time` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
191 - `longitude` double NOT NULL,  
192 - `latitude` double NOT NULL,  
193 - `altitude` double DEFAULT NULL,  
194 - `speed` double DEFAULT NULL,  
195 - `direction` double DEFAULT NULL,  
196 - `reportSource` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
197 - `longitudeGcj02` double DEFAULT NULL,  
198 - `latitudeGcj02` double DEFAULT NULL,  
199 - `longitudeWgs84` double DEFAULT NULL,  
200 - `latitudeWgs84` double DEFAULT NULL,  
201 - `createTime` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,  
202 - PRIMARY KEY (`id`) USING BTREE  
203 -) ENGINE = InnoDB  
204 - AUTO_INCREMENT = 6956  
205 - DEFAULT CHARSET = utf8mb4  
206 - COLLATE = utf8mb4_general_ci  
207 - ROW_FORMAT = DYNAMIC; 164 +CREATE TABLE `device_mobile_position` (
  165 + `id` int NOT NULL AUTO_INCREMENT,
  166 + `deviceId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  167 + `channelId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  168 + `deviceName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  169 + `time` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  170 + `longitude` double NOT NULL,
  171 + `latitude` double NOT NULL,
  172 + `altitude` double DEFAULT NULL,
  173 + `speed` double DEFAULT NULL,
  174 + `direction` double DEFAULT NULL,
  175 + `reportSource` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  176 + `longitudeGcj02` double DEFAULT NULL,
  177 + `latitudeGcj02` double DEFAULT NULL,
  178 + `longitudeWgs84` double DEFAULT NULL,
  179 + `latitudeWgs84` double DEFAULT NULL,
  180 + `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  181 + PRIMARY KEY (`id`)
  182 +) ENGINE=InnoDB AUTO_INCREMENT=55589 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
208 /*!40101 SET character_set_client = @saved_cs_client */; 183 /*!40101 SET character_set_client = @saved_cs_client */;
209 184
210 -- 185 --
@@ -212,10 +187,8 @@ CREATE TABLE `device_mobile_position` @@ -212,10 +187,8 @@ CREATE TABLE `device_mobile_position`
212 -- 187 --
213 188
214 LOCK TABLES `device_mobile_position` WRITE; 189 LOCK TABLES `device_mobile_position` WRITE;
215 -/*!40000 ALTER TABLE `device_mobile_position`  
216 - DISABLE KEYS */;  
217 -/*!40000 ALTER TABLE `device_mobile_position`  
218 - ENABLE KEYS */; 190 +/*!40000 ALTER TABLE `device_mobile_position` DISABLE KEYS */;
  191 +/*!40000 ALTER TABLE `device_mobile_position` ENABLE KEYS */;
219 UNLOCK TABLES; 192 UNLOCK TABLES;
220 193
221 -- 194 --
@@ -223,29 +196,23 @@ UNLOCK TABLES; @@ -223,29 +196,23 @@ UNLOCK TABLES;
223 -- 196 --
224 197
225 DROP TABLE IF EXISTS `gb_stream`; 198 DROP TABLE IF EXISTS `gb_stream`;
226 -/*!40101 SET @saved_cs_client = @@character_set_client */; 199 +/*!40101 SET @saved_cs_client = @@character_set_client */;
227 /*!50503 SET character_set_client = utf8mb4 */; 200 /*!50503 SET character_set_client = utf8mb4 */;
228 -CREATE TABLE `gb_stream`  
229 -(  
230 - `gbStreamId` int NOT NULL AUTO_INCREMENT,  
231 - `app` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
232 - `stream` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
233 - `gbId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
234 - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
235 - `longitude` double DEFAULT NULL,  
236 - `latitude` double DEFAULT NULL,  
237 - `streamType` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
238 - `mediaServerId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
239 - `createTime` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,  
240 - `gpsTime` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,  
241 - PRIMARY KEY (`gbStreamId`) USING BTREE,  
242 - UNIQUE KEY `app` (`app`, `stream`) USING BTREE,  
243 - UNIQUE KEY `gbId` (`gbId`) USING BTREE  
244 -) ENGINE = InnoDB  
245 - AUTO_INCREMENT = 301754  
246 - DEFAULT CHARSET = utf8mb4  
247 - COLLATE = utf8mb4_general_ci  
248 - ROW_FORMAT = DYNAMIC; 201 +CREATE TABLE `gb_stream` (
  202 + `gbStreamId` int NOT NULL AUTO_INCREMENT,
  203 + `app` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  204 + `stream` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  205 + `gbId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  206 + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  207 + `longitude` double DEFAULT NULL,
  208 + `latitude` double DEFAULT NULL,
  209 + `streamType` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  210 + `mediaServerId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  211 + `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  212 + PRIMARY KEY (`gbStreamId`) USING BTREE,
  213 + UNIQUE KEY `app` (`app`,`stream`) USING BTREE,
  214 + UNIQUE KEY `gbId` (`gbId`) USING BTREE
  215 +) ENGINE=InnoDB AUTO_INCREMENT=301057 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
249 /*!40101 SET character_set_client = @saved_cs_client */; 216 /*!40101 SET character_set_client = @saved_cs_client */;
250 217
251 -- 218 --
@@ -253,10 +220,8 @@ CREATE TABLE `gb_stream` @@ -253,10 +220,8 @@ CREATE TABLE `gb_stream`
253 -- 220 --
254 221
255 LOCK TABLES `gb_stream` WRITE; 222 LOCK TABLES `gb_stream` WRITE;
256 -/*!40000 ALTER TABLE `gb_stream`  
257 - DISABLE KEYS */;  
258 -/*!40000 ALTER TABLE `gb_stream`  
259 - ENABLE KEYS */; 223 +/*!40000 ALTER TABLE `gb_stream` DISABLE KEYS */;
  224 +/*!40000 ALTER TABLE `gb_stream` ENABLE KEYS */;
260 UNLOCK TABLES; 225 UNLOCK TABLES;
261 226
262 -- 227 --
@@ -264,25 +229,20 @@ UNLOCK TABLES; @@ -264,25 +229,20 @@ UNLOCK TABLES;
264 -- 229 --
265 230
266 DROP TABLE IF EXISTS `log`; 231 DROP TABLE IF EXISTS `log`;
267 -/*!40101 SET @saved_cs_client = @@character_set_client */; 232 +/*!40101 SET @saved_cs_client = @@character_set_client */;
268 /*!50503 SET character_set_client = utf8mb4 */; 233 /*!50503 SET character_set_client = utf8mb4 */;
269 -CREATE TABLE `log`  
270 -(  
271 - `id` int NOT NULL AUTO_INCREMENT,  
272 - `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
273 - `type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
274 - `uri` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
275 - `address` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
276 - `result` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
277 - `timing` bigint NOT NULL,  
278 - `username` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
279 - `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
280 - PRIMARY KEY (`id`) USING BTREE  
281 -) ENGINE = InnoDB  
282 - AUTO_INCREMENT = 42703  
283 - DEFAULT CHARSET = utf8mb4  
284 - COLLATE = utf8mb4_general_ci  
285 - ROW_FORMAT = DYNAMIC; 234 +CREATE TABLE `log` (
  235 + `id` int NOT NULL AUTO_INCREMENT,
  236 + `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  237 + `type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  238 + `uri` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  239 + `address` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  240 + `result` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  241 + `timing` bigint NOT NULL,
  242 + `username` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  243 + `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  244 + PRIMARY KEY (`id`) USING BTREE
  245 +) ENGINE=InnoDB AUTO_INCREMENT=727574 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
286 /*!40101 SET character_set_client = @saved_cs_client */; 246 /*!40101 SET character_set_client = @saved_cs_client */;
287 247
288 -- 248 --
@@ -290,10 +250,8 @@ CREATE TABLE `log` @@ -290,10 +250,8 @@ CREATE TABLE `log`
290 -- 250 --
291 251
292 LOCK TABLES `log` WRITE; 252 LOCK TABLES `log` WRITE;
293 -/*!40000 ALTER TABLE `log`  
294 - DISABLE KEYS */;  
295 -/*!40000 ALTER TABLE `log`  
296 - ENABLE KEYS */; 253 +/*!40000 ALTER TABLE `log` DISABLE KEYS */;
  254 +/*!40000 ALTER TABLE `log` ENABLE KEYS */;
297 UNLOCK TABLES; 255 UNLOCK TABLES;
298 256
299 -- 257 --
@@ -301,39 +259,35 @@ UNLOCK TABLES; @@ -301,39 +259,35 @@ UNLOCK TABLES;
301 -- 259 --
302 260
303 DROP TABLE IF EXISTS `media_server`; 261 DROP TABLE IF EXISTS `media_server`;
304 -/*!40101 SET @saved_cs_client = @@character_set_client */; 262 +/*!40101 SET @saved_cs_client = @@character_set_client */;
305 /*!50503 SET character_set_client = utf8mb4 */; 263 /*!50503 SET character_set_client = utf8mb4 */;
306 -CREATE TABLE `media_server`  
307 -(  
308 - `id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
309 - `ip` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
310 - `hookIp` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
311 - `sdpIp` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
312 - `streamIp` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
313 - `httpPort` int NOT NULL,  
314 - `httpSSlPort` int NOT NULL,  
315 - `rtmpPort` int NOT NULL,  
316 - `rtmpSSlPort` int NOT NULL,  
317 - `rtpProxyPort` int NOT NULL,  
318 - `rtspPort` int NOT NULL,  
319 - `rtspSSLPort` int NOT NULL,  
320 - `autoConfig` int NOT NULL,  
321 - `secret` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
322 - `streamNoneReaderDelayMS` int NOT NULL,  
323 - `rtpEnable` int NOT NULL,  
324 - `rtpPortRange` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
325 - `sendRtpPortRange` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
326 - `recordAssistPort` int NOT NULL,  
327 - `defaultServer` int NOT NULL,  
328 - `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
329 - `updateTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
330 - `hookAliveInterval` int NOT NULL,  
331 - PRIMARY KEY (`id`) USING BTREE,  
332 - UNIQUE KEY `media_server_i` (`ip`, `httpPort`) USING BTREE  
333 -) ENGINE = InnoDB  
334 - DEFAULT CHARSET = utf8mb4  
335 - COLLATE = utf8mb4_general_ci  
336 - ROW_FORMAT = DYNAMIC; 264 +CREATE TABLE `media_server` (
  265 + `id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  266 + `ip` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  267 + `hookIp` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  268 + `sdpIp` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  269 + `streamIp` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  270 + `httpPort` int NOT NULL,
  271 + `httpSSlPort` int NOT NULL,
  272 + `rtmpPort` int NOT NULL,
  273 + `rtmpSSlPort` int NOT NULL,
  274 + `rtpProxyPort` int NOT NULL,
  275 + `rtspPort` int NOT NULL,
  276 + `rtspSSLPort` int NOT NULL,
  277 + `autoConfig` int NOT NULL,
  278 + `secret` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  279 + `streamNoneReaderDelayMS` int NOT NULL,
  280 + `rtpEnable` int NOT NULL,
  281 + `rtpPortRange` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  282 + `sendRtpPortRange` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  283 + `recordAssistPort` int NOT NULL,
  284 + `defaultServer` int NOT NULL,
  285 + `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  286 + `updateTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  287 + `hookAliveInterval` int NOT NULL,
  288 + PRIMARY KEY (`id`) USING BTREE,
  289 + UNIQUE KEY `media_server_i` (`ip`,`httpPort`) USING BTREE
  290 +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
337 /*!40101 SET character_set_client = @saved_cs_client */; 291 /*!40101 SET character_set_client = @saved_cs_client */;
338 292
339 -- 293 --
@@ -341,10 +295,8 @@ CREATE TABLE `media_server` @@ -341,10 +295,8 @@ CREATE TABLE `media_server`
341 -- 295 --
342 296
343 LOCK TABLES `media_server` WRITE; 297 LOCK TABLES `media_server` WRITE;
344 -/*!40000 ALTER TABLE `media_server`  
345 - DISABLE KEYS */;  
346 -/*!40000 ALTER TABLE `media_server`  
347 - ENABLE KEYS */; 298 +/*!40000 ALTER TABLE `media_server` DISABLE KEYS */;
  299 +/*!40000 ALTER TABLE `media_server` ENABLE KEYS */;
348 UNLOCK TABLES; 300 UNLOCK TABLES;
349 301
350 -- 302 --
@@ -352,44 +304,39 @@ UNLOCK TABLES; @@ -352,44 +304,39 @@ UNLOCK TABLES;
352 -- 304 --
353 305
354 DROP TABLE IF EXISTS `parent_platform`; 306 DROP TABLE IF EXISTS `parent_platform`;
355 -/*!40101 SET @saved_cs_client = @@character_set_client */; 307 +/*!40101 SET @saved_cs_client = @@character_set_client */;
356 /*!50503 SET character_set_client = utf8mb4 */; 308 /*!50503 SET character_set_client = utf8mb4 */;
357 -CREATE TABLE `parent_platform`  
358 -(  
359 - `id` int NOT NULL AUTO_INCREMENT,  
360 - `enable` int DEFAULT NULL,  
361 - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
362 - `serverGBId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
363 - `serverGBDomain` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
364 - `serverIP` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
365 - `serverPort` int DEFAULT NULL,  
366 - `deviceGBId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
367 - `deviceIp` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
368 - `devicePort` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
369 - `username` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
370 - `password` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
371 - `expires` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
372 - `keepTimeout` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
373 - `transport` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
374 - `characterSet` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
375 - `catalogId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
376 - `ptz` int DEFAULT NULL,  
377 - `rtcp` int DEFAULT NULL,  
378 - `status` bit(1) DEFAULT NULL,  
379 - `startOfflinePush` int DEFAULT '0 ',  
380 - `administrativeDivision` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
381 - `catalogGroup` int DEFAULT '1 ',  
382 - `createTime` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,  
383 - `updateTime` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,  
384 - `treeType` varchar(50) COLLATE utf8mb4_general_ci NOT NULL,  
385 - PRIMARY KEY (`id`) USING BTREE,  
386 - UNIQUE KEY `parent_platform_id_uindex` (`id`) USING BTREE,  
387 - UNIQUE KEY `parent_platform_pk` (`serverGBId`) USING BTREE  
388 -) ENGINE = InnoDB  
389 - AUTO_INCREMENT = 40  
390 - DEFAULT CHARSET = utf8mb4  
391 - COLLATE = utf8mb4_general_ci  
392 - ROW_FORMAT = DYNAMIC; 309 +CREATE TABLE `parent_platform` (
  310 + `id` int NOT NULL AUTO_INCREMENT,
  311 + `enable` int DEFAULT NULL,
  312 + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  313 + `serverGBId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  314 + `serverGBDomain` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  315 + `serverIP` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  316 + `serverPort` int DEFAULT NULL,
  317 + `deviceGBId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  318 + `deviceIp` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  319 + `devicePort` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  320 + `username` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  321 + `password` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  322 + `expires` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  323 + `keepTimeout` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  324 + `transport` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  325 + `characterSet` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  326 + `catalogId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  327 + `ptz` int DEFAULT NULL,
  328 + `rtcp` int DEFAULT NULL,
  329 + `status` bit(1) DEFAULT NULL,
  330 + `startOfflinePush` int DEFAULT '0',
  331 + `administrativeDivision` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  332 + `catalogGroup` int DEFAULT '1',
  333 + `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  334 + `updateTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  335 + `treeType` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  336 + PRIMARY KEY (`id`),
  337 + UNIQUE KEY `parent_platform_id_uindex` (`id`),
  338 + UNIQUE KEY `parent_platform_pk` (`serverGBId`)
  339 +) ENGINE=InnoDB AUTO_INCREMENT=41 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
393 /*!40101 SET character_set_client = @saved_cs_client */; 340 /*!40101 SET character_set_client = @saved_cs_client */;
394 341
395 -- 342 --
@@ -397,10 +344,8 @@ CREATE TABLE `parent_platform` @@ -397,10 +344,8 @@ CREATE TABLE `parent_platform`
397 -- 344 --
398 345
399 LOCK TABLES `parent_platform` WRITE; 346 LOCK TABLES `parent_platform` WRITE;
400 -/*!40000 ALTER TABLE `parent_platform`  
401 - DISABLE KEYS */;  
402 -/*!40000 ALTER TABLE `parent_platform`  
403 - ENABLE KEYS */; 347 +/*!40000 ALTER TABLE `parent_platform` DISABLE KEYS */;
  348 +/*!40000 ALTER TABLE `parent_platform` ENABLE KEYS */;
404 UNLOCK TABLES; 349 UNLOCK TABLES;
405 350
406 -- 351 --
@@ -408,21 +353,17 @@ UNLOCK TABLES; @@ -408,21 +353,17 @@ UNLOCK TABLES;
408 -- 353 --
409 354
410 DROP TABLE IF EXISTS `platform_catalog`; 355 DROP TABLE IF EXISTS `platform_catalog`;
411 -/*!40101 SET @saved_cs_client = @@character_set_client */; 356 +/*!40101 SET @saved_cs_client = @@character_set_client */;
412 /*!50503 SET character_set_client = utf8mb4 */; 357 /*!50503 SET character_set_client = utf8mb4 */;
413 -CREATE TABLE `platform_catalog`  
414 -(  
415 - `id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
416 - `platformId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
417 - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
418 - `parentId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
419 - `civilCode` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,  
420 - `businessGroupId` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,  
421 - PRIMARY KEY (`id`) USING BTREE  
422 -) ENGINE = InnoDB  
423 - DEFAULT CHARSET = utf8mb4  
424 - COLLATE = utf8mb4_general_ci  
425 - ROW_FORMAT = DYNAMIC; 358 +CREATE TABLE `platform_catalog` (
  359 + `id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  360 + `platformId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  361 + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  362 + `parentId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  363 + `civilCode` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  364 + `businessGroupId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  365 + PRIMARY KEY (`id`) USING BTREE
  366 +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
426 /*!40101 SET character_set_client = @saved_cs_client */; 367 /*!40101 SET character_set_client = @saved_cs_client */;
427 368
428 -- 369 --
@@ -430,10 +371,8 @@ CREATE TABLE `platform_catalog` @@ -430,10 +371,8 @@ CREATE TABLE `platform_catalog`
430 -- 371 --
431 372
432 LOCK TABLES `platform_catalog` WRITE; 373 LOCK TABLES `platform_catalog` WRITE;
433 -/*!40000 ALTER TABLE `platform_catalog`  
434 - DISABLE KEYS */;  
435 -/*!40000 ALTER TABLE `platform_catalog`  
436 - ENABLE KEYS */; 374 +/*!40000 ALTER TABLE `platform_catalog` DISABLE KEYS */;
  375 +/*!40000 ALTER TABLE `platform_catalog` ENABLE KEYS */;
437 UNLOCK TABLES; 376 UNLOCK TABLES;
438 377
439 -- 378 --
@@ -441,20 +380,15 @@ UNLOCK TABLES; @@ -441,20 +380,15 @@ UNLOCK TABLES;
441 -- 380 --
442 381
443 DROP TABLE IF EXISTS `platform_gb_channel`; 382 DROP TABLE IF EXISTS `platform_gb_channel`;
444 -/*!40101 SET @saved_cs_client = @@character_set_client */; 383 +/*!40101 SET @saved_cs_client = @@character_set_client */;
445 /*!50503 SET character_set_client = utf8mb4 */; 384 /*!50503 SET character_set_client = utf8mb4 */;
446 -CREATE TABLE `platform_gb_channel`  
447 -(  
448 - `id` int NOT NULL AUTO_INCREMENT,  
449 - `platformId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
450 - `catalogId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
451 - `deviceChannelId` int NOT NULL,  
452 - PRIMARY KEY (`id`) USING BTREE  
453 -) ENGINE = InnoDB  
454 - AUTO_INCREMENT = 4915  
455 - DEFAULT CHARSET = utf8mb4  
456 - COLLATE = utf8mb4_general_ci  
457 - ROW_FORMAT = DYNAMIC; 385 +CREATE TABLE `platform_gb_channel` (
  386 + `id` int NOT NULL AUTO_INCREMENT,
  387 + `platformId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  388 + `catalogId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  389 + `deviceChannelId` int NOT NULL,
  390 + PRIMARY KEY (`id`)
  391 +) ENGINE=InnoDB AUTO_INCREMENT=51 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
458 /*!40101 SET character_set_client = @saved_cs_client */; 392 /*!40101 SET character_set_client = @saved_cs_client */;
459 393
460 -- 394 --
@@ -462,10 +396,8 @@ CREATE TABLE `platform_gb_channel` @@ -462,10 +396,8 @@ CREATE TABLE `platform_gb_channel`
462 -- 396 --
463 397
464 LOCK TABLES `platform_gb_channel` WRITE; 398 LOCK TABLES `platform_gb_channel` WRITE;
465 -/*!40000 ALTER TABLE `platform_gb_channel`  
466 - DISABLE KEYS */;  
467 -/*!40000 ALTER TABLE `platform_gb_channel`  
468 - ENABLE KEYS */; 399 +/*!40000 ALTER TABLE `platform_gb_channel` DISABLE KEYS */;
  400 +/*!40000 ALTER TABLE `platform_gb_channel` ENABLE KEYS */;
469 UNLOCK TABLES; 401 UNLOCK TABLES;
470 402
471 -- 403 --
@@ -473,21 +405,16 @@ UNLOCK TABLES; @@ -473,21 +405,16 @@ UNLOCK TABLES;
473 -- 405 --
474 406
475 DROP TABLE IF EXISTS `platform_gb_stream`; 407 DROP TABLE IF EXISTS `platform_gb_stream`;
476 -/*!40101 SET @saved_cs_client = @@character_set_client */; 408 +/*!40101 SET @saved_cs_client = @@character_set_client */;
477 /*!50503 SET character_set_client = utf8mb4 */; 409 /*!50503 SET character_set_client = utf8mb4 */;
478 -CREATE TABLE `platform_gb_stream`  
479 -(  
480 - `platformId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
481 - `catalogId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
482 - `gbStreamId` int NOT NULL,  
483 - `id` int NOT NULL AUTO_INCREMENT,  
484 - PRIMARY KEY (`id`) USING BTREE,  
485 - UNIQUE KEY `platform_gb_stream_pk` (`platformId`, `catalogId`, `gbStreamId`) USING BTREE  
486 -) ENGINE = InnoDB  
487 - AUTO_INCREMENT = 302149  
488 - DEFAULT CHARSET = utf8mb4  
489 - COLLATE = utf8mb4_general_ci  
490 - ROW_FORMAT = DYNAMIC; 410 +CREATE TABLE `platform_gb_stream` (
  411 + `platformId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  412 + `catalogId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  413 + `gbStreamId` int NOT NULL,
  414 + `id` int NOT NULL AUTO_INCREMENT,
  415 + PRIMARY KEY (`id`),
  416 + UNIQUE KEY `platform_gb_stream_pk` (`platformId`,`catalogId`,`gbStreamId`)
  417 +) ENGINE=InnoDB AUTO_INCREMENT=301759 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
491 /*!40101 SET character_set_client = @saved_cs_client */; 418 /*!40101 SET character_set_client = @saved_cs_client */;
492 419
493 -- 420 --
@@ -495,10 +422,8 @@ CREATE TABLE `platform_gb_stream` @@ -495,10 +422,8 @@ CREATE TABLE `platform_gb_stream`
495 -- 422 --
496 423
497 LOCK TABLES `platform_gb_stream` WRITE; 424 LOCK TABLES `platform_gb_stream` WRITE;
498 -/*!40000 ALTER TABLE `platform_gb_stream`  
499 - DISABLE KEYS */;  
500 -/*!40000 ALTER TABLE `platform_gb_stream`  
501 - ENABLE KEYS */; 425 +/*!40000 ALTER TABLE `platform_gb_stream` DISABLE KEYS */;
  426 +/*!40000 ALTER TABLE `platform_gb_stream` ENABLE KEYS */;
502 UNLOCK TABLES; 427 UNLOCK TABLES;
503 428
504 -- 429 --
@@ -506,36 +431,31 @@ UNLOCK TABLES; @@ -506,36 +431,31 @@ UNLOCK TABLES;
506 -- 431 --
507 432
508 DROP TABLE IF EXISTS `stream_proxy`; 433 DROP TABLE IF EXISTS `stream_proxy`;
509 -/*!40101 SET @saved_cs_client = @@character_set_client */; 434 +/*!40101 SET @saved_cs_client = @@character_set_client */;
510 /*!50503 SET character_set_client = utf8mb4 */; 435 /*!50503 SET character_set_client = utf8mb4 */;
511 -CREATE TABLE `stream_proxy`  
512 -(  
513 - `id` int NOT NULL AUTO_INCREMENT,  
514 - `type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
515 - `app` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
516 - `stream` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
517 - `url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
518 - `src_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
519 - `dst_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
520 - `timeout_ms` int DEFAULT NULL,  
521 - `ffmpeg_cmd_key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
522 - `rtp_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
523 - `mediaServerId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
524 - `enable_hls` bit(1) DEFAULT NULL,  
525 - `enable_mp4` bit(1) DEFAULT NULL,  
526 - `enable` bit(1) NOT NULL,  
527 - `status` bit(1) NOT NULL,  
528 - `enable_remove_none_reader` bit(1) NOT NULL,  
529 - `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
530 - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
531 - `updateTime` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,  
532 - PRIMARY KEY (`id`) USING BTREE,  
533 - UNIQUE KEY `stream_proxy_pk` (`app`, `stream`) USING BTREE  
534 -) ENGINE = InnoDB  
535 - AUTO_INCREMENT = 66  
536 - DEFAULT CHARSET = utf8mb4  
537 - COLLATE = utf8mb4_general_ci  
538 - ROW_FORMAT = DYNAMIC; 436 +CREATE TABLE `stream_proxy` (
  437 + `id` int NOT NULL AUTO_INCREMENT,
  438 + `type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  439 + `app` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  440 + `stream` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  441 + `url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  442 + `src_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  443 + `dst_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  444 + `timeout_ms` int DEFAULT NULL,
  445 + `ffmpeg_cmd_key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  446 + `rtp_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  447 + `mediaServerId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  448 + `enable_hls` bit(1) DEFAULT NULL,
  449 + `enable_mp4` bit(1) DEFAULT NULL,
  450 + `enable` bit(1) NOT NULL,
  451 + `status` bit(1) NOT NULL,
  452 + `enable_remove_none_reader` bit(1) NOT NULL,
  453 + `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  454 + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  455 + `updateTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  456 + PRIMARY KEY (`id`),
  457 + UNIQUE KEY `stream_proxy_pk` (`app`,`stream`)
  458 +) ENGINE=InnoDB AUTO_INCREMENT=545 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
539 /*!40101 SET character_set_client = @saved_cs_client */; 459 /*!40101 SET character_set_client = @saved_cs_client */;
540 460
541 -- 461 --
@@ -543,10 +463,8 @@ CREATE TABLE `stream_proxy` @@ -543,10 +463,8 @@ CREATE TABLE `stream_proxy`
543 -- 463 --
544 464
545 LOCK TABLES `stream_proxy` WRITE; 465 LOCK TABLES `stream_proxy` WRITE;
546 -/*!40000 ALTER TABLE `stream_proxy`  
547 - DISABLE KEYS */;  
548 -/*!40000 ALTER TABLE `stream_proxy`  
549 - ENABLE KEYS */; 466 +/*!40000 ALTER TABLE `stream_proxy` DISABLE KEYS */;
  467 +/*!40000 ALTER TABLE `stream_proxy` ENABLE KEYS */;
550 UNLOCK TABLES; 468 UNLOCK TABLES;
551 469
552 -- 470 --
@@ -554,32 +472,27 @@ UNLOCK TABLES; @@ -554,32 +472,27 @@ UNLOCK TABLES;
554 -- 472 --
555 473
556 DROP TABLE IF EXISTS `stream_push`; 474 DROP TABLE IF EXISTS `stream_push`;
557 -/*!40101 SET @saved_cs_client = @@character_set_client */; 475 +/*!40101 SET @saved_cs_client = @@character_set_client */;
558 /*!50503 SET character_set_client = utf8mb4 */; 476 /*!50503 SET character_set_client = utf8mb4 */;
559 -CREATE TABLE `stream_push`  
560 -(  
561 - `id` int NOT NULL AUTO_INCREMENT,  
562 - `app` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
563 - `stream` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
564 - `totalReaderCount` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
565 - `originType` int DEFAULT NULL,  
566 - `originTypeStr` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
567 - `createTime` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,  
568 - `aliveSecond` int DEFAULT NULL,  
569 - `mediaServerId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,  
570 - `serverId` varchar(50) COLLATE utf8mb4_general_ci NOT NULL,  
571 - `pushTime` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,  
572 - `updateTime` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,  
573 - `status` int DEFAULT NULL,  
574 - `pushIng` int DEFAULT NULL,  
575 - `self` int DEFAULT NULL,  
576 - PRIMARY KEY (`id`) USING BTREE,  
577 - UNIQUE KEY `stream_push_pk` (`app`, `stream`) USING BTREE  
578 -) ENGINE = InnoDB  
579 - AUTO_INCREMENT = 305415  
580 - DEFAULT CHARSET = utf8mb4  
581 - COLLATE = utf8mb4_general_ci  
582 - ROW_FORMAT = DYNAMIC; 477 +CREATE TABLE `stream_push` (
  478 + `id` int NOT NULL AUTO_INCREMENT,
  479 + `app` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  480 + `stream` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  481 + `totalReaderCount` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  482 + `originType` int DEFAULT NULL,
  483 + `originTypeStr` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  484 + `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  485 + `aliveSecond` int DEFAULT NULL,
  486 + `mediaServerId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  487 + `serverId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  488 + `pushTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  489 + `status` int DEFAULT NULL,
  490 + `updateTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  491 + `pushIng` int DEFAULT NULL,
  492 + `self` int DEFAULT NULL,
  493 + PRIMARY KEY (`id`),
  494 + UNIQUE KEY `stream_push_pk` (`app`,`stream`)
  495 +) ENGINE=InnoDB AUTO_INCREMENT=310546 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
583 /*!40101 SET character_set_client = @saved_cs_client */; 496 /*!40101 SET character_set_client = @saved_cs_client */;
584 497
585 -- 498 --
@@ -587,10 +500,8 @@ CREATE TABLE `stream_push` @@ -587,10 +500,8 @@ CREATE TABLE `stream_push`
587 -- 500 --
588 501
589 LOCK TABLES `stream_push` WRITE; 502 LOCK TABLES `stream_push` WRITE;
590 -/*!40000 ALTER TABLE `stream_push`  
591 - DISABLE KEYS */;  
592 -/*!40000 ALTER TABLE `stream_push`  
593 - ENABLE KEYS */; 503 +/*!40000 ALTER TABLE `stream_push` DISABLE KEYS */;
  504 +/*!40000 ALTER TABLE `stream_push` ENABLE KEYS */;
594 UNLOCK TABLES; 505 UNLOCK TABLES;
595 506
596 -- 507 --
@@ -598,24 +509,19 @@ UNLOCK TABLES; @@ -598,24 +509,19 @@ UNLOCK TABLES;
598 -- 509 --
599 510
600 DROP TABLE IF EXISTS `user`; 511 DROP TABLE IF EXISTS `user`;
601 -/*!40101 SET @saved_cs_client = @@character_set_client */; 512 +/*!40101 SET @saved_cs_client = @@character_set_client */;
602 /*!50503 SET character_set_client = utf8mb4 */; 513 /*!50503 SET character_set_client = utf8mb4 */;
603 -CREATE TABLE `user`  
604 -(  
605 - `id` int NOT NULL AUTO_INCREMENT,  
606 - `username` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
607 - `password` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
608 - `roleId` int NOT NULL,  
609 - `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
610 - `updateTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
611 - `pushKey` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,  
612 - PRIMARY KEY (`id`) USING BTREE,  
613 - UNIQUE KEY `user_username_uindex` (`username`) USING BTREE  
614 -) ENGINE = InnoDB  
615 - AUTO_INCREMENT = 2  
616 - DEFAULT CHARSET = utf8mb4  
617 - COLLATE = utf8mb4_general_ci  
618 - ROW_FORMAT = DYNAMIC; 514 +CREATE TABLE `user` (
  515 + `id` int NOT NULL AUTO_INCREMENT,
  516 + `username` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  517 + `password` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  518 + `roleId` int NOT NULL,
  519 + `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  520 + `updateTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  521 + `pushKey` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  522 + PRIMARY KEY (`id`) USING BTREE,
  523 + UNIQUE KEY `user_username_uindex` (`username`) USING BTREE
  524 +) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
619 /*!40101 SET character_set_client = @saved_cs_client */; 525 /*!40101 SET character_set_client = @saved_cs_client */;
620 526
621 -- 527 --
@@ -623,13 +529,9 @@ CREATE TABLE `user` @@ -623,13 +529,9 @@ CREATE TABLE `user`
623 -- 529 --
624 530
625 LOCK TABLES `user` WRITE; 531 LOCK TABLES `user` WRITE;
626 -/*!40000 ALTER TABLE `user`  
627 - DISABLE KEYS */;  
628 -INSERT INTO `user`  
629 -VALUES (1, 'admin', '21232f297a57a5a743894a0e4a801fc3', 1, '2021 - 04 - 13 14:14:57', '2021 - 04 - 13 14:14:57',  
630 - '01685cb9573ae25ec6c52142402da7c5');  
631 -/*!40000 ALTER TABLE `user`  
632 - ENABLE KEYS */; 532 +/*!40000 ALTER TABLE `user` DISABLE KEYS */;
  533 +INSERT INTO `user` VALUES (1,'admin','21232f297a57a5a743894a0e4a801fc3',1,'2021 - 04 - 13 14:14:57','2021 - 04 - 13 14:14:57','3e80d1762a324d5b0ff636e0bd16f1e3');
  534 +/*!40000 ALTER TABLE `user` ENABLE KEYS */;
633 UNLOCK TABLES; 535 UNLOCK TABLES;
634 536
635 -- 537 --
@@ -637,21 +539,16 @@ UNLOCK TABLES; @@ -637,21 +539,16 @@ UNLOCK TABLES;
637 -- 539 --
638 540
639 DROP TABLE IF EXISTS `user_role`; 541 DROP TABLE IF EXISTS `user_role`;
640 -/*!40101 SET @saved_cs_client = @@character_set_client */; 542 +/*!40101 SET @saved_cs_client = @@character_set_client */;
641 /*!50503 SET character_set_client = utf8mb4 */; 543 /*!50503 SET character_set_client = utf8mb4 */;
642 -CREATE TABLE `user_role`  
643 -(  
644 - `id` int NOT NULL AUTO_INCREMENT,  
645 - `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
646 - `authority` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
647 - `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
648 - `updateTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,  
649 - PRIMARY KEY (`id`) USING BTREE  
650 -) ENGINE = InnoDB  
651 - AUTO_INCREMENT = 2  
652 - DEFAULT CHARSET = utf8mb4  
653 - COLLATE = utf8mb4_general_ci  
654 - ROW_FORMAT = DYNAMIC; 544 +CREATE TABLE `user_role` (
  545 + `id` int NOT NULL AUTO_INCREMENT,
  546 + `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  547 + `authority` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  548 + `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  549 + `updateTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  550 + PRIMARY KEY (`id`) USING BTREE
  551 +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
655 /*!40101 SET character_set_client = @saved_cs_client */; 552 /*!40101 SET character_set_client = @saved_cs_client */;
656 553
657 -- 554 --
@@ -659,21 +556,18 @@ CREATE TABLE `user_role` @@ -659,21 +556,18 @@ CREATE TABLE `user_role`
659 -- 556 --
660 557
661 LOCK TABLES `user_role` WRITE; 558 LOCK TABLES `user_role` WRITE;
662 -/*!40000 ALTER TABLE `user_role`  
663 - DISABLE KEYS */;  
664 -INSERT INTO `user_role`  
665 -VALUES (1, 'admin', '0 ', '2021 - 04 - 13 14:14:57', '2021 - 04 - 13 14:14:57');  
666 -/*!40000 ALTER TABLE `user_role`  
667 - ENABLE KEYS */; 559 +/*!40000 ALTER TABLE `user_role` DISABLE KEYS */;
  560 +INSERT INTO `user_role` VALUES (1,'admin','0','2021-04-13 14:14:57','2021-04-13 14:14:57');
  561 +/*!40000 ALTER TABLE `user_role` ENABLE KEYS */;
668 UNLOCK TABLES; 562 UNLOCK TABLES;
669 -/*!40103 SET TIME_ZONE = @OLD_TIME_ZONE */; 563 +/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
670 564
671 -/*!40101 SET SQL_MODE = @OLD_SQL_MODE */;  
672 -/*!40014 SET FOREIGN_KEY_CHECKS = @OLD_FOREIGN_KEY_CHECKS */;  
673 -/*!40014 SET UNIQUE_CHECKS = @OLD_UNIQUE_CHECKS */;  
674 -/*!40101 SET CHARACTER_SET_CLIENT = @OLD_CHARACTER_SET_CLIENT */;  
675 -/*!40101 SET CHARACTER_SET_RESULTS = @OLD_CHARACTER_SET_RESULTS */;  
676 -/*!40101 SET COLLATION_CONNECTION = @OLD_COLLATION_CONNECTION */;  
677 -/*!40111 SET SQL_NOTES = @OLD_SQL_NOTES */; 565 +/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
  566 +/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
  567 +/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
  568 +/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
  569 +/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
  570 +/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
  571 +/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
678 572
679 --- Dump completed on 2022-07-27 14:51:08 573 +-- Dump completed on 2022-09-08 16:46:27
src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java
  View file @feb9996
@@ -428,7 +428,6 @@ public class StreamPushServiceImpl implements IStreamPushService { @@ -428,7 +428,6 @@ public class StreamPushServiceImpl implements IStreamPushService {
428 platformId, platformForEvent.get(platformId), CatalogEvent.ADD); 428 platformId, platformForEvent.get(platformId), CatalogEvent.ADD);
429 } 429 }
430 } 430 }
431 -  
432 } 431 }
433 } 432 }
434 433
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java
  View file @feb9996
@@ -695,7 +695,7 @@ public class VideoManagerStorageImpl implements IVideoManagerStorage { @@ -695,7 +695,7 @@ public class VideoManagerStorageImpl implements IVideoManagerStorage {
695 return 0; 695 return 0;
696 } 696 }
697 if (platform.getTreeType().equals(TreeType.BUSINESS_GROUP)) { 697 if (platform.getTreeType().equals(TreeType.BUSINESS_GROUP)) {
698 - if (platformCatalog.getPlatformId().equals(platformCatalog.getParentId())) { 698 + if (platform.getDeviceGBId().equals(platformCatalog.getParentId())) {
699 // 第一层节点 699 // 第一层节点
700 platformCatalog.setBusinessGroupId(platformCatalog.getId()); 700 platformCatalog.setBusinessGroupId(platformCatalog.getId());
701 platformCatalog.setParentId(platform.getDeviceGBId()); 701 platformCatalog.setParentId(platform.getDeviceGBId());