guzijian / wvp-GB28181-pro · Commits

Commit d36920c699d21b4381d679a64a4369cf22e10139

Authored by 648540858
1 parent 0dc1807f

添加自动拉起未推流设备的控制开关

Inline Side-by-side
Showing 9 changed files with 264 additions and 220 deletions
README.md
  View file @d36920c
... ... @@ -134,10 +134,10 @@ QQ遘∽ｿ｡荳闊ｬ荳榊屓, 邊ｾ蜉帶怏髯.谺｢霑主､ｧ螳ｶ蝨ｨ鄒､驥瑚ｮｨ隶ｺ.隗牙ｾ鈴｡ｹ逶ｮ蟇ｹ菴
134 134 諢溯ｰ｢菴懆dexter langhuihui](https://github.com/langhuihui) 蠑貅占ｿ吩ｹ亥･ｽ逕ｨ逧ЦEB謦ｭ謾ｾ蝎ｨ縲
135 135 諢溯ｰ｢菴懆Kyle](https://gitee.com/kkkkk5G) 蠑貅蝉ｺ･ｽ逕ｨ逧燕遶ｯ鬘ｵ髱｢
136 136 諢溯ｰ｢蜷ｽ榊､ｧ菴ｬ逧ｵ槫勧莉･蜿雁ｯｹ鬘ｹ逶ｮ逧欠豁｣荳主ｸｮ蜉ｩ縲ょ桁諡ｬ菴ｸ埼剞莠惹ｻ｣遐∬ｴ｡迪ｮ縲琉鬚伜渚鬥医∬ｵ謐占ｵ遲牙推遘肴婿蠑冗噪謾ｯ謖ｼ∽ｻ･荳区賜蜷堺ｸ榊蜈亥錘
137   -[lawrencehj](https://github.com/lawrencehj) @髯ｸｰ-蛻帛･ｧ第橿 [swwhaha](https://github.com/swwheihei)
  137 +[lawrencehj](https://github.com/lawrencehj) [Smallwhitepig](https://github.com/Smallwhitepig) [swwhaha](https://github.com/swwheihei)
138 138 [hotcoffie](https://github.com/hotcoffie) [xiaomu](https://github.com/nikmu) [TristingChen](https://github.com/TristingChen)
139 139 [chenparty](https://github.com/chenparty) [Hotleave](https://github.com/hotleave) [ydwxb](https://github.com/ydwxb)
140   -[ydpd](https://github.com/ydpd) [szy833](https://github.com/szy833) [ydwxb](https://github.com/ydwxb)
  140 +[ydpd](https://github.com/ydpd) [szy833](https://github.com/szy833) [ydwxb](https://github.com/ydwxb) [Albertzhu666](https://github.com/Albertzhu666)
141 141  
142 142 ps: 蛻壼｢槫刈莠ｿ吩ｸｪ蜷榊黒瑚け螳夐＠貍丈ｺｸ莠帛､ｧ菴ｬ梧ｬ｢霑主､ｧ菴ｬ閨皮ｳｻ謌第ｷｻ蜉縲
143 143  
... ...
... ... @@ -11,7 +11,7 @@
11 11  
12 12 <groupId>com.genersoft</groupId>
13 13 <artifactId>wvp-pro</artifactId>
14   - <version>2.0.2</version>
  14 + <version>2.1.1</version>
15 15 <name>web video platform</name>
16 16 <description>国标28181视频平台</description>
17 17  
... ...
sql/clean.sql 0 → 100644
  View file @d36920c
  1 +delete from device;
  2 +delete from device_alarm;
  3 +delete from device_channel;
  4 +delete from device_mobile_position;
  5 +delete from gb_stream;
  6 +delete from log;
  7 +delete from media_server;
  8 +delete from parent_platform;
  9 +delete from platform_catalog;
  10 +delete from platform_gb_channel;
  11 +delete from platform_gb_stream;
  12 +delete from stream_proxy;
  13 +delete from stream_push;
0 14 \ No newline at end of file
... ...
sql/mysql.sql
  View file @d36920c
1   --- MySQL dump 10.13 Distrib 8.0.28, for Linux (x86_64)
  1 +-- MariaDB dump 10.19 Distrib 10.7.3-MariaDB, for Linux (x86_64)
2 2 --
3   --- Host: 127.0.0.1 Database: wvp
  3 +-- Host: 127.0.0.1 Database: wvp3
4 4 -- ------------------------------------------------------
5   --- Server version 8.0.28-0ubuntu0.20.04.3
  5 +-- Server version 8.0.0-dmr
6 6  
7 7 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
8 8 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
9 9 /*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
10   -/*!50503 SET NAMES utf8mb4 */;
  10 +/*!40101 SET NAMES utf8mb4 */;
11 11 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
12 12 /*!40103 SET TIME_ZONE='+00:00' */;
13 13 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
... ... @@ -21,33 +21,34 @@
21 21  
22 22 DROP TABLE IF EXISTS `device`;
23 23 /*!40101 SET @saved_cs_client = @@character_set_client */;
24   -/*!50503 SET character_set_client = utf8mb4 */;
  24 +/*!40101 SET character_set_client = utf8 */;
25 25 CREATE TABLE `device` (
26   - `id` int NOT NULL AUTO_INCREMENT,
27   - `deviceId` varchar(50) COLLATE utf8mb4_general_ci NOT NULL,
28   - `name` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL,
29   - `manufacturer` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL,
30   - `model` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL,
31   - `firmware` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL,
32   - `transport` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
33   - `streamMode` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
34   - `online` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
35   - `registerTime` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
36   - `keepaliveTime` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
37   - `ip` varchar(50) COLLATE utf8mb4_general_ci NOT NULL,
38   - `createTime` varchar(50) COLLATE utf8mb4_general_ci NOT NULL,
39   - `updateTime` varchar(50) COLLATE utf8mb4_general_ci NOT NULL,
40   - `port` int NOT NULL,
41   - `expires` int NOT NULL,
42   - `subscribeCycleForCatalog` int NOT NULL,
43   - `subscribeCycleForMobilePosition` int NOT NULL,
44   - `mobilePositionSubmissionInterval` int DEFAULT 5 NOT NULL,
45   - `subscribeCycleForAlarm` int NOT NULL,
46   - `hostAddress` varchar(50) COLLATE utf8mb4_general_ci NOT NULL,
47   - `charset` varchar(50) COLLATE utf8mb4_general_ci NOT NULL,
  26 + `id` int(11) NOT NULL AUTO_INCREMENT,
  27 + `deviceId` varchar(50) NOT NULL,
  28 + `name` varchar(255) DEFAULT NULL,
  29 + `manufacturer` varchar(255) DEFAULT NULL,
  30 + `model` varchar(255) DEFAULT NULL,
  31 + `firmware` varchar(255) DEFAULT NULL,
  32 + `transport` varchar(50) DEFAULT NULL,
  33 + `streamMode` varchar(50) DEFAULT NULL,
  34 + `online` varchar(50) DEFAULT NULL,
  35 + `registerTime` varchar(50) DEFAULT NULL,
  36 + `keepaliveTime` varchar(50) DEFAULT NULL,
  37 + `ip` varchar(50) NOT NULL,
  38 + `createTime` varchar(50) NOT NULL,
  39 + `updateTime` varchar(50) NOT NULL,
  40 + `port` int(11) NOT NULL,
  41 + `expires` int(11) NOT NULL,
  42 + `subscribeCycleForCatalog` int(11) NOT NULL,
  43 + `subscribeCycleForMobilePosition` int(11) NOT NULL,
  44 + `mobilePositionSubmissionInterval` int(11) NOT NULL DEFAULT '5',
  45 + `subscribeCycleForAlarm` int(11) NOT NULL,
  46 + `hostAddress` varchar(50) NOT NULL,
  47 + `charset` varchar(50) NOT NULL,
  48 + `ssrcCheck` int(11) DEFAULT '0',
48 49 PRIMARY KEY (`id`),
49 50 UNIQUE KEY `device_deviceId_uindex` (`deviceId`)
50   -) ENGINE=InnoDB AUTO_INCREMENT=21 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
  51 +) ENGINE=InnoDB AUTO_INCREMENT=47 DEFAULT CHARSET=utf8mb4;
51 52 /*!40101 SET character_set_client = @saved_cs_client */;
52 53  
53 54 --
... ... @@ -65,20 +66,20 @@ UNLOCK TABLES;
65 66  
66 67 DROP TABLE IF EXISTS `device_alarm`;
67 68 /*!40101 SET @saved_cs_client = @@character_set_client */;
68   -/*!50503 SET character_set_client = utf8mb4 */;
  69 +/*!40101 SET character_set_client = utf8 */;
69 70 CREATE TABLE `device_alarm` (
70   - `id` int NOT NULL AUTO_INCREMENT,
71   - `deviceId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
72   - `channelId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
73   - `alarmPriority` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
74   - `alarmMethod` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
75   - `alarmTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
76   - `alarmDescription` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  71 + `id` int(11) NOT NULL AUTO_INCREMENT,
  72 + `deviceId` varchar(50) NOT NULL,
  73 + `channelId` varchar(50) NOT NULL,
  74 + `alarmPriority` varchar(50) NOT NULL,
  75 + `alarmMethod` varchar(50) DEFAULT NULL,
  76 + `alarmTime` varchar(50) NOT NULL,
  77 + `alarmDescription` varchar(255) DEFAULT NULL,
77 78 `longitude` double DEFAULT NULL,
78 79 `latitude` double DEFAULT NULL,
79   - `alarmType` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  80 + `alarmType` varchar(50) DEFAULT NULL,
80 81 PRIMARY KEY (`id`) USING BTREE
81   -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
  82 +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
82 83 /*!40101 SET character_set_client = @saved_cs_client */;
83 84  
84 85 --
... ... @@ -96,43 +97,43 @@ UNLOCK TABLES;
96 97  
97 98 DROP TABLE IF EXISTS `device_channel`;
98 99 /*!40101 SET @saved_cs_client = @@character_set_client */;
99   -/*!50503 SET character_set_client = utf8mb4 */;
  100 +/*!40101 SET character_set_client = utf8 */;
100 101 CREATE TABLE `device_channel` (
101   - `id` int NOT NULL AUTO_INCREMENT,
102   - `channelId` varchar(50) COLLATE utf8mb4_general_ci NOT NULL,
103   - `name` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL,
104   - `manufacture` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
105   - `model` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
106   - `owner` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
107   - `civilCode` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
108   - `block` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
109   - `address` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
110   - `parentId` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
111   - `safetyWay` int DEFAULT NULL,
112   - `registerWay` int DEFAULT NULL,
113   - `certNum` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
114   - `certifiable` int DEFAULT NULL,
115   - `errCode` int DEFAULT NULL,
116   - `endTime` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
117   - `secrecy` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
118   - `ipAddress` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
119   - `port` int DEFAULT NULL,
120   - `password` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL,
121   - `PTZType` int DEFAULT NULL,
122   - `status` int DEFAULT NULL,
  102 + `id` int(11) NOT NULL AUTO_INCREMENT,
  103 + `channelId` varchar(50) NOT NULL,
  104 + `name` varchar(255) DEFAULT NULL,
  105 + `manufacture` varchar(50) DEFAULT NULL,
  106 + `model` varchar(50) DEFAULT NULL,
  107 + `owner` varchar(50) DEFAULT NULL,
  108 + `civilCode` varchar(50) DEFAULT NULL,
  109 + `block` varchar(50) DEFAULT NULL,
  110 + `address` varchar(50) DEFAULT NULL,
  111 + `parentId` varchar(50) DEFAULT NULL,
  112 + `safetyWay` int(11) DEFAULT NULL,
  113 + `registerWay` int(11) DEFAULT NULL,
  114 + `certNum` varchar(50) DEFAULT NULL,
  115 + `certifiable` int(11) DEFAULT NULL,
  116 + `errCode` int(11) DEFAULT NULL,
  117 + `endTime` varchar(50) DEFAULT NULL,
  118 + `secrecy` varchar(50) DEFAULT NULL,
  119 + `ipAddress` varchar(50) DEFAULT NULL,
  120 + `port` int(11) DEFAULT NULL,
  121 + `password` varchar(255) DEFAULT NULL,
  122 + `PTZType` int(11) DEFAULT NULL,
  123 + `status` int(11) DEFAULT NULL,
123 124 `longitude` double DEFAULT NULL,
124 125 `latitude` double DEFAULT NULL,
125   - `streamId` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
126   - `deviceId` varchar(50) COLLATE utf8mb4_general_ci NOT NULL,
127   - `parental` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
  126 + `streamId` varchar(50) DEFAULT NULL,
  127 + `deviceId` varchar(50) NOT NULL,
  128 + `parental` varchar(50) DEFAULT NULL,
128 129 `hasAudio` bit(1) DEFAULT NULL,
129   - `createTime` varchar(50) COLLATE utf8mb4_general_ci NOT NULL,
130   - `updateTime` varchar(50) COLLATE utf8mb4_general_ci NOT NULL,
131   - `subCount` int DEFAULT '0',
  130 + `createTime` varchar(50) NOT NULL,
  131 + `updateTime` varchar(50) NOT NULL,
  132 + `subCount` int(11) DEFAULT '0',
132 133 PRIMARY KEY (`id`),
133 134 UNIQUE KEY `device_channel_id_uindex` (`id`),
134 135 UNIQUE KEY `device_channel_pk` (`channelId`,`deviceId`)
135   -) ENGINE=InnoDB AUTO_INCREMENT=46 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
  136 +) ENGINE=InnoDB AUTO_INCREMENT=81657 DEFAULT CHARSET=utf8mb4;
136 137 /*!40101 SET character_set_client = @saved_cs_client */;
137 138  
138 139 --
... ... @@ -150,24 +151,24 @@ UNLOCK TABLES;
150 151  
151 152 DROP TABLE IF EXISTS `device_mobile_position`;
152 153 /*!40101 SET @saved_cs_client = @@character_set_client */;
153   -/*!50503 SET character_set_client = utf8mb4 */;
  154 +/*!40101 SET character_set_client = utf8 */;
154 155 CREATE TABLE `device_mobile_position` (
155   - `id` int NOT NULL AUTO_INCREMENT,
156   - `deviceId` varchar(50) COLLATE utf8mb4_general_ci NOT NULL,
157   - `channelId` varchar(50) COLLATE utf8mb4_general_ci NOT NULL,
158   - `deviceName` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL,
159   - `time` varchar(50) COLLATE utf8mb4_general_ci NOT NULL,
  156 + `id` int(11) NOT NULL AUTO_INCREMENT,
  157 + `deviceId` varchar(50) NOT NULL,
  158 + `channelId` varchar(50) NOT NULL,
  159 + `deviceName` varchar(255) DEFAULT NULL,
  160 + `time` varchar(50) NOT NULL,
160 161 `longitude` double NOT NULL,
161 162 `latitude` double NOT NULL,
162 163 `altitude` double DEFAULT NULL,
163 164 `speed` double DEFAULT NULL,
164 165 `direction` double DEFAULT NULL,
165   - `reportSource` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
166   - `geodeticSystem` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
167   - `cnLng` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
168   - `cnLat` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
  166 + `reportSource` varchar(50) DEFAULT NULL,
  167 + `geodeticSystem` varchar(50) DEFAULT NULL,
  168 + `cnLng` varchar(50) DEFAULT NULL,
  169 + `cnLat` varchar(50) DEFAULT NULL,
169 170 PRIMARY KEY (`id`)
170   -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
  171 +) ENGINE=InnoDB AUTO_INCREMENT=6108 DEFAULT CHARSET=utf8mb4;
171 172 /*!40101 SET character_set_client = @saved_cs_client */;
172 173  
173 174 --
... ... @@ -185,23 +186,23 @@ UNLOCK TABLES;
185 186  
186 187 DROP TABLE IF EXISTS `gb_stream`;
187 188 /*!40101 SET @saved_cs_client = @@character_set_client */;
188   -/*!50503 SET character_set_client = utf8mb4 */;
  189 +/*!40101 SET character_set_client = utf8 */;
189 190 CREATE TABLE `gb_stream` (
190   - `gbStreamId` int NOT NULL AUTO_INCREMENT,
191   - `app` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
192   - `stream` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
193   - `gbId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
194   - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  191 + `gbStreamId` int(11) NOT NULL AUTO_INCREMENT,
  192 + `app` varchar(255) NOT NULL,
  193 + `stream` varchar(255) NOT NULL,
  194 + `gbId` varchar(50) NOT NULL,
  195 + `name` varchar(255) DEFAULT NULL,
195 196 `longitude` double DEFAULT NULL,
196 197 `latitude` double DEFAULT NULL,
197   - `streamType` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
198   - `mediaServerId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
199   - `status` int DEFAULT NULL,
200   - `createStamp` bigint DEFAULT NULL,
  198 + `streamType` varchar(50) DEFAULT NULL,
  199 + `mediaServerId` varchar(50) DEFAULT NULL,
  200 + `status` int(11) DEFAULT NULL,
  201 + `createStamp` bigint(20) DEFAULT NULL,
201 202 PRIMARY KEY (`gbStreamId`) USING BTREE,
202 203 UNIQUE KEY `app` (`app`,`stream`) USING BTREE,
203 204 UNIQUE KEY `gbId` (`gbId`) USING BTREE
204   -) ENGINE=InnoDB AUTO_INCREMENT=300766 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
  205 +) ENGINE=InnoDB AUTO_INCREMENT=300769 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
205 206 /*!40101 SET character_set_client = @saved_cs_client */;
206 207  
207 208 --
... ... @@ -219,19 +220,19 @@ UNLOCK TABLES;
219 220  
220 221 DROP TABLE IF EXISTS `log`;
221 222 /*!40101 SET @saved_cs_client = @@character_set_client */;
222   -/*!50503 SET character_set_client = utf8mb4 */;
  223 +/*!40101 SET character_set_client = utf8 */;
223 224 CREATE TABLE `log` (
224   - `id` int NOT NULL AUTO_INCREMENT,
225   - `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
226   - `type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
227   - `uri` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
228   - `address` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
229   - `result` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
230   - `timing` bigint NOT NULL,
231   - `username` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
232   - `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  225 + `id` int(11) NOT NULL AUTO_INCREMENT,
  226 + `name` varchar(50) NOT NULL,
  227 + `type` varchar(50) NOT NULL,
  228 + `uri` varchar(200) NOT NULL,
  229 + `address` varchar(50) NOT NULL,
  230 + `result` varchar(50) NOT NULL,
  231 + `timing` bigint(20) NOT NULL,
  232 + `username` varchar(50) NOT NULL,
  233 + `createTime` varchar(50) NOT NULL,
233 234 PRIMARY KEY (`id`) USING BTREE
234   -) ENGINE=InnoDB AUTO_INCREMENT=962 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
  235 +) ENGINE=InnoDB AUTO_INCREMENT=1552 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
235 236 /*!40101 SET character_set_client = @saved_cs_client */;
236 237  
237 238 --
... ... @@ -249,34 +250,34 @@ UNLOCK TABLES;
249 250  
250 251 DROP TABLE IF EXISTS `media_server`;
251 252 /*!40101 SET @saved_cs_client = @@character_set_client */;
252   -/*!50503 SET character_set_client = utf8mb4 */;
  253 +/*!40101 SET character_set_client = utf8 */;
253 254 CREATE TABLE `media_server` (
254   - `id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
255   - `ip` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
256   - `hookIp` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
257   - `sdpIp` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
258   - `streamIp` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
259   - `httpPort` int NOT NULL,
260   - `httpSSlPort` int NOT NULL,
261   - `rtmpPort` int NOT NULL,
262   - `rtmpSSlPort` int NOT NULL,
263   - `rtpProxyPort` int NOT NULL,
264   - `rtspPort` int NOT NULL,
265   - `rtspSSLPort` int NOT NULL,
266   - `autoConfig` int NOT NULL,
267   - `secret` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
268   - `streamNoneReaderDelayMS` int NOT NULL,
269   - `rtpEnable` int NOT NULL,
270   - `rtpPortRange` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
271   - `sendRtpPortRange` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
272   - `recordAssistPort` int NOT NULL,
273   - `defaultServer` int NOT NULL,
274   - `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
275   - `updateTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
276   - `hookAliveInterval` int NOT NULL,
  255 + `id` varchar(255) NOT NULL,
  256 + `ip` varchar(50) NOT NULL,
  257 + `hookIp` varchar(50) NOT NULL,
  258 + `sdpIp` varchar(50) NOT NULL,
  259 + `streamIp` varchar(50) NOT NULL,
  260 + `httpPort` int(11) NOT NULL,
  261 + `httpSSlPort` int(11) NOT NULL,
  262 + `rtmpPort` int(11) NOT NULL,
  263 + `rtmpSSlPort` int(11) NOT NULL,
  264 + `rtpProxyPort` int(11) NOT NULL,
  265 + `rtspPort` int(11) NOT NULL,
  266 + `rtspSSLPort` int(11) NOT NULL,
  267 + `autoConfig` int(11) NOT NULL,
  268 + `secret` varchar(50) NOT NULL,
  269 + `streamNoneReaderDelayMS` int(11) NOT NULL,
  270 + `rtpEnable` int(11) NOT NULL,
  271 + `rtpPortRange` varchar(50) NOT NULL,
  272 + `sendRtpPortRange` varchar(50) NOT NULL,
  273 + `recordAssistPort` int(11) NOT NULL,
  274 + `defaultServer` int(11) NOT NULL,
  275 + `createTime` varchar(50) NOT NULL,
  276 + `updateTime` varchar(50) NOT NULL,
  277 + `hookAliveInterval` int(11) NOT NULL,
277 278 PRIMARY KEY (`id`) USING BTREE,
278 279 UNIQUE KEY `media_server_i` (`ip`,`httpPort`) USING BTREE
279   -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
  280 +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
280 281 /*!40101 SET character_set_client = @saved_cs_client */;
281 282  
282 283 --
... ... @@ -294,33 +295,36 @@ UNLOCK TABLES;
294 295  
295 296 DROP TABLE IF EXISTS `parent_platform`;
296 297 /*!40101 SET @saved_cs_client = @@character_set_client */;
297   -/*!50503 SET character_set_client = utf8mb4 */;
  298 +/*!40101 SET character_set_client = utf8 */;
298 299 CREATE TABLE `parent_platform` (
299   - `id` int NOT NULL AUTO_INCREMENT,
300   - `enable` int DEFAULT NULL,
301   - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
302   - `serverGBId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
303   - `serverGBDomain` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
304   - `serverIP` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
305   - `serverPort` int DEFAULT NULL,
306   - `deviceGBId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
307   - `deviceIp` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
308   - `devicePort` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
309   - `username` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
310   - `password` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
311   - `expires` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
312   - `keepTimeout` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
313   - `transport` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
314   - `characterSet` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
315   - `catalogId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
316   - `ptz` int DEFAULT NULL,
317   - `rtcp` int DEFAULT NULL,
  300 + `id` int(11) NOT NULL AUTO_INCREMENT,
  301 + `enable` int(11) DEFAULT NULL,
  302 + `name` varchar(255) DEFAULT NULL,
  303 + `serverGBId` varchar(50) NOT NULL,
  304 + `serverGBDomain` varchar(50) DEFAULT NULL,
  305 + `serverIP` varchar(50) DEFAULT NULL,
  306 + `serverPort` int(11) DEFAULT NULL,
  307 + `deviceGBId` varchar(50) NOT NULL,
  308 + `deviceIp` varchar(50) DEFAULT NULL,
  309 + `devicePort` varchar(50) DEFAULT NULL,
  310 + `username` varchar(255) DEFAULT NULL,
  311 + `password` varchar(50) DEFAULT NULL,
  312 + `expires` varchar(50) DEFAULT NULL,
  313 + `keepTimeout` varchar(50) DEFAULT NULL,
  314 + `transport` varchar(50) DEFAULT NULL,
  315 + `characterSet` varchar(50) DEFAULT NULL,
  316 + `catalogId` varchar(50) NOT NULL,
  317 + `ptz` int(11) DEFAULT NULL,
  318 + `rtcp` int(11) DEFAULT NULL,
318 319 `status` bit(1) DEFAULT NULL,
319   - `shareAllLiveStream` int DEFAULT NULL,
  320 + `shareAllLiveStream` int(11) DEFAULT NULL,
  321 + `startOfflinePush` int(11) DEFAULT '0',
  322 + `administrativeDivision` varchar(50) NOT NULL,
  323 + `catalogGroup` int(11) DEFAULT '1',
320 324 PRIMARY KEY (`id`),
321 325 UNIQUE KEY `parent_platform_id_uindex` (`id`),
322 326 UNIQUE KEY `parent_platform_pk` (`serverGBId`)
323   -) ENGINE=InnoDB AUTO_INCREMENT=23 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
  327 +) ENGINE=InnoDB AUTO_INCREMENT=25 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
324 328 /*!40101 SET character_set_client = @saved_cs_client */;
325 329  
326 330 --
... ... @@ -338,14 +342,14 @@ UNLOCK TABLES;
338 342  
339 343 DROP TABLE IF EXISTS `platform_catalog`;
340 344 /*!40101 SET @saved_cs_client = @@character_set_client */;
341   -/*!50503 SET character_set_client = utf8mb4 */;
  345 +/*!40101 SET character_set_client = utf8 */;
342 346 CREATE TABLE `platform_catalog` (
343   - `id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
344   - `platformId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
345   - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
346   - `parentId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  347 + `id` varchar(50) NOT NULL,
  348 + `platformId` varchar(50) NOT NULL,
  349 + `name` varchar(255) NOT NULL,
  350 + `parentId` varchar(50) DEFAULT NULL,
347 351 PRIMARY KEY (`id`) USING BTREE
348   -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
  352 +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
349 353 /*!40101 SET character_set_client = @saved_cs_client */;
350 354  
351 355 --
... ... @@ -363,14 +367,14 @@ UNLOCK TABLES;
363 367  
364 368 DROP TABLE IF EXISTS `platform_gb_channel`;
365 369 /*!40101 SET @saved_cs_client = @@character_set_client */;
366   -/*!50503 SET character_set_client = utf8mb4 */;
  370 +/*!40101 SET character_set_client = utf8 */;
367 371 CREATE TABLE `platform_gb_channel` (
368   - `id` int NOT NULL AUTO_INCREMENT,
369   - `platformId` varchar(50) COLLATE utf8mb4_general_ci NOT NULL,
370   - `catalogId` varchar(50) COLLATE utf8mb4_general_ci NOT NULL,
371   - `deviceChannelId` int NOT NULL,
  372 + `id` int(11) NOT NULL AUTO_INCREMENT,
  373 + `platformId` varchar(50) NOT NULL,
  374 + `catalogId` varchar(50) NOT NULL,
  375 + `deviceChannelId` int(11) NOT NULL,
372 376 PRIMARY KEY (`id`)
373   -) ENGINE=InnoDB AUTO_INCREMENT=47 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
  377 +) ENGINE=InnoDB AUTO_INCREMENT=250 DEFAULT CHARSET=utf8mb4;
374 378 /*!40101 SET character_set_client = @saved_cs_client */;
375 379  
376 380 --
... ... @@ -388,15 +392,15 @@ UNLOCK TABLES;
388 392  
389 393 DROP TABLE IF EXISTS `platform_gb_stream`;
390 394 /*!40101 SET @saved_cs_client = @@character_set_client */;
391   -/*!50503 SET character_set_client = utf8mb4 */;
  395 +/*!40101 SET character_set_client = utf8 */;
392 396 CREATE TABLE `platform_gb_stream` (
393   - `platformId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
394   - `catalogId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
395   - `gbStreamId` int NOT NULL,
396   - `id` int NOT NULL AUTO_INCREMENT,
  397 + `platformId` varchar(50) NOT NULL,
  398 + `catalogId` varchar(50) NOT NULL,
  399 + `gbStreamId` int(11) NOT NULL,
  400 + `id` int(11) NOT NULL AUTO_INCREMENT,
397 401 PRIMARY KEY (`id`),
398 402 UNIQUE KEY `platform_gb_stream_pk` (`platformId`,`catalogId`,`gbStreamId`)
399   -) ENGINE=InnoDB AUTO_INCREMENT=301207 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
  403 +) ENGINE=InnoDB AUTO_INCREMENT=301210 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
400 404 /*!40101 SET character_set_client = @saved_cs_client */;
401 405  
402 406 --
... ... @@ -414,29 +418,29 @@ UNLOCK TABLES;
414 418  
415 419 DROP TABLE IF EXISTS `stream_proxy`;
416 420 /*!40101 SET @saved_cs_client = @@character_set_client */;
417   -/*!50503 SET character_set_client = utf8mb4 */;
  421 +/*!40101 SET character_set_client = utf8 */;
418 422 CREATE TABLE `stream_proxy` (
419   - `id` int NOT NULL AUTO_INCREMENT,
420   - `type` varchar(50) COLLATE utf8mb4_general_ci NOT NULL,
421   - `app` varchar(255) COLLATE utf8mb4_general_ci NOT NULL,
422   - `stream` varchar(255) COLLATE utf8mb4_general_ci NOT NULL,
423   - `url` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL,
424   - `src_url` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL,
425   - `dst_url` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL,
426   - `timeout_ms` int DEFAULT NULL,
427   - `ffmpeg_cmd_key` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL,
428   - `rtp_type` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
429   - `mediaServerId` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
  423 + `id` int(11) NOT NULL AUTO_INCREMENT,
  424 + `type` varchar(50) NOT NULL,
  425 + `app` varchar(255) NOT NULL,
  426 + `stream` varchar(255) NOT NULL,
  427 + `url` varchar(255) DEFAULT NULL,
  428 + `src_url` varchar(255) DEFAULT NULL,
  429 + `dst_url` varchar(255) DEFAULT NULL,
  430 + `timeout_ms` int(11) DEFAULT NULL,
  431 + `ffmpeg_cmd_key` varchar(255) DEFAULT NULL,
  432 + `rtp_type` varchar(50) DEFAULT NULL,
  433 + `mediaServerId` varchar(50) DEFAULT NULL,
430 434 `enable_hls` bit(1) DEFAULT NULL,
431 435 `enable_mp4` bit(1) DEFAULT NULL,
432 436 `enable` bit(1) NOT NULL,
433 437 `status` bit(1) NOT NULL,
434 438 `enable_remove_none_reader` bit(1) NOT NULL,
435   - `createTime` varchar(50) COLLATE utf8mb4_general_ci NOT NULL,
436   - `name` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL,
  439 + `createTime` varchar(50) NOT NULL,
  440 + `name` varchar(255) DEFAULT NULL,
437 441 PRIMARY KEY (`id`),
438 442 UNIQUE KEY `stream_proxy_pk` (`app`,`stream`)
439   -) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
  443 +) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8mb4;
440 444 /*!40101 SET character_set_client = @saved_cs_client */;
441 445  
442 446 --
... ... @@ -454,20 +458,20 @@ UNLOCK TABLES;
454 458  
455 459 DROP TABLE IF EXISTS `stream_push`;
456 460 /*!40101 SET @saved_cs_client = @@character_set_client */;
457   -/*!50503 SET character_set_client = utf8mb4 */;
  461 +/*!40101 SET character_set_client = utf8 */;
458 462 CREATE TABLE `stream_push` (
459   - `id` int NOT NULL AUTO_INCREMENT,
460   - `app` varchar(255) COLLATE utf8mb4_general_ci NOT NULL,
461   - `stream` varchar(255) COLLATE utf8mb4_general_ci NOT NULL,
462   - `totalReaderCount` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
463   - `originType` int DEFAULT NULL,
464   - `originTypeStr` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
465   - `createStamp` bigint DEFAULT NULL,
466   - `aliveSecond` int DEFAULT NULL,
467   - `mediaServerId` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
  463 + `id` int(11) NOT NULL AUTO_INCREMENT,
  464 + `app` varchar(255) NOT NULL,
  465 + `stream` varchar(255) NOT NULL,
  466 + `totalReaderCount` varchar(50) DEFAULT NULL,
  467 + `originType` int(11) DEFAULT NULL,
  468 + `originTypeStr` varchar(50) DEFAULT NULL,
  469 + `createStamp` bigint(20) DEFAULT NULL,
  470 + `aliveSecond` int(11) DEFAULT NULL,
  471 + `mediaServerId` varchar(50) DEFAULT NULL,
468 472 PRIMARY KEY (`id`),
469 473 UNIQUE KEY `stream_push_pk` (`app`,`stream`)
470   -) ENGINE=InnoDB AUTO_INCREMENT=300799 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
  474 +) ENGINE=InnoDB AUTO_INCREMENT=300838 DEFAULT CHARSET=utf8mb4;
471 475 /*!40101 SET character_set_client = @saved_cs_client */;
472 476  
473 477 --
... ... @@ -485,17 +489,17 @@ UNLOCK TABLES;
485 489  
486 490 DROP TABLE IF EXISTS `user`;
487 491 /*!40101 SET @saved_cs_client = @@character_set_client */;
488   -/*!50503 SET character_set_client = utf8mb4 */;
  492 +/*!40101 SET character_set_client = utf8 */;
489 493 CREATE TABLE `user` (
490   - `id` int NOT NULL AUTO_INCREMENT,
491   - `username` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
492   - `password` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
493   - `roleId` int NOT NULL,
494   - `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
495   - `updateTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  494 + `id` int(11) NOT NULL AUTO_INCREMENT,
  495 + `username` varchar(255) NOT NULL,
  496 + `password` varchar(255) NOT NULL,
  497 + `roleId` int(11) NOT NULL,
  498 + `createTime` varchar(50) NOT NULL,
  499 + `updateTime` varchar(50) NOT NULL,
496 500 PRIMARY KEY (`id`) USING BTREE,
497 501 UNIQUE KEY `user_username_uindex` (`username`) USING BTREE
498   -) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
  502 +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
499 503 /*!40101 SET character_set_client = @saved_cs_client */;
500 504  
501 505 --
... ... @@ -504,7 +508,8 @@ CREATE TABLE `user` (
504 508  
505 509 LOCK TABLES `user` WRITE;
506 510 /*!40000 ALTER TABLE `user` DISABLE KEYS */;
507   -INSERT INTO `user` VALUES (1,'admin','21232f297a57a5a743894a0e4a801fc3',1,'2021 - 04 - 13 14:14:57','2021 - 04 - 13 14:14:57');
  511 +INSERT INTO `user` VALUES
  512 + (1,'admin','21232f297a57a5a743894a0e4a801fc3',1,'2021 - 04 - 13 14:14:57','2021 - 04 - 13 14:14:57');
508 513 /*!40000 ALTER TABLE `user` ENABLE KEYS */;
509 514 UNLOCK TABLES;
510 515  
... ... @@ -514,15 +519,15 @@ UNLOCK TABLES;
514 519  
515 520 DROP TABLE IF EXISTS `user_role`;
516 521 /*!40101 SET @saved_cs_client = @@character_set_client */;
517   -/*!50503 SET character_set_client = utf8mb4 */;
  522 +/*!40101 SET character_set_client = utf8 */;
518 523 CREATE TABLE `user_role` (
519   - `id` int NOT NULL AUTO_INCREMENT,
520   - `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
521   - `authority` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
522   - `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
523   - `updateTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  524 + `id` int(11) NOT NULL AUTO_INCREMENT,
  525 + `name` varchar(50) NOT NULL,
  526 + `authority` varchar(50) NOT NULL,
  527 + `createTime` varchar(50) NOT NULL,
  528 + `updateTime` varchar(50) NOT NULL,
524 529 PRIMARY KEY (`id`) USING BTREE
525   -) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
  530 +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
526 531 /*!40101 SET character_set_client = @saved_cs_client */;
527 532  
528 533 --
... ... @@ -531,7 +536,8 @@ CREATE TABLE `user_role` (
531 536  
532 537 LOCK TABLES `user_role` WRITE;
533 538 /*!40000 ALTER TABLE `user_role` DISABLE KEYS */;
534   -INSERT INTO `user_role` VALUES (1,'admin','0','2021-04-13 14:14:57','2021-04-13 14:14:57');
  539 +INSERT INTO `user_role` VALUES
  540 + (1,'admin','0','2021-04-13 14:14:57','2021-04-13 14:14:57');
535 541 /*!40000 ALTER TABLE `user_role` ENABLE KEYS */;
536 542 UNLOCK TABLES;
537 543 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
... ... @@ -544,4 +550,4 @@ UNLOCK TABLES;
544 550 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
545 551 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
546 552  
547   --- Dump completed on 2022-03-07 8:26:30
  553 +-- Dump completed on 2022-04-18 10:50:27
... ...
sql/update.sql
  View file @d36920c
1   -alter table device
2   - add subscribeCycleForMobilePosition int null;
  1 +alter table parent_platform
  2 + add startOfflinePush int default 0 null;
3 3  
4   -alter table device
5   - add mobilePositionSubmissionInterval int default 5 null;
  4 +alter table parent_platform
  5 + add administrativeDivision varchar(50) not null;
  6 +
  7 +alter table parent_platform
  8 + add catalogGroup int default 1 null;
6 9  
7 10 alter table device
8   - add subscribeCycleForAlarm int null;
9 11 \ No newline at end of file
  12 + add ssrcCheck int default 0 null;
  13 +
... ...
src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java
  View file @d36920c
... ... @@ -129,6 +129,11 @@ public class ParentPlatform {
129 129 */
130 130 private boolean mobilePositionSubscribe;
131 131  
  132 + /**
  133 + * 点播未推流的设备时是否使用redis通知拉起
  134 + */
  135 + private boolean startOfflinePush;
  136 +
132 137 public Integer getId() {
133 138 return id;
134 139 }
... ... @@ -329,4 +334,12 @@ public class ParentPlatform {
329 334 public void setMobilePositionSubscribe(boolean mobilePositionSubscribe) {
330 335 this.mobilePositionSubscribe = mobilePositionSubscribe;
331 336 }
  337 +
  338 + public boolean isStartOfflinePush() {
  339 + return startOfflinePush;
  340 + }
  341 +
  342 + public void setStartOfflinePush(boolean startOfflinePush) {
  343 + this.startOfflinePush = startOfflinePush;
  344 + }
332 345 }
... ...
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
  View file @d36920c
... ... @@ -397,6 +397,10 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
397 397 logger.info("[ app={}, stream={} ]通道离线，启用流后开始推流",gbStream.getApp(), gbStream.getStream());
398 398 responseAck(evt, Response.BAD_REQUEST, "channel [" + gbStream.getGbId() + "] offline");
399 399 }else if ("push".equals(gbStream.getStreamType())) {
  400 + if (!platform.isStartOfflinePush()) {
  401 + responseAck(evt, Response.TEMPORARILY_UNAVAILABLE, "channel unavailable");
  402 + return;
  403 + }
400 404 // 发送redis消息以使设备上线
401 405 logger.info("[ app={}, stream={} ]通道离线，发送redis信息控制设备开始推流",gbStream.getApp(), gbStream.getStream());
402 406 MessageForPushChannel messageForPushChannel = new MessageForPushChannel();
... ...
src/main/java/com/genersoft/iot/vmp/storager/dao/ParentPlatformMapper.java
  View file @d36920c
... ... @@ -16,10 +16,10 @@ public interface ParentPlatformMapper {
16 16  
17 17 @Insert("INSERT INTO parent_platform (enable, name, serverGBId, serverGBDomain, serverIP, serverPort, deviceGBId, deviceIp, " +
18 18 " devicePort, username, password, expires, keepTimeout, transport, characterSet, ptz, rtcp, " +
19   - " status, shareAllLiveStream, catalogId) " +
  19 + " status, shareAllLiveStream, startOfflinePush, catalogId) " +
20 20 " VALUES (${enable}, '${name}', '${serverGBId}', '${serverGBDomain}', '${serverIP}', ${serverPort}, '${deviceGBId}', '${deviceIp}', " +
21 21 " '${devicePort}', '${username}', '${password}', '${expires}', '${keepTimeout}', '${transport}', '${characterSet}', ${ptz}, ${rtcp}, " +
22   - " ${status}, ${shareAllLiveStream}, #{catalogId})")
  22 + " ${status}, ${shareAllLiveStream}, ${startOfflinePush}, #{catalogId})")
23 23 int addParentPlatform(ParentPlatform parentPlatform);
24 24  
25 25 @Update("UPDATE parent_platform " +
... ... @@ -42,6 +42,7 @@ public interface ParentPlatformMapper {
42 42 "rtcp=#{rtcp}, " +
43 43 "status=#{status}, " +
44 44 "shareAllLiveStream=#{shareAllLiveStream}, " +
  45 + "startOfflinePush=${startOfflinePush}, " +
45 46 "catalogId=#{catalogId} " +
46 47 "WHERE id=#{id}")
47 48 int updateParentPlatform(ParentPlatform parentPlatform);
... ...
web_src/src/components/dialog/platformEdit.vue
  View file @d36920c
... ... @@ -77,6 +77,7 @@
77 77 <el-checkbox label="启用" v-model="platform.enable" @change="checkExpires"></el-checkbox>
78 78 <el-checkbox label="云台控制" v-model="platform.ptz"></el-checkbox>
79 79 <el-checkbox label="共享所有直播流" v-model="platform.shareAllLiveStream"></el-checkbox>
  80 + <el-checkbox label="拉起离线推流" v-model="platform.startOfflinePush"></el-checkbox>
80 81 </el-form-item>
81 82 <el-form-item>
82 83 <el-button type="primary" @click="onSubmit">{{
... ... @@ -138,6 +139,7 @@ export default {
138 139 transport: "UDP",
139 140 characterSet: "GB2312",
140 141 shareAllLiveStream: false,
  142 + startOfflinePush: false,
141 143 },
142 144 rules: {
143 145 name: [{ required: true, message: "请输入平台名称", trigger: "blur" }],
... ... @@ -199,6 +201,7 @@ export default {
199 201 this.platform.characterSet = platform.characterSet;
200 202 this.platform.shareAllLiveStream = platform.shareAllLiveStream;
201 203 this.platform.catalogId = platform.catalogId;
  204 + this.platform.startOfflinePush = platform.startOfflinePush;
202 205 this.onSubmit_text = "保存";
203 206 this.saveUrl = "/api/platform/save";
204 207 }
... ...