瀏覽代碼

去除非当前版本使用的字段

648540858 1 年之前
父節點
當前提交
145785e881

+ 0 - 76
src/main/java/com/genersoft/iot/vmp/gb28181/bean/CommonGBChannel.java

@@ -65,10 +65,6 @@ public class CommonGBChannel {
     @Schema(description = "国标-证书终止有效期(有证书且证书无效的设备必选)")
     private String gbEndTime;
 
-    // 2022
-    @Schema(description = "国标-摄像机安全能力等级代码")
-    private String gbSecurityLevelCode;
-
     @Schema(description = "国标-保密属性(必选)缺省为0;0-不涉密,1-涉密")
     private Integer gbSecrecy;
 
@@ -124,10 +120,6 @@ public class CommonGBChannel {
     @Schema(description = "国标-摄像机支持的分辨率,可多值")
     private String gbResolution;
 
-    // 2022
-    @Schema(description = "国标-摄像机支持的码流编号列表,用于实时点播时指定码流编号(可选)")
-    private String gbStreamNumberList;
-
     @Schema(description = "国标-下载倍速(可选),可多值")
     private String gbDownloadSpeed;
 
@@ -137,71 +129,6 @@ public class CommonGBChannel {
     @Schema(description = "国标-时域编码能力,取值0-不支持;1-1级增强;2-2级增强;3-3级增强(可选)")
     private Integer gbSvcTimeSupportMode;
 
-    // 2022
-    @Schema(description = "国标- SSVC增强层与基本层比例能力 ")
-    private String gbSsvcRatioSupportList;
-
-    // 2022
-    @Schema(description = "国标-移动采集设备类型(仅移动采集设备适用,必选);1-移动机器人载摄像机;2-执法记录仪;3-移动单兵设备;" +
-            "4-车载视频记录设备;5-无人机载摄像机;9-其他")
-    private Integer gbMobileDeviceType;
-
-    // 2022
-    @Schema(description = "国标-摄像机水平视场角(可选),取值范围大于0度小于等于360度")
-    private Double gbHorizontalFieldAngle;
-
-    // 2022
-    @Schema(description = "国标-摄像机竖直视场角(可选),取值范围大于0度小于等于360度 ")
-    private Double gbVerticalFieldAngle;
-
-    // 2022
-    @Schema(description = "国标-摄像机可视距离(可选),单位:米")
-    private Double gbMaxViewDistance;
-
-    // 2022
-    @Schema(description = "国标-基层组织编码(必选,非基层建设时为“000000”)")
-    private String gbGrassrootsCode;
-
-    // 2022
-    @Schema(description = "国标-监控点位类型(当为摄像机时必选),1-一类视频监控点;2-二类视频监控点;3-三类视频监控点;9-其他点位。")
-    private Integer gbPoType;
-
-    // 2022
-    @Schema(description = "国标-点位俗称")
-    private String gbPoCommonName;
-
-    // 2022
-    @Schema(description = "国标-设备MAC地址(可选),用“XX-XX-XX-XX-XX-XX”格式表达")
-    private String gbMac;
-
-    // 2022
-    @Schema(description = "国标-摄像机卡口功能类型,01-人脸卡口;02-人员卡口;03-机动车卡口;04-非机动车卡口;05-物品卡口;99-其他")
-    private String gbFunctionType;
-
-    // 2022
-    @Schema(description = "国标-摄像机视频编码格式")
-    private String gbEncodeType;
-
-    // 2022
-    @Schema(description = "国标-摄像机安装使用时间")
-    private String gbInstallTime;
-
-    // 2022
-    @Schema(description = "国标-摄像机所属管理单位名称")
-    private String gbManagementUnit;
-
-    // 2022
-    @Schema(description = "国标-摄像机所属管理单位联系人的联系方式(电话号码,可多值,用英文半角“/”分割)")
-    private String gbContactInfo;
-
-    // 2022
-    @Schema(description = "国标-录像保存天数(可选)")
-    private Integer gbRecordSaveDays;
-
-    // 2022
-    @Schema(description = "国标-国民经济行业分类代码(可选)")
-    private String gbIndustrialClassification;
-
     @Schema(description = "关联的国标设备数据库ID")
     private Integer gbDeviceDbId;
 
@@ -217,9 +144,6 @@ public class CommonGBChannel {
     @Schema(description = "更新时间")
     private String updateTime;
 
-
-
-
     public String encode(String serverDeviceId) {
         return encode(null, serverDeviceId);
     }

+ 2 - 18
数据库/2.7.2-重构/初始化-mysql-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,
@@ -176,26 +175,9 @@ create table wvp_device_channel
     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,
-    gb_vertical_field_angle      double,
-    gb_max_view_distance         double,
-    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 +186,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,