Merge branch 'master' into dev/数据库统合
# Conflicts: # src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceMapper.java # src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelPlayServiceImpl.java # src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlatformChannelServiceImpl.java
This commit is contained in:
@@ -72,7 +72,6 @@ create table wvp_device_mobile_position
|
||||
create table wvp_device_channel
|
||||
(
|
||||
id serial primary key,
|
||||
device_db_id integer,
|
||||
device_id character varying(50),
|
||||
name character varying(255),
|
||||
manufacturer character varying(50),
|
||||
@@ -150,16 +149,11 @@ create table wvp_device_channel
|
||||
gb_svc_space_support_mod integer,
|
||||
gb_svc_time_support_mode integer,
|
||||
record_plan_id integer,
|
||||
stream_push_id integer,
|
||||
stream_proxy_id integer,
|
||||
constraint uk_wvp_device_channel_unique_device_channel unique (device_db_id, device_id),
|
||||
constraint uk_wvp_unique_channel unique (gb_device_id),
|
||||
constraint uk_wvp_unique_stream_push_id unique (stream_push_id),
|
||||
constraint uk_wvp_unique_stream_proxy_id unique (stream_proxy_id)
|
||||
data_type integer not null,
|
||||
data_device_id integer not null,
|
||||
constraint uk_wvp_unique_channel unique (gb_device_id)
|
||||
);
|
||||
|
||||
create index uk_wvp_device_db_id on wvp_device_channel (device_db_id);
|
||||
|
||||
create table wvp_media_server
|
||||
(
|
||||
id character varying(255) primary key,
|
||||
|
||||
@@ -88,7 +88,6 @@ create table wvp_gb_stream
|
||||
create table wvp_device_channel
|
||||
(
|
||||
id serial primary key,
|
||||
device_db_id integer,
|
||||
device_id character varying(50),
|
||||
name character varying(255),
|
||||
manufacturer character varying(50),
|
||||
@@ -166,17 +165,11 @@ create table wvp_device_channel
|
||||
gb_svc_space_support_mod integer,
|
||||
gb_svc_time_support_mode integer,
|
||||
record_plan_id integer,
|
||||
stream_push_id integer,
|
||||
stream_proxy_id integer,
|
||||
constraint uk_wvp_device_channel_unique_device_channel unique (device_db_id, device_id),
|
||||
constraint uk_wvp_unique_channel unique (gb_device_id),
|
||||
constraint uk_wvp_unique_stream_push_id unique (stream_push_id),
|
||||
constraint uk_wvp_unique_stream_proxy_id unique (stream_proxy_id)
|
||||
data_type integer not null,
|
||||
data_device_id integer not null,
|
||||
constraint uk_wvp_unique_channel unique (gb_device_id)
|
||||
);
|
||||
|
||||
create index uk_wvp_device_db_id on wvp_device_channel (device_db_id);
|
||||
|
||||
|
||||
create table wvp_media_server
|
||||
(
|
||||
id character varying(255) primary key,
|
||||
|
||||
31
数据库/2.7.3/更新-mysql-2.7.3.sql
Normal file
31
数据库/2.7.3/更新-mysql-2.7.3.sql
Normal file
@@ -0,0 +1,31 @@
|
||||
/*
|
||||
* 20241222
|
||||
*/
|
||||
alter table wvp_device_channel
|
||||
drop index uk_wvp_device_channel_unique_device_channel;
|
||||
alter table wvp_device_channel
|
||||
drop index uk_wvp_unique_stream_push_id;
|
||||
alter table wvp_device_channel
|
||||
drop index uk_wvp_unique_stream_proxy_id;
|
||||
|
||||
alter table wvp_device_channel
|
||||
add data_type integer not null;
|
||||
|
||||
alter table wvp_device_channel
|
||||
add data_device_id integer not null;
|
||||
|
||||
update wvp_device_channel wdc INNER JOIN
|
||||
(SELECT id, device_db_id from wvp_device_channel where device_db_id is not null ) ct on ct.id = wdc.id
|
||||
set wdc.data_type = 1, wdc.data_device_id = ct.device_db_id where wdc.device_db_id is not null;
|
||||
|
||||
update wvp_device_channel wdc INNER JOIN
|
||||
(SELECT id, stream_push_id from wvp_device_channel where stream_push_id is not null ) ct on ct.id = wdc.id
|
||||
set wdc.data_type = 2, wdc.data_device_id = ct.stream_push_id where wdc.stream_push_id is not null;
|
||||
|
||||
update wvp_device_channel wdc INNER JOIN
|
||||
(SELECT id, stream_proxy_id from wvp_device_channel where stream_proxy_id is not null ) ct on ct.id = wdc.id
|
||||
set wdc.data_type = 3, wdc.data_device_id = ct.stream_proxy_id where wdc.stream_proxy_id is not null;
|
||||
|
||||
alter table wvp_device_channel drop device_db_id;
|
||||
alter table wvp_device_channel drop stream_push_id;
|
||||
alter table wvp_device_channel drop stream_proxy_id;
|
||||
29
数据库/2.7.3/更新-postgresql-kingbase-2.7.3.sql
Normal file
29
数据库/2.7.3/更新-postgresql-kingbase-2.7.3.sql
Normal file
@@ -0,0 +1,29 @@
|
||||
/*
|
||||
* 20241222
|
||||
*/
|
||||
|
||||
alter table wvp_device_channel
|
||||
drop index uk_wvp_device_channel_unique_device_channel;
|
||||
alter table wvp_device_channel
|
||||
drop index uk_wvp_unique_stream_push_id;
|
||||
alter table wvp_device_channel
|
||||
drop index uk_wvp_unique_stream_proxy_id;
|
||||
|
||||
alter table wvp_device_channel
|
||||
add data_type integer not null;
|
||||
|
||||
alter table wvp_device_channel
|
||||
add data_device_id integer not null;
|
||||
|
||||
update wvp_device_channel wdc
|
||||
set data_type = 1, data_device_id = (SELECT device_db_id from wvp_device_channel where device_db_id is not null and id = wdc.id ) where device_db_id is not null;
|
||||
|
||||
update wvp_device_channel wdc
|
||||
set data_type = 2, data_device_id = (SELECT stream_push_id from wvp_device_channel where stream_push_id is not null and id = wdc.id ) where stream_push_id is not null;
|
||||
|
||||
update wvp_device_channel wdc
|
||||
set data_type = 1, data_device_id = (SELECT stream_proxy_id from wvp_device_channel where stream_proxy_id is not null and id = wdc.id ) where stream_proxy_id is not null;
|
||||
|
||||
alter table wvp_device_channel drop device_db_id;
|
||||
alter table wvp_device_channel drop stream_push_id;
|
||||
alter table wvp_device_channel drop stream_proxy_id;
|
||||
Reference in New Issue
Block a user