From 64cd48a92b722153066befdc6bda2993fab5f001 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Sun, 2 Jul 2023 00:03:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=87=E7=94=A8=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sql/2.6.8升级2.6.9.sql | 17 +++++++++++++++++
 sql/初始化.sql         | 15 +++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/sql/2.6.8升级2.6.9.sql b/sql/2.6.8升级2.6.9.sql
index a398cb8d..7b16c357 100644
--- a/sql/2.6.8升级2.6.9.sql
+++ b/sql/2.6.8升级2.6.9.sql
@@ -455,6 +455,23 @@ rename table stream_push to wvp_stream_push;
 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)
+);
+
+
 
 
 
diff --git a/sql/初始化.sql b/sql/初始化.sql
index 421760fe..273da91b 100644
--- a/sql/初始化.sql
+++ b/sql/初始化.sql
@@ -32,6 +32,7 @@ create table wvp_device (
                             as_message_channel bool default false,
                             keepalive_interval_time integer,
                             switch_primary_sub_stream bool default false,
+                            broadcast_push_after_ack bool default false,
                             constraint uk_device_device unique (device_id)
 );
 
@@ -53,6 +54,7 @@ create table wvp_device_channel (
                                     id serial primary key ,
                                     channel_id character varying(50) not null,
                                     name character varying(255),
+                                    custom_name character varying(255),
                                     manufacture character varying(50),
                                     model character varying(50),
                                     owner character varying(50),
@@ -71,9 +73,12 @@ create table wvp_device_channel (
                                     port integer,
                                     password character varying(255),
                                     ptz_type integer,
+                                    custom_ptz_type integer,
                                     status bool default false,
                                     longitude double precision,
+                                    custom_longitude double precision,
                                     latitude double precision,
+                                    custom_latitude double precision,
                                     stream_id character varying(50),
                                     device_id character varying(50) not null,
                                     parental character varying(50),
@@ -279,6 +284,16 @@ create table wvp_user_role (
                                update_time character varying(50)
 );
 
+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)
+);
+
 /*初始数据*/
 INSERT INTO wvp_user VALUES (1, 'admin','21232f297a57a5a743894a0e4a801fc3',1,'2021-04-13 14:14:57','2021-04-13 14:14:57','3e80d1762a324d5b0ff636e0bd16f1e3');
 INSERT INTO wvp_user_role VALUES (1, 'admin','0','2021-04-13 14:14:57','2021-04-13 14:14:57');