From f8abd2603002eb6ff296d26f99042681d9b2bc92 Mon Sep 17 00:00:00 2001
From: lawrencehj <1934378145@qq.com>
Date: 星期五, 23 七月 2021 17:06:49 +0800
Subject: [PATCH] 修正推流列表播放错误
---
sql/mysql.sql | 150 ++++++++++++++++++++++++++++++-------------------
1 files changed, 91 insertions(+), 59 deletions(-)
diff --git a/sql/mysql.sql b/sql/mysql.sql
index 24fdfe0..0bb4c03 100644
--- a/sql/mysql.sql
+++ b/sql/mysql.sql
@@ -3,67 +3,73 @@
create table device
(
- deviceId varchar(255) not null
+ deviceId varchar(50) not null
primary key,
name varchar(255) null,
manufacturer varchar(255) null,
model varchar(255) null,
firmware varchar(255) null,
- transport varchar(255) null,
- streamMode varchar(255) null,
- online varchar(255) null,
- registerTimeMillis int null,
- ip varchar(255) not null,
+ transport varchar(50) null,
+ streamMode varchar(50) null,
+ online varchar(50) null,
+ registerTime varchar(50) null,
+ keepaliveTime varchar(50) null,
+ ip varchar(50) not null,
+ createTime varchar(50) not null,
+ updateTime varchar(50) not null,
port int not null,
- hostAddress varchar(255) not null
+ expires int not null,
+ hostAddress varchar(50) not null
);
create table device_channel
(
- channelId varchar(255) not null,
+ channelId varchar(50) not null,
name varchar(255) null,
- manufacture varchar(255) null,
- model varchar(255) null,
- owner varchar(255) null,
- civilCode varchar(255) null,
- block varchar(255) null,
- address varchar(255) null,
- parentId varchar(255) null,
+ manufacture varchar(50) null,
+ model varchar(50) null,
+ owner varchar(50) null,
+ civilCode varchar(50) null,
+ block varchar(50) null,
+ address varchar(50) null,
+ parentId varchar(50) null,
safetyWay int null,
registerWay int null,
- certNum varchar(255) null,
+ certNum varchar(50) null,
certifiable int null,
errCode int null,
- endTime varchar(255) null,
- secrecy varchar(255) null,
- ipAddress varchar(255) null,
+ endTime varchar(50) null,
+ secrecy varchar(50) null,
+ ipAddress varchar(50) null,
port int null,
password varchar(255) null,
PTZType int null,
status int null,
longitude double null,
latitude double null,
- streamId varchar(255) null,
- deviceId varchar(255) not null,
- parental varchar(255) null,
- hasAudio tinyint(1) null,
+ streamId varchar(50) null,
+ deviceId varchar(50) not null,
+ parental varchar(50) null,
+ hasAudio bit(1) null,
+ createTime varchar(50) not null,
+ updateTime varchar(50) not null,
primary key (channelId, deviceId)
);
create table device_mobile_position
(
- deviceId varchar(255) not null,
+ deviceId varchar(50) not null,
deviceName varchar(255) null,
- time varchar(255) not null,
+ time varchar(50) not null,
longitude double not null,
latitude double not null,
altitude double null,
speed double null,
direction double null,
- reportSource varchar(255) null,
- geodeticSystem varchar(255) null,
- cnLng varchar(255) null,
- cnLat varchar(255) null,
+ reportSource varchar(50) null,
+ geodeticSystem varchar(50) null,
+ cnLng varchar(50) null,
+ cnLat varchar(50) null,
primary key (deviceId, time)
);
@@ -71,50 +77,51 @@
(
app varchar(255) not null,
stream varchar(255) not null,
- gbId varchar(255) not null,
+ gbId varchar(50) not null,
name varchar(255) null,
longitude double null,
latitude double null,
- streamType varchar(255) null,
+ streamType varchar(50) null,
status int null,
primary key (app, stream, gbId)
);
create table parent_platform
(
+ id int auto_increment,
enable int null,
name varchar(255) null,
- serverGBId varchar(255) not null
- primary key,
- serverGBDomain varchar(255) null,
- serverIP varchar(255) null,
+ serverGBId varchar(50) not null,
+ serverGBDomain varchar(50) null,
+ serverIP varchar(50) null,
serverPort int null,
- deviceGBId varchar(255) not null,
- deviceIp varchar(255) null,
- devicePort varchar(255) null,
+ deviceGBId varchar(50) not null,
+ deviceIp varchar(50) null,
+ devicePort varchar(50) null,
username varchar(255) null,
- password varchar(255) null,
- expires varchar(255) null,
- keepTimeout varchar(255) null,
- transport varchar(255) null,
- characterSet varchar(255) null,
+ password varchar(50) null,
+ expires varchar(50) null,
+ keepTimeout varchar(50) null,
+ transport varchar(50) null,
+ characterSet varchar(50) null,
ptz int null,
rtcp int null,
- status tinyint(1) null
+ status bit(1) null,
+ primary key (id, serverGBId)
);
create table platform_gb_channel
(
- channelId varchar(255) not null,
- deviceId varchar(255) not null,
- platformId varchar(255) not null,
- deviceAndChannelId varchar(255) not null,
+ channelId varchar(50) not null,
+ deviceId varchar(50) not null,
+ platformId varchar(50) not null,
+ deviceAndChannelId varchar(50) not null,
primary key (deviceAndChannelId, platformId)
);
create table platform_gb_stream
(
- platformId varchar(255) not null,
+ platformId varchar(50) not null,
app varchar(255) not null,
stream varchar(255) not null,
primary key (platformId, app, stream)
@@ -122,18 +129,19 @@
create table stream_proxy
(
- type varchar(255) not null,
+ type varchar(50) not null,
app varchar(255) not null,
stream varchar(255) not null,
url varchar(255) null,
src_url varchar(255) null,
- dst_url blob null,
+ dst_url varchar(255) null,
timeout_ms int null,
ffmpeg_cmd_key varchar(255) null,
- rtp_type varchar(255) null,
- enable_hls tinyint(1) null,
- enable_mp4 tinyint(1) null,
- enable tinyint(1) not null,
+ rtp_type varchar(50) null,
+ mediaServerId varchar(50) null,
+ enable_hls bit(1) null,
+ enable_mp4 bit(1) null,
+ enable bit(1) not null,
primary key (app, stream)
);
@@ -141,9 +149,9 @@
(
app varchar(255) not null,
stream varchar(255) not null,
- totalReaderCount varchar(255) null,
+ totalReaderCount varchar(50) null,
originType int null,
- originTypeStr varchar(255) null,
+ originTypeStr varchar(50) null,
createStamp int null,
aliveSecond int null,
primary key (app, stream)
@@ -156,7 +164,31 @@
username varchar(255) not null,
password varchar(255) not null,
roleId int not null,
- create_time varchar(255) not null
+ create_time varchar(50) not null
);
-insert into user (username, password, roleId, create_time) values ('admin', '21232f297a57a5a743894a0e4a801fc3', '0', '2021-04-13 14:14:57');
\ No newline at end of file
+insert into user (username, password, roleId, create_time) values ('admin', '21232f297a57a5a743894a0e4a801fc3', '0', '2021-04-13 14:14:57');
+
+create table media_server (
+ id varchar(255)
+ primary key,
+ ip varchar(50) NOT NULL,
+ hookIp varchar(50) NOT NULL,
+ sdpIp varchar(50) NOT NULL,
+ streamIp varchar(50) 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) NOT NULL,
+ streamNoneReaderDelayMS int NOT NULL,
+ rtpEnable int NOT NULL,
+ rtpPortRange varchar(50) NOT NULL,
+ recordAssistPort int NOT NULL,
+ createTime varchar(50) not null,
+ updateTime varchar(50) not null
+);
\ No newline at end of file
--
Gitblit v1.8.0