From f93a0d599e1619b46eb0bfcb7ceff74e10e4a3a1 Mon Sep 17 00:00:00 2001
From: mrjackwang <30337754+mrjackwang@users.noreply.github.com>
Date: 星期二, 02 八月 2022 15:32:15 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0

---
 sql/update.sql |   68 ++++++++++++++++++++++++++++++++++
 1 files changed, 68 insertions(+), 0 deletions(-)

diff --git a/sql/update.sql b/sql/update.sql
index f78744d..d61ad35 100644
--- a/sql/update.sql
+++ b/sql/update.sql
@@ -1,8 +1,13 @@
 alter table stream_push
     add serverId varchar(50) not null;
+
 alter table device
     add geoCoordSys varchar(50) not null;
+alter table device
+    add treeType varchar(50) not null;
 update device set device.geoCoordSys='WGS84';
+update device set device.treeType='CivilCode';
+
 alter table device_channel
     add longitudeGcj02 double default null;
 alter table device_channel
@@ -11,6 +16,69 @@
     add longitudeWgs84 double default null;
 alter table device_channel
     add latitudeWgs84 double default null;
+alter table device_channel
+    add businessGroupId varchar(50) default null;
+alter table device_channel
+    add gpsTime varchar(50) default null;
 
 
+alter table device_mobile_position
+    change  cnLng longitudeGcj02 double default null;
+alter table device_mobile_position
+    change  cnLat latitudeGcj02 double default null;
+alter table device_mobile_position
+    add longitudeWgs84 double default null;
+alter table device_mobile_position
+    add latitudeWgs84 double default null;
+alter table device_mobile_position
+    drop geodeticSystem;
+alter table device_mobile_position
+    add createTime varchar(50) default null;
+
+alter table device_alarm
+    add createTime varchar(50) default null;
+
+alter table gb_stream
+    change createStamp createTime varchar(50) default null;
+
+alter table parent_platform
+    add createTime varchar(50) default null;
+alter table parent_platform
+    add updateTime varchar(50) default null;
+
+alter table stream_proxy
+    add updateTime varchar(50) default null;
+
+alter table stream_push
+    add pushTime varchar(50) default null;
+alter table stream_push
+    add status int DEFAULT NULL;
+alter table stream_push
+    add updateTime varchar(50) default null;
+alter table stream_push
+    add pushIng int DEFAULT NULL;
+alter table stream_push
+    change createStamp createTime varchar(50) default null;
+
+alter table gb_stream
+    drop column status;
+
+alter table user
+    add pushKey varchar(50) default null;
+update user set pushKey='453df297a57a5a7438934sda801fc3' where id=1;
+
+alter table parent_platform
+    add treeType varchar(50) not null;
+update parent_platform set parent_platform.treeType='BusinessGroup';
+alter table parent_platform drop shareAllLiveStream;
+
+alter table platform_catalog
+    add civilCode varchar(50) default null;
+alter table platform_catalog
+    add businessGroupId varchar(50) default null;
+
+/********************* ADD ***************************/
+alter table stream_push
+    add self int DEFAULT NULL;
+
 

--
Gitblit v1.8.0