Merge branch 'refs/heads/master' into dev/数据库统合2
# Conflicts: # src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java # src/main/java/com/genersoft/iot/vmp/gb28181/controller/DeviceConfig.java # src/main/java/com/genersoft/iot/vmp/gb28181/controller/GBRecordController.java # src/main/java/com/genersoft/iot/vmp/gb28181/service/IDeviceService.java # src/main/java/com/genersoft/iot/vmp/gb28181/service/IGbChannelPlayService.java # src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java # src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelPlayServiceImpl.java # src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlayServiceImpl.java # src/main/java/com/genersoft/iot/vmp/streamProxy/service/impl/StreamProxyPlayServiceImpl.java # src/main/resources/配置详情.yml
This commit is contained in:
@@ -31,7 +31,9 @@ create table wvp_device
|
||||
local_ip character varying(50),
|
||||
password character varying(255),
|
||||
as_message_channel bool default false,
|
||||
keepalive_interval_time integer,
|
||||
heart_beat_interval integer,
|
||||
heart_beat_count integer,
|
||||
position_capability integer,
|
||||
broadcast_push_after_ack bool default false,
|
||||
server_id character varying(50),
|
||||
constraint uk_device_device unique (device_id)
|
||||
|
||||
@@ -32,7 +32,9 @@ create table wvp_device
|
||||
server_id character varying(50),
|
||||
password character varying(255),
|
||||
as_message_channel bool default false,
|
||||
keepalive_interval_time integer,
|
||||
heart_beat_interval integer,
|
||||
heart_beat_count integer,
|
||||
position_capability integer,
|
||||
broadcast_push_after_ack bool default false,
|
||||
server_id character varying(50),
|
||||
constraint uk_device_device unique (device_id)
|
||||
|
||||
@@ -40,4 +40,11 @@ alter table wvp_stream_proxy add relates_media_server_id character varying(50);
|
||||
*/
|
||||
drop index uk_stream_push_app_stream_path on wvp_cloud_record;
|
||||
alter table wvp_cloud_record change folder folder varchar(500) null;
|
||||
alter table wvp_cloud_record change file_path file_path varchar(500) null;
|
||||
alter table wvp_cloud_record change file_path file_path varchar(500) null;
|
||||
|
||||
/*
|
||||
* 20250211
|
||||
*/
|
||||
alter table wvp_device change keepalive_interval_time heart_beat_interval integer;
|
||||
alter table wvp_device add heart_beat_count integer;
|
||||
alter table wvp_device add position_capability integer;
|
||||
@@ -39,4 +39,11 @@ alter table wvp_stream_proxy add relates_media_server_id character varying(50);
|
||||
*/
|
||||
drop index uk_stream_push_app_stream_path on wvp_cloud_record;
|
||||
alter table wvp_cloud_record change folder folder varchar(500) null;
|
||||
alter table wvp_cloud_record change file_path file_path varchar(500) null;
|
||||
alter table wvp_cloud_record change file_path file_path varchar(500) null;
|
||||
|
||||
/*
|
||||
* 20250211
|
||||
*/
|
||||
alter table wvp_device change keepalive_interval_time heart_beat_interval integer;
|
||||
alter table wvp_device add heart_beat_count integer;
|
||||
alter table wvp_device add position_capability integer;
|
||||
Reference in New Issue
Block a user