From 20cd60c66c053fb48ce6258d89458d30418903b5 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 17 十月 2022 17:23:38 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into wvp-28181-2.0

---
 sql/update.sql |   72 +++--------------------------------
 1 files changed, 7 insertions(+), 65 deletions(-)

diff --git a/sql/update.sql b/sql/update.sql
index 89d0e8a..817d94e 100644
--- a/sql/update.sql
+++ b/sql/update.sql
@@ -1,68 +1,10 @@
-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
-    add latitudeGcj02 double default null;
-alter table device_channel
-    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 media_server
+    drop column streamNoneReaderDelayMS;
 
 alter table stream_proxy
-    add updateTime varchar(50) default null;
+    add enable_disable_none_reader bit(1) 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
-    change createStamp createTime varchar(50) default null;
-
-alter table gb_stream
-    drop column status;
-
-alter table user
-    add pushKey varchar(50) default null;
-
-
-
+alter table device
+    add mediaServerId varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT 'auto';
+alter table device
+    add custom_name varchar(255) default null;

--
Gitblit v1.8.0