From 225a444f9bfa3f75c05dc4503a4e400670d46221 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: Mon, 7 Oct 2024 15:19:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E9=9D=9E=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E4=BD=BF=E7=94=A8=E7=9A=84=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot/vmp/gb28181/bean/CommonGBChannel.java | 6 ----- 数据库/2.7.2-重构/初始化-mysql-2.7.2.sql | 2 -- .../初始化-postgresql-kingbase-2.7.2.sql | 22 ++----------------- 3 files changed, 2 insertions(+), 28 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/CommonGBChannel.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/CommonGBChannel.java index c10f8568..6327688b 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/CommonGBChannel.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/CommonGBChannel.java @@ -97,12 +97,6 @@ public class CommonGBChannel { "8-校园周边、9-治安复杂区域、10-交通干线。当目录项为摄像机时可选。") private Integer gbPositionType; - @Schema(description = "国标-摄像机光电成像类型。1-可见光成像;2-热成像;3-雷达成像;4-X光成像;5-深度光场成像;9-其他。可多值,") - private String gbPhotoelectricImagingTyp; - - @Schema(description = "国标-摄像机采集部位类型") - private String gbCapturePositionType; - @Schema(description = "国标-摄像机安装位置室外、室内属性。1-室外、2-室内。") private Integer gbRoomType; diff --git a/数据库/2.7.2-重构/初始化-mysql-2.7.2.sql b/数据库/2.7.2-重构/初始化-mysql-2.7.2.sql index f302276d..34c76422 100644 --- a/数据库/2.7.2-重构/初始化-mysql-2.7.2.sql +++ b/数据库/2.7.2-重构/初始化-mysql-2.7.2.sql @@ -168,8 +168,6 @@ create table wvp_device_channel gb_business_group_id character varying(50), gb_ptz_type integer, gb_position_type integer, - gb_photoelectric_imaging_type integer, - gb_capture_position_type integer, gb_room_type integer, gb_use_type integer, gb_supply_light_type integer, diff --git a/数据库/2.7.2-重构/初始化-postgresql-kingbase-2.7.2.sql b/数据库/2.7.2-重构/初始化-postgresql-kingbase-2.7.2.sql index 64770e1e..ce77b59a 100644 --- a/数据库/2.7.2-重构/初始化-postgresql-kingbase-2.7.2.sql +++ b/数据库/2.7.2-重构/初始化-postgresql-kingbase-2.7.2.sql @@ -158,7 +158,6 @@ create table wvp_device_channel gb_certifiable integer, gb_err_code integer, gb_end_time character varying(50), - gb_security_level_code character varying(255), gb_secrecy integer, gb_ip_address character varying(50), gb_port integer, @@ -169,33 +168,14 @@ create table wvp_device_channel gb_business_group_id character varying(50), gb_ptz_type integer, gb_position_type integer, - gb_photoelectric_imaging_type integer, - gb_capture_position_type integer, gb_room_type integer, gb_use_type integer, gb_supply_light_type integer, gb_direction_type integer, gb_resolution character varying(255), - gb_stream_number_list character varying(255), gb_download_speed character varying(255), gb_svc_space_support_mod integer, gb_svc_time_support_mode integer, - gb_ssvc_ratio_support_list character varying(255), - gb_mobile_device_type integer, - gb_horizontal_field_angle double precision, - gb_vertical_field_angle double precision, - gb_max_view_distance double precision, - gb_grassroots_code character varying(255), - gb_po_type integer, - gb_po_common_name character varying(255), - gb_mac character varying(255), - gb_function_type character varying(255), - gb_encode_type character varying(255), - gb_install_time character varying(255), - gb_management_unit character varying(255), - gb_contact_info character varying(255), - gb_record_save_days integer, - gb_industrial_classification character varying(255), stream_push_id integer, stream_proxy_id integer, constraint uk_wvp_device_channel_unique_device_channel unique (device_db_id, device_id), @@ -204,6 +184,8 @@ create table wvp_device_channel constraint uk_wvp_unique_stream_proxy_id unique (stream_proxy_id) ); + + create table wvp_media_server ( id character varying(255) primary key,