From 2bb7e23601b7ff0f8cddbc4a92e43c23898c1029 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 23 十月 2023 09:12:19 +0800
Subject: [PATCH] Merge pull request #1119 from xiaoQQya/develop
---
sql/2.6.8升级2.6.9.sql | 46 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 36 insertions(+), 10 deletions(-)
diff --git "a/sql/2.6.8\345\215\207\347\272\2472.6.9.sql" "b/sql/2.6.8\345\215\207\347\272\2472.6.9.sql"
index 32baaa8..7b16c35 100644
--- "a/sql/2.6.8\345\215\207\347\272\2472.6.9.sql"
+++ "b/sql/2.6.8\345\215\207\347\272\2472.6.9.sql"
@@ -38,7 +38,7 @@
change geoCoordSys geo_coord_sys varchar(50) not null;
alter table device
- change treeType tree_type varchar(50) not null;
+ drop column treeType;
alter table device
change mediaServerId media_server_id varchar(50) default 'auto' null;
@@ -54,6 +54,13 @@
alter table device
change keepaliveIntervalTime keepalive_interval_time int null;
+
+alter table device
+ change online on_line varchar(50) null;
+
+alter table device
+ add COLUMN switch_primary_sub_stream bool default false comment '寮�鍚富瀛愮爜娴佸垏鎹㈢殑寮�鍏筹紙0-涓嶅紑鍚紝1-寮�鍚級鐜板湪宸茬煡鏀寔璁惧涓� 澶у崕銆乀P鈥斺�擫INK鍏ㄧ郴璁惧'
+
alter table device_alarm
change deviceId device_id varchar(50) not null;
@@ -177,10 +184,6 @@
change createTime create_time varchar(50) null;
alter table gb_stream
- add constraint gb_stream_pk
- primary key (gbStreamId);
-
-alter table gb_stream
change gbStreamId gb_stream_id int auto_increment;
alter table gb_stream
@@ -200,6 +203,12 @@
alter table media_server
change hookIp hook_ip varchar(50) not null;
+
+alter table media_server
+ add send_rtp_port_range varchar(50) not null;
+
+alter table media_server
+ add column send_rtp_port_range varchar(50) default null;
alter table media_server
change sdpIp sdp_ip varchar(50) not null;
@@ -298,7 +307,7 @@
change updateTime update_time varchar(50) null;
alter table parent_platform
- change treeType tree_type varchar(50) not null;
+ drop column treeType;
alter table parent_platform
change asMessageChannel as_message_channel bool default false;
@@ -393,10 +402,6 @@
alter table stream_push
change status status bool default false;
-
-alter table stream_push
- change serverId server_id varchar(50) not null;
-
alter table stream_push
change pushTime push_time varchar(50) null;
@@ -411,6 +416,10 @@
alter table stream_push
change self self bool default false;
+
+alter table stream_push
+ drop column serverId;
+
alter table user
change roleId role_id int not null;
@@ -446,6 +455,23 @@
rename table user to wvp_user;
rename table user_role to wvp_user_role;
+alter table wvp_device add column broadcast_push_after_ack bool default false;
+alter table wvp_device_channel add column custom_name varchar(255) null ;
+alter table wvp_device_channel add column custom_longitude double null ;
+alter table wvp_device_channel add column custom_latitude double null ;
+alter table wvp_device_channel add column custom_ptz_type int null ;
+
+create table wvp_resources_tree (
+ id serial primary key ,
+ is_catalog bool default true,
+ device_channel_id integer ,
+ gb_stream_id integer,
+ name character varying(255),
+ parentId integer,
+ path character varying(255)
+);
+
+
--
Gitblit v1.8.0