Merge branch 'master' into 重构/1078

# Conflicts:
#	pom.xml
#	src/main/java/com/genersoft/iot/vmp/conf/SpringDocConfig.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceChannelServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
This commit is contained in:
648540858
2024-11-10 15:29:53 +08:00
170 changed files with 4812 additions and 3710 deletions

View File

@@ -25,7 +25,7 @@ create table wvp_device
charset character varying(50),
ssrc_check bool default false,
geo_coord_sys character varying(50),
media_server_id character varying(50),
media_server_id character varying(50) default 'auto',
custom_name character varying(255),
sdp_ip character varying(50),
local_ip character varying(50),
@@ -67,35 +67,6 @@ create table wvp_device_mobile_position
create_time character varying(50)
);
create table wvp_gb_stream
(
gb_stream_id serial primary key,
app character varying(255) not null,
stream character varying(255) not null,
gb_id character varying(50) not null,
name character varying(255),
longitude double precision,
latitude double precision,
stream_type character varying(50),
media_server_id character varying(50),
create_time character varying(50),
constraint uk_gb_stream_unique_gb_id unique (gb_id),
constraint uk_gb_stream_unique_app_stream unique (app, stream)
);
create table wvp_log
(
id serial primary key,
name character varying(50),
type character varying(50),
uri character varying(200),
address character varying(50),
result character varying(50),
timing bigint,
username character varying(50),
create_time character varying(50)
);
create table wvp_device_channel
(
id serial primary key,
@@ -184,7 +155,7 @@ create table wvp_device_channel
constraint uk_wvp_unique_stream_proxy_id unique (stream_proxy_id)
);
create index uk_wvp_device_db_id on wvp_device_channel (device_db_id);
create table wvp_media_server
(

View File

@@ -83,19 +83,6 @@ create table wvp_gb_stream
constraint uk_gb_stream_unique_app_stream unique (app, stream)
);
create table wvp_log
(
id serial primary key,
name character varying(50),
type character varying(50),
uri character varying(200),
address character varying(50),
result character varying(50),
timing int8,
username character varying(50),
create_time character varying(50)
);
create table wvp_device_channel
(
id serial primary key,
@@ -184,6 +171,7 @@ create table wvp_device_channel
constraint uk_wvp_unique_stream_proxy_id unique (stream_proxy_id)
);
create index uk_wvp_device_db_id on wvp_device_channel (device_db_id);
create table wvp_media_server