From d36920c699d21b4381d679a64a4369cf22e10139 Mon Sep 17 00:00:00 2001
From: 648540858 <456panlinlin>
Date: Mon, 18 Apr 2022 10:52:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=87=AA=E5=8A=A8=E6=8B=89?=
=?UTF-8?q?=E8=B5=B7=E6=9C=AA=E6=8E=A8=E6=B5=81=E8=AE=BE=E5=A4=87=E7=9A=84?=
=?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
README.md | 4 +-
pom.xml | 2 +-
sql/clean.sql | 13 +
sql/mysql.sql | 426 +++++++++---------
sql/update.sql | 14 +-
.../iot/vmp/gb28181/bean/ParentPlatform.java | 13 +
.../request/impl/InviteRequestProcessor.java | 4 +
.../storager/dao/ParentPlatformMapper.java | 5 +-
.../src/components/dialog/platformEdit.vue | 3 +
9 files changed, 264 insertions(+), 220 deletions(-)
create mode 100644 sql/clean.sql
diff --git a/README.md b/README.md
index 69645b01..aec9555c 100644
--- a/README.md
+++ b/README.md
@@ -134,10 +134,10 @@ QQ私信一般不回, 精力有限.欢迎大家在群里讨论.觉得项目对
感谢作者[dexter langhuihui](https://github.com/langhuihui) 开源这么好用的WEB播放器。
感谢作者[Kyle](https://gitee.com/kkkkk5G) 开源了好用的前端页面
感谢各位大佬的赞助以及对项目的指正与帮助。包括但不限于代码贡献、问题反馈、资金捐赠等各种方式的支持！以下排名不分先后：
-[lawrencehj](https://github.com/lawrencehj) @陆丰-创奇科技 [swwhaha](https://github.com/swwheihei)
+[lawrencehj](https://github.com/lawrencehj) [Smallwhitepig](https://github.com/Smallwhitepig) [swwhaha](https://github.com/swwheihei)
[hotcoffie](https://github.com/hotcoffie) [xiaomu](https://github.com/nikmu) [TristingChen](https://github.com/TristingChen)
[chenparty](https://github.com/chenparty) [Hotleave](https://github.com/hotleave) [ydwxb](https://github.com/ydwxb)
-[ydpd](https://github.com/ydpd) [szy833](https://github.com/szy833) [ydwxb](https://github.com/ydwxb)
+[ydpd](https://github.com/ydpd) [szy833](https://github.com/szy833) [ydwxb](https://github.com/ydwxb) [Albertzhu666](https://github.com/Albertzhu666)
ps: 刚增加了这个名单，肯定遗漏了一些大佬，欢迎大佬联系我添加。
diff --git a/pom.xml b/pom.xml
index 7ad53db9..befb74f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
com.genersoft
wvp-pro
- 2.0.2
+ 2.1.1
web video platform
国标28181视频平台
diff --git a/sql/clean.sql b/sql/clean.sql
new file mode 100644
index 00000000..b8343912
--- /dev/null
+++ b/sql/clean.sql
@@ -0,0 +1,13 @@
+delete from device;
+delete from device_alarm;
+delete from device_channel;
+delete from device_mobile_position;
+delete from gb_stream;
+delete from log;
+delete from media_server;
+delete from parent_platform;
+delete from platform_catalog;
+delete from platform_gb_channel;
+delete from platform_gb_stream;
+delete from stream_proxy;
+delete from stream_push;
\ No newline at end of file
diff --git a/sql/mysql.sql b/sql/mysql.sql
index d1706b31..cffaa690 100644
--- a/sql/mysql.sql
+++ b/sql/mysql.sql
@@ -1,13 +1,13 @@
--- MySQL dump 10.13 Distrib 8.0.28, for Linux (x86_64)
+-- MariaDB dump 10.19 Distrib 10.7.3-MariaDB, for Linux (x86_64)
--
--- Host: 127.0.0.1 Database: wvp
+-- Host: 127.0.0.1 Database: wvp3
-- ------------------------------------------------------
--- Server version 8.0.28-0ubuntu0.20.04.3
+-- Server version 8.0.0-dmr
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!50503 SET NAMES utf8mb4 */;
+/*!40101 SET NAMES utf8mb4 */;
/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
/*!40103 SET TIME_ZONE='+00:00' */;
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
@@ -21,33 +21,34 @@
DROP TABLE IF EXISTS `device`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
+/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `device` (
- `id` int NOT NULL AUTO_INCREMENT,
- `deviceId` varchar(50) COLLATE utf8mb4_general_ci NOT NULL,
- `name` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL,
- `manufacturer` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL,
- `model` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL,
- `firmware` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL,
- `transport` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
- `streamMode` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
- `online` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
- `registerTime` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
- `keepaliveTime` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
- `ip` varchar(50) COLLATE utf8mb4_general_ci NOT NULL,
- `createTime` varchar(50) COLLATE utf8mb4_general_ci NOT NULL,
- `updateTime` varchar(50) COLLATE utf8mb4_general_ci NOT NULL,
- `port` int NOT NULL,
- `expires` int NOT NULL,
- `subscribeCycleForCatalog` int NOT NULL,
- `subscribeCycleForMobilePosition` int NOT NULL,
- `mobilePositionSubmissionInterval` int DEFAULT 5 NOT NULL,
- `subscribeCycleForAlarm` int NOT NULL,
- `hostAddress` varchar(50) COLLATE utf8mb4_general_ci NOT NULL,
- `charset` varchar(50) COLLATE utf8mb4_general_ci NOT NULL,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `deviceId` varchar(50) NOT NULL,
+ `name` varchar(255) DEFAULT NULL,
+ `manufacturer` varchar(255) DEFAULT NULL,
+ `model` varchar(255) DEFAULT NULL,
+ `firmware` varchar(255) DEFAULT NULL,
+ `transport` varchar(50) DEFAULT NULL,
+ `streamMode` varchar(50) DEFAULT NULL,
+ `online` varchar(50) DEFAULT NULL,
+ `registerTime` varchar(50) DEFAULT NULL,
+ `keepaliveTime` varchar(50) DEFAULT NULL,
+ `ip` varchar(50) NOT NULL,
+ `createTime` varchar(50) NOT NULL,
+ `updateTime` varchar(50) NOT NULL,
+ `port` int(11) NOT NULL,
+ `expires` int(11) NOT NULL,
+ `subscribeCycleForCatalog` int(11) NOT NULL,
+ `subscribeCycleForMobilePosition` int(11) NOT NULL,
+ `mobilePositionSubmissionInterval` int(11) NOT NULL DEFAULT '5',
+ `subscribeCycleForAlarm` int(11) NOT NULL,
+ `hostAddress` varchar(50) NOT NULL,
+ `charset` varchar(50) NOT NULL,
+ `ssrcCheck` int(11) DEFAULT '0',
PRIMARY KEY (`id`),
UNIQUE KEY `device_deviceId_uindex` (`deviceId`)
-) ENGINE=InnoDB AUTO_INCREMENT=21 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=47 DEFAULT CHARSET=utf8mb4;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -65,20 +66,20 @@ UNLOCK TABLES;
DROP TABLE IF EXISTS `device_alarm`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
+/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `device_alarm` (
- `id` int NOT NULL AUTO_INCREMENT,
- `deviceId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
- `channelId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
- `alarmPriority` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
- `alarmMethod` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
- `alarmTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
- `alarmDescription` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `deviceId` varchar(50) NOT NULL,
+ `channelId` varchar(50) NOT NULL,
+ `alarmPriority` varchar(50) NOT NULL,
+ `alarmMethod` varchar(50) DEFAULT NULL,
+ `alarmTime` varchar(50) NOT NULL,
+ `alarmDescription` varchar(255) DEFAULT NULL,
`longitude` double DEFAULT NULL,
`latitude` double DEFAULT NULL,
- `alarmType` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+ `alarmType` varchar(50) DEFAULT NULL,
PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -96,43 +97,43 @@ UNLOCK TABLES;
DROP TABLE IF EXISTS `device_channel`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
+/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `device_channel` (
- `id` int NOT NULL AUTO_INCREMENT,
- `channelId` varchar(50) COLLATE utf8mb4_general_ci NOT NULL,
- `name` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL,
- `manufacture` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
- `model` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
- `owner` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
- `civilCode` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
- `block` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
- `address` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
- `parentId` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
- `safetyWay` int DEFAULT NULL,
- `registerWay` int DEFAULT NULL,
- `certNum` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
- `certifiable` int DEFAULT NULL,
- `errCode` int DEFAULT NULL,
- `endTime` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
- `secrecy` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
- `ipAddress` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
- `port` int DEFAULT NULL,
- `password` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL,
- `PTZType` int DEFAULT NULL,
- `status` int DEFAULT NULL,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `channelId` varchar(50) NOT NULL,
+ `name` varchar(255) DEFAULT NULL,
+ `manufacture` varchar(50) DEFAULT NULL,
+ `model` varchar(50) DEFAULT NULL,
+ `owner` varchar(50) DEFAULT NULL,
+ `civilCode` varchar(50) DEFAULT NULL,
+ `block` varchar(50) DEFAULT NULL,
+ `address` varchar(50) DEFAULT NULL,
+ `parentId` varchar(50) DEFAULT NULL,
+ `safetyWay` int(11) DEFAULT NULL,
+ `registerWay` int(11) DEFAULT NULL,
+ `certNum` varchar(50) DEFAULT NULL,
+ `certifiable` int(11) DEFAULT NULL,
+ `errCode` int(11) DEFAULT NULL,
+ `endTime` varchar(50) DEFAULT NULL,
+ `secrecy` varchar(50) DEFAULT NULL,
+ `ipAddress` varchar(50) DEFAULT NULL,
+ `port` int(11) DEFAULT NULL,
+ `password` varchar(255) DEFAULT NULL,
+ `PTZType` int(11) DEFAULT NULL,
+ `status` int(11) DEFAULT NULL,
`longitude` double DEFAULT NULL,
`latitude` double DEFAULT NULL,
- `streamId` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
- `deviceId` varchar(50) COLLATE utf8mb4_general_ci NOT NULL,
- `parental` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
+ `streamId` varchar(50) DEFAULT NULL,
+ `deviceId` varchar(50) NOT NULL,
+ `parental` varchar(50) DEFAULT NULL,
`hasAudio` bit(1) DEFAULT NULL,
- `createTime` varchar(50) COLLATE utf8mb4_general_ci NOT NULL,
- `updateTime` varchar(50) COLLATE utf8mb4_general_ci NOT NULL,
- `subCount` int DEFAULT '0',
+ `createTime` varchar(50) NOT NULL,
+ `updateTime` varchar(50) NOT NULL,
+ `subCount` int(11) DEFAULT '0',
PRIMARY KEY (`id`),
UNIQUE KEY `device_channel_id_uindex` (`id`),
UNIQUE KEY `device_channel_pk` (`channelId`,`deviceId`)
-) ENGINE=InnoDB AUTO_INCREMENT=46 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=81657 DEFAULT CHARSET=utf8mb4;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -150,24 +151,24 @@ UNLOCK TABLES;
DROP TABLE IF EXISTS `device_mobile_position`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
+/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `device_mobile_position` (
- `id` int NOT NULL AUTO_INCREMENT,
- `deviceId` varchar(50) COLLATE utf8mb4_general_ci NOT NULL,
- `channelId` varchar(50) COLLATE utf8mb4_general_ci NOT NULL,
- `deviceName` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL,
- `time` varchar(50) COLLATE utf8mb4_general_ci NOT NULL,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `deviceId` varchar(50) NOT NULL,
+ `channelId` varchar(50) NOT NULL,
+ `deviceName` varchar(255) DEFAULT NULL,
+ `time` varchar(50) NOT NULL,
`longitude` double NOT NULL,
`latitude` double NOT NULL,
`altitude` double DEFAULT NULL,
`speed` double DEFAULT NULL,
`direction` double DEFAULT NULL,
- `reportSource` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
- `geodeticSystem` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
- `cnLng` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
- `cnLat` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
+ `reportSource` varchar(50) DEFAULT NULL,
+ `geodeticSystem` varchar(50) DEFAULT NULL,
+ `cnLng` varchar(50) DEFAULT NULL,
+ `cnLat` varchar(50) DEFAULT NULL,
PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=6108 DEFAULT CHARSET=utf8mb4;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -185,23 +186,23 @@ UNLOCK TABLES;
DROP TABLE IF EXISTS `gb_stream`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
+/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `gb_stream` (
- `gbStreamId` int NOT NULL AUTO_INCREMENT,
- `app` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
- `stream` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
- `gbId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
- `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+ `gbStreamId` int(11) NOT NULL AUTO_INCREMENT,
+ `app` varchar(255) NOT NULL,
+ `stream` varchar(255) NOT NULL,
+ `gbId` varchar(50) NOT NULL,
+ `name` varchar(255) DEFAULT NULL,
`longitude` double DEFAULT NULL,
`latitude` double DEFAULT NULL,
- `streamType` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
- `mediaServerId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
- `status` int DEFAULT NULL,
- `createStamp` bigint DEFAULT NULL,
+ `streamType` varchar(50) DEFAULT NULL,
+ `mediaServerId` varchar(50) DEFAULT NULL,
+ `status` int(11) DEFAULT NULL,
+ `createStamp` bigint(20) DEFAULT NULL,
PRIMARY KEY (`gbStreamId`) USING BTREE,
UNIQUE KEY `app` (`app`,`stream`) USING BTREE,
UNIQUE KEY `gbId` (`gbId`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=300766 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
+) ENGINE=InnoDB AUTO_INCREMENT=300769 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -219,19 +220,19 @@ UNLOCK TABLES;
DROP TABLE IF EXISTS `log`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
+/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `log` (
- `id` int NOT NULL AUTO_INCREMENT,
- `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
- `type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
- `uri` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
- `address` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
- `result` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
- `timing` bigint NOT NULL,
- `username` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
- `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `name` varchar(50) NOT NULL,
+ `type` varchar(50) NOT NULL,
+ `uri` varchar(200) NOT NULL,
+ `address` varchar(50) NOT NULL,
+ `result` varchar(50) NOT NULL,
+ `timing` bigint(20) NOT NULL,
+ `username` varchar(50) NOT NULL,
+ `createTime` varchar(50) NOT NULL,
PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=962 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
+) ENGINE=InnoDB AUTO_INCREMENT=1552 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -249,34 +250,34 @@ UNLOCK TABLES;
DROP TABLE IF EXISTS `media_server`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
+/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `media_server` (
- `id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
- `ip` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
- `hookIp` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
- `sdpIp` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
- `streamIp` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
- `httpPort` int NOT NULL,
- `httpSSlPort` int NOT NULL,
- `rtmpPort` int NOT NULL,
- `rtmpSSlPort` int NOT NULL,
- `rtpProxyPort` int NOT NULL,
- `rtspPort` int NOT NULL,
- `rtspSSLPort` int NOT NULL,
- `autoConfig` int NOT NULL,
- `secret` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
- `streamNoneReaderDelayMS` int NOT NULL,
- `rtpEnable` int NOT NULL,
- `rtpPortRange` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
- `sendRtpPortRange` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
- `recordAssistPort` int NOT NULL,
- `defaultServer` int NOT NULL,
- `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
- `updateTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
- `hookAliveInterval` int NOT NULL,
+ `id` varchar(255) NOT NULL,
+ `ip` varchar(50) NOT NULL,
+ `hookIp` varchar(50) NOT NULL,
+ `sdpIp` varchar(50) NOT NULL,
+ `streamIp` varchar(50) NOT NULL,
+ `httpPort` int(11) NOT NULL,
+ `httpSSlPort` int(11) NOT NULL,
+ `rtmpPort` int(11) NOT NULL,
+ `rtmpSSlPort` int(11) NOT NULL,
+ `rtpProxyPort` int(11) NOT NULL,
+ `rtspPort` int(11) NOT NULL,
+ `rtspSSLPort` int(11) NOT NULL,
+ `autoConfig` int(11) NOT NULL,
+ `secret` varchar(50) NOT NULL,
+ `streamNoneReaderDelayMS` int(11) NOT NULL,
+ `rtpEnable` int(11) NOT NULL,
+ `rtpPortRange` varchar(50) NOT NULL,
+ `sendRtpPortRange` varchar(50) NOT NULL,
+ `recordAssistPort` int(11) NOT NULL,
+ `defaultServer` int(11) NOT NULL,
+ `createTime` varchar(50) NOT NULL,
+ `updateTime` varchar(50) NOT NULL,
+ `hookAliveInterval` int(11) NOT NULL,
PRIMARY KEY (`id`) USING BTREE,
UNIQUE KEY `media_server_i` (`ip`,`httpPort`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -294,33 +295,36 @@ UNLOCK TABLES;
DROP TABLE IF EXISTS `parent_platform`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
+/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `parent_platform` (
- `id` int NOT NULL AUTO_INCREMENT,
- `enable` int DEFAULT NULL,
- `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
- `serverGBId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
- `serverGBDomain` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
- `serverIP` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
- `serverPort` int DEFAULT NULL,
- `deviceGBId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
- `deviceIp` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
- `devicePort` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
- `username` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
- `password` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
- `expires` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
- `keepTimeout` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
- `transport` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
- `characterSet` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
- `catalogId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
- `ptz` int DEFAULT NULL,
- `rtcp` int DEFAULT NULL,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `enable` int(11) DEFAULT NULL,
+ `name` varchar(255) DEFAULT NULL,
+ `serverGBId` varchar(50) NOT NULL,
+ `serverGBDomain` varchar(50) DEFAULT NULL,
+ `serverIP` varchar(50) DEFAULT NULL,
+ `serverPort` int(11) DEFAULT NULL,
+ `deviceGBId` varchar(50) NOT NULL,
+ `deviceIp` varchar(50) DEFAULT NULL,
+ `devicePort` varchar(50) DEFAULT NULL,
+ `username` varchar(255) DEFAULT NULL,
+ `password` varchar(50) DEFAULT NULL,
+ `expires` varchar(50) DEFAULT NULL,
+ `keepTimeout` varchar(50) DEFAULT NULL,
+ `transport` varchar(50) DEFAULT NULL,
+ `characterSet` varchar(50) DEFAULT NULL,
+ `catalogId` varchar(50) NOT NULL,
+ `ptz` int(11) DEFAULT NULL,
+ `rtcp` int(11) DEFAULT NULL,
`status` bit(1) DEFAULT NULL,
- `shareAllLiveStream` int DEFAULT NULL,
+ `shareAllLiveStream` int(11) DEFAULT NULL,
+ `startOfflinePush` int(11) DEFAULT '0',
+ `administrativeDivision` varchar(50) NOT NULL,
+ `catalogGroup` int(11) DEFAULT '1',
PRIMARY KEY (`id`),
UNIQUE KEY `parent_platform_id_uindex` (`id`),
UNIQUE KEY `parent_platform_pk` (`serverGBId`)
-) ENGINE=InnoDB AUTO_INCREMENT=23 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
+) ENGINE=InnoDB AUTO_INCREMENT=25 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -338,14 +342,14 @@ UNLOCK TABLES;
DROP TABLE IF EXISTS `platform_catalog`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
+/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `platform_catalog` (
- `id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
- `platformId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
- `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
- `parentId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+ `id` varchar(50) NOT NULL,
+ `platformId` varchar(50) NOT NULL,
+ `name` varchar(255) NOT NULL,
+ `parentId` varchar(50) DEFAULT NULL,
PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -363,14 +367,14 @@ UNLOCK TABLES;
DROP TABLE IF EXISTS `platform_gb_channel`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
+/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `platform_gb_channel` (
- `id` int NOT NULL AUTO_INCREMENT,
- `platformId` varchar(50) COLLATE utf8mb4_general_ci NOT NULL,
- `catalogId` varchar(50) COLLATE utf8mb4_general_ci NOT NULL,
- `deviceChannelId` int NOT NULL,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `platformId` varchar(50) NOT NULL,
+ `catalogId` varchar(50) NOT NULL,
+ `deviceChannelId` int(11) NOT NULL,
PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=47 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=250 DEFAULT CHARSET=utf8mb4;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -388,15 +392,15 @@ UNLOCK TABLES;
DROP TABLE IF EXISTS `platform_gb_stream`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
+/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `platform_gb_stream` (
- `platformId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
- `catalogId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
- `gbStreamId` int NOT NULL,
- `id` int NOT NULL AUTO_INCREMENT,
+ `platformId` varchar(50) NOT NULL,
+ `catalogId` varchar(50) NOT NULL,
+ `gbStreamId` int(11) NOT NULL,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
PRIMARY KEY (`id`),
UNIQUE KEY `platform_gb_stream_pk` (`platformId`,`catalogId`,`gbStreamId`)
-) ENGINE=InnoDB AUTO_INCREMENT=301207 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
+) ENGINE=InnoDB AUTO_INCREMENT=301210 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -414,29 +418,29 @@ UNLOCK TABLES;
DROP TABLE IF EXISTS `stream_proxy`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
+/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `stream_proxy` (
- `id` int NOT NULL AUTO_INCREMENT,
- `type` varchar(50) COLLATE utf8mb4_general_ci NOT NULL,
- `app` varchar(255) COLLATE utf8mb4_general_ci NOT NULL,
- `stream` varchar(255) COLLATE utf8mb4_general_ci NOT NULL,
- `url` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL,
- `src_url` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL,
- `dst_url` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL,
- `timeout_ms` int DEFAULT NULL,
- `ffmpeg_cmd_key` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL,
- `rtp_type` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
- `mediaServerId` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `type` varchar(50) NOT NULL,
+ `app` varchar(255) NOT NULL,
+ `stream` varchar(255) NOT NULL,
+ `url` varchar(255) DEFAULT NULL,
+ `src_url` varchar(255) DEFAULT NULL,
+ `dst_url` varchar(255) DEFAULT NULL,
+ `timeout_ms` int(11) DEFAULT NULL,
+ `ffmpeg_cmd_key` varchar(255) DEFAULT NULL,
+ `rtp_type` varchar(50) DEFAULT NULL,
+ `mediaServerId` varchar(50) DEFAULT NULL,
`enable_hls` bit(1) DEFAULT NULL,
`enable_mp4` bit(1) DEFAULT NULL,
`enable` bit(1) NOT NULL,
`status` bit(1) NOT NULL,
`enable_remove_none_reader` bit(1) NOT NULL,
- `createTime` varchar(50) COLLATE utf8mb4_general_ci NOT NULL,
- `name` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL,
+ `createTime` varchar(50) NOT NULL,
+ `name` varchar(255) DEFAULT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `stream_proxy_pk` (`app`,`stream`)
-) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8mb4;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -454,20 +458,20 @@ UNLOCK TABLES;
DROP TABLE IF EXISTS `stream_push`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
+/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `stream_push` (
- `id` int NOT NULL AUTO_INCREMENT,
- `app` varchar(255) COLLATE utf8mb4_general_ci NOT NULL,
- `stream` varchar(255) COLLATE utf8mb4_general_ci NOT NULL,
- `totalReaderCount` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
- `originType` int DEFAULT NULL,
- `originTypeStr` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
- `createStamp` bigint DEFAULT NULL,
- `aliveSecond` int DEFAULT NULL,
- `mediaServerId` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `app` varchar(255) NOT NULL,
+ `stream` varchar(255) NOT NULL,
+ `totalReaderCount` varchar(50) DEFAULT NULL,
+ `originType` int(11) DEFAULT NULL,
+ `originTypeStr` varchar(50) DEFAULT NULL,
+ `createStamp` bigint(20) DEFAULT NULL,
+ `aliveSecond` int(11) DEFAULT NULL,
+ `mediaServerId` varchar(50) DEFAULT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `stream_push_pk` (`app`,`stream`)
-) ENGINE=InnoDB AUTO_INCREMENT=300799 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=300838 DEFAULT CHARSET=utf8mb4;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -485,17 +489,17 @@ UNLOCK TABLES;
DROP TABLE IF EXISTS `user`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
+/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `user` (
- `id` int NOT NULL AUTO_INCREMENT,
- `username` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
- `password` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
- `roleId` int NOT NULL,
- `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
- `updateTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `username` varchar(255) NOT NULL,
+ `password` varchar(255) NOT NULL,
+ `roleId` int(11) NOT NULL,
+ `createTime` varchar(50) NOT NULL,
+ `updateTime` varchar(50) NOT NULL,
PRIMARY KEY (`id`) USING BTREE,
UNIQUE KEY `user_username_uindex` (`username`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -504,7 +508,8 @@ CREATE TABLE `user` (
LOCK TABLES `user` WRITE;
/*!40000 ALTER TABLE `user` DISABLE KEYS */;
-INSERT INTO `user` VALUES (1,'admin','21232f297a57a5a743894a0e4a801fc3',1,'2021 - 04 - 13 14:14:57','2021 - 04 - 13 14:14:57');
+INSERT INTO `user` VALUES
+ (1,'admin','21232f297a57a5a743894a0e4a801fc3',1,'2021 - 04 - 13 14:14:57','2021 - 04 - 13 14:14:57');
/*!40000 ALTER TABLE `user` ENABLE KEYS */;
UNLOCK TABLES;
@@ -514,15 +519,15 @@ UNLOCK TABLES;
DROP TABLE IF EXISTS `user_role`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
+/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `user_role` (
- `id` int NOT NULL AUTO_INCREMENT,
- `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
- `authority` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
- `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
- `updateTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `name` varchar(50) NOT NULL,
+ `authority` varchar(50) NOT NULL,
+ `createTime` varchar(50) NOT NULL,
+ `updateTime` varchar(50) NOT NULL,
PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -531,7 +536,8 @@ CREATE TABLE `user_role` (
LOCK TABLES `user_role` WRITE;
/*!40000 ALTER TABLE `user_role` DISABLE KEYS */;
-INSERT INTO `user_role` VALUES (1,'admin','0','2021-04-13 14:14:57','2021-04-13 14:14:57');
+INSERT INTO `user_role` VALUES
+ (1,'admin','0','2021-04-13 14:14:57','2021-04-13 14:14:57');
/*!40000 ALTER TABLE `user_role` ENABLE KEYS */;
UNLOCK TABLES;
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
@@ -544,4 +550,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
--- Dump completed on 2022-03-07 8:26:30
+-- Dump completed on 2022-04-18 10:50:27
diff --git a/sql/update.sql b/sql/update.sql
index 58045180..9c18c26e 100644
--- a/sql/update.sql
+++ b/sql/update.sql
@@ -1,8 +1,12 @@
-alter table device
- add subscribeCycleForMobilePosition int null;
+alter table parent_platform
+ add startOfflinePush int default 0 null;
+
+alter table parent_platform
+ add administrativeDivision varchar(50) not null;
+
+alter table parent_platform
+ add catalogGroup int default 1 null;
alter table device
- add mobilePositionSubmissionInterval int default 5 null;
+ add ssrcCheck int default 0 null;
-alter table device
- add subscribeCycleForAlarm int null;
\ No newline at end of file
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java
index 8aa7b37a..7993163e 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java
@@ -129,6 +129,11 @@ public class ParentPlatform {
*/
private boolean mobilePositionSubscribe;
+ /**
+ * 点播未推流的设备时是否使用redis通知拉起
+ */
+ private boolean startOfflinePush;
+
public Integer getId() {
return id;
}
@@ -329,4 +334,12 @@ public class ParentPlatform {
public void setMobilePositionSubscribe(boolean mobilePositionSubscribe) {
this.mobilePositionSubscribe = mobilePositionSubscribe;
}
+
+ public boolean isStartOfflinePush() {
+ return startOfflinePush;
+ }
+
+ public void setStartOfflinePush(boolean startOfflinePush) {
+ this.startOfflinePush = startOfflinePush;
+ }
}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
index 6b6e377e..5d02bda6 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
@@ -397,6 +397,10 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
logger.info("[ app={}, stream={} ]通道离线，启用流后开始推流",gbStream.getApp(), gbStream.getStream());
responseAck(evt, Response.BAD_REQUEST, "channel [" + gbStream.getGbId() + "] offline");
}else if ("push".equals(gbStream.getStreamType())) {
+ if (!platform.isStartOfflinePush()) {
+ responseAck(evt, Response.TEMPORARILY_UNAVAILABLE, "channel unavailable");
+ return;
+ }
// 发送redis消息以使设备上线
logger.info("[ app={}, stream={} ]通道离线，发送redis信息控制设备开始推流",gbStream.getApp(), gbStream.getStream());
MessageForPushChannel messageForPushChannel = new MessageForPushChannel();
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/ParentPlatformMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/ParentPlatformMapper.java
index f74b6d4d..a4982b4b 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/ParentPlatformMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/ParentPlatformMapper.java
@@ -16,10 +16,10 @@ public interface ParentPlatformMapper {
@Insert("INSERT INTO parent_platform (enable, name, serverGBId, serverGBDomain, serverIP, serverPort, deviceGBId, deviceIp, " +
" devicePort, username, password, expires, keepTimeout, transport, characterSet, ptz, rtcp, " +
- " status, shareAllLiveStream, catalogId) " +
+ " status, shareAllLiveStream, startOfflinePush, catalogId) " +
" VALUES (${enable}, '${name}', '${serverGBId}', '${serverGBDomain}', '${serverIP}', ${serverPort}, '${deviceGBId}', '${deviceIp}', " +
" '${devicePort}', '${username}', '${password}', '${expires}', '${keepTimeout}', '${transport}', '${characterSet}', ${ptz}, ${rtcp}, " +
- " ${status}, ${shareAllLiveStream}, #{catalogId})")
+ " ${status}, ${shareAllLiveStream}, ${startOfflinePush}, #{catalogId})")
int addParentPlatform(ParentPlatform parentPlatform);
@Update("UPDATE parent_platform " +
@@ -42,6 +42,7 @@ public interface ParentPlatformMapper {
"rtcp=#{rtcp}, " +
"status=#{status}, " +
"shareAllLiveStream=#{shareAllLiveStream}, " +
+ "startOfflinePush=${startOfflinePush}, " +
"catalogId=#{catalogId} " +
"WHERE id=#{id}")
int updateParentPlatform(ParentPlatform parentPlatform);
diff --git a/web_src/src/components/dialog/platformEdit.vue b/web_src/src/components/dialog/platformEdit.vue
index 38a2aef7..1e51170a 100644
--- a/web_src/src/components/dialog/platformEdit.vue
+++ b/web_src/src/components/dialog/platformEdit.vue
@@ -77,6 +77,7 @@
+
{{
@@ -138,6 +139,7 @@ export default {
transport: "UDP",
characterSet: "GB2312",
shareAllLiveStream: false,
+ startOfflinePush: false,
},
rules: {
name: [{ required: true, message: "请输入平台名称", trigger: "blur" }],
@@ -199,6 +201,7 @@ export default {
this.platform.characterSet = platform.characterSet;
this.platform.shareAllLiveStream = platform.shareAllLiveStream;
this.platform.catalogId = platform.catalogId;
+ this.platform.startOfflinePush = platform.startOfflinePush;
this.onSubmit_text = "保存";
this.saveUrl = "/api/platform/save";
}