guzijian / wvp-GB28181-pro · Commits

Commit b7ad0a907f59a2bc0455565e76c12bf152016469

Authored by 648540858
1 parent 829ff200

合并pr 优化sql

Inline Side-by-side
Showing 5 changed files with 948 additions and 14 deletions
sql/2.6.9更新.sql deleted 100644 → 0
  View file @829ff20
1 -alter table wvp_device_channel  
2 - change stream_id stream_id varying(255)  
3 -  
4 -alter table wvp_platform  
5 - add auto_push_channel bool default false  
6 -  
7 -alter table wvp_stream_proxy  
8 - add stream_key character varying(255)  
sql/old/2.6.8升级2.6.9.sql
  View file @b7ad0a9
@@ -120,7 +120,7 @@ alter table device_channel @@ -120,7 +120,7 @@ alter table device_channel
120 change status status bool default false; 120 change status status bool default false;
121 121
122 alter table device_channel 122 alter table device_channel
123 - change streamId stream_id varchar(50) null; 123 + change streamId stream_id varchar(255) null;
124 124
125 alter table device_channel 125 alter table device_channel
126 change deviceId device_id varchar(50) not null; 126 change deviceId device_id varchar(50) not null;
sql/更新-mysql-2.6.9.sql
  View file @b7ad0a9
1 -alter table wvp_device_channel  
2 - change stream_id stream_id character varying(255); 1 +
  2 +alter table device
  3 + change deviceId device_id varchar(50) not null;
  4 +
  5 +alter table device
  6 + change streamMode stream_mode varchar(50) null;
  7 +
  8 +alter table device
  9 + change registerTime register_time varchar(50) null;
  10 +
  11 +alter table device
  12 + change keepaliveTime keepalive_time varchar(50) null;
  13 +
  14 +alter table device
  15 + change createTime create_time varchar(50) not null;
  16 +
  17 +alter table device
  18 + change updateTime update_time varchar(50) not null;
  19 +
  20 +alter table device
  21 + change subscribeCycleForCatalog subscribe_cycle_for_catalog bool default false;
  22 +
  23 +alter table device
  24 + change subscribeCycleForMobilePosition subscribe_cycle_for_mobile_position bool default false;
  25 +
  26 +alter table device
  27 + change mobilePositionSubmissionInterval mobile_position_submission_interval int default 5 not null;
  28 +
  29 +alter table device
  30 + change subscribeCycleForAlarm subscribe_cycle_for_alarm bool default false;
  31 +
  32 +alter table device
  33 + change hostAddress host_address varchar(50) null;
  34 +
  35 +alter table device
  36 + change ssrcCheck ssrc_check bool default false;
  37 +
  38 +alter table device
  39 + change geoCoordSys geo_coord_sys varchar(50) not null;
  40 +
  41 +alter table device
  42 +drop column treeType;
  43 +
  44 +alter table device
  45 + change mediaServerId media_server_id varchar(50) default 'auto' null;
  46 +
  47 +alter table device
  48 + change sdpIp sdp_ip varchar(50) null;
  49 +
  50 +alter table device
  51 + change localIp local_ip varchar(50) null;
  52 +
  53 +alter table device
  54 + change asMessageChannel as_message_channel bool default false;
  55 +
  56 +alter table device
  57 + change keepaliveIntervalTime keepalive_interval_time int null;
  58 +
  59 +alter table device
  60 + change online on_line varchar(50) null;
  61 +
  62 +alter table device
  63 + add COLUMN switch_primary_sub_stream bool default false comment '开启主子码流切换的开关（0-不开启，1-开启）现在已知支持设备为 大华、TP——LINK全系设备'
  64 +
  65 +
  66 +alter table device_alarm
  67 + change deviceId device_id varchar(50) not null;
  68 +
  69 +alter table device_alarm
  70 + change channelId channel_id varchar(50) not null;
  71 +
  72 +alter table device_alarm
  73 + change alarmPriority alarm_priority varchar(50) not null;
  74 +
  75 +alter table device_alarm
  76 + change alarmMethod alarm_method varchar(50) null;
  77 +
  78 +alter table device_alarm
  79 + change alarmTime alarm_time varchar(50) not null;
  80 +
  81 +alter table device_alarm
  82 + change alarmDescription alarm_description varchar(255) null;
  83 +
  84 +alter table device_alarm
  85 + change alarmType alarm_type varchar(50) null;
  86 +
  87 +alter table device_alarm
  88 + change createTime create_time varchar(50) null;
  89 +
  90 +alter table device_channel
  91 + change channelId channel_id varchar(50) not null;
  92 +
  93 +alter table device_channel
  94 + change civilCode civil_code varchar(50) null;
  95 +
  96 +alter table device_channel
  97 + change parentId parent_id varchar(50) null;
  98 +
  99 +alter table device_channel
  100 + change safetyWay safety_way int null;
  101 +
  102 +alter table device_channel
  103 + change registerWay register_way int null;
  104 +
  105 +alter table device_channel
  106 + change certNum cert_num varchar(50) null;
  107 +
  108 +alter table device_channel
  109 + change errCode err_code int null;
  110 +
  111 +alter table device_channel
  112 + change endTime end_time varchar(50) null;
  113 +
  114 +alter table device_channel
  115 + change ipAddress ip_address varchar(50) null;
  116 +
  117 +alter table device_channel
  118 + change PTZType ptz_type int null;
  119 +
  120 +alter table device_channel
  121 + change status status bool default false;
  122 +
  123 +alter table device_channel
  124 + change streamId stream_id varchar(255) null;
  125 +
  126 +alter table device_channel
  127 + change deviceId device_id varchar(50) not null;
  128 +
  129 +
  130 +alter table device_channel
  131 + change hasAudio has_audio bool default false;
  132 +
  133 +alter table device_channel
  134 + change createTime create_time varchar(50) not null;
  135 +
  136 +alter table device_channel
  137 + change updateTime update_time varchar(50) not null;
  138 +
  139 +alter table device_channel
  140 + change subCount sub_count int default 0 null;
  141 +
  142 +alter table device_channel
  143 + change longitudeGcj02 longitude_gcj02 double null;
  144 +
  145 +alter table device_channel
  146 + change latitudeGcj02 latitude_gcj02 double null;
  147 +
  148 +alter table device_channel
  149 + change longitudeWgs84 longitude_wgs84 double null;
  150 +
  151 +alter table device_channel
  152 + change latitudeWgs84 latitude_wgs84 double null;
  153 +
  154 +alter table device_channel
  155 + change businessGroupId business_group_id varchar(50) null;
  156 +
  157 +alter table device_channel
  158 + change gpsTime gps_time varchar(50) null;
  159 +
  160 +alter table device_mobile_position
  161 + change deviceId device_id varchar(50) not null;
  162 +
  163 +alter table device_mobile_position
  164 + change channelId channel_id varchar(50) not null;
  165 +
  166 +alter table device_mobile_position
  167 + change deviceName device_name varchar(255) null;
  168 +
  169 +alter table device_mobile_position
  170 + change reportSource report_source varchar(50) null;
  171 +
  172 +alter table device_mobile_position
  173 + change longitudeGcj02 longitude_gcj02 double null;
  174 +
  175 +alter table device_mobile_position
  176 + change latitudeGcj02 latitude_gcj02 double null;
  177 +
  178 +alter table device_mobile_position
  179 + change longitudeWgs84 longitude_wgs84 double null;
  180 +
  181 +alter table device_mobile_position
  182 + change latitudeWgs84 latitude_wgs84 double null;
  183 +
  184 +alter table device_mobile_position
  185 + change createTime create_time varchar(50) null;
  186 +
  187 +alter table gb_stream
  188 + change gbStreamId gb_stream_id int auto_increment;
  189 +
  190 +alter table gb_stream
  191 + change gbId gb_id varchar(50) not null;
  192 +
  193 +alter table gb_stream
  194 + change streamType stream_type varchar(50) null;
  195 +
  196 +alter table gb_stream
  197 + change mediaServerId media_server_id varchar(50) null;
  198 +
  199 +alter table gb_stream
  200 + change createTime create_time varchar(50) null;
  201 +
  202 +alter table log
  203 + change createTime create_time varchar(50) not null;
  204 +
  205 +alter table media_server
  206 + change hookIp hook_ip varchar(50) not null;
  207 +
  208 +alter table media_server
  209 + add send_rtp_port_range varchar(50) not null;
  210 +
  211 +alter table media_server
  212 + add column send_rtp_port_range varchar(50) default null;
  213 +
  214 +alter table media_server
  215 + change sdpIp sdp_ip varchar(50) not null;
  216 +
  217 +alter table media_server
  218 + change streamIp stream_ip varchar(50) not null;
  219 +
  220 +alter table media_server
  221 + change httpPort http_port int not null;
  222 +
  223 +alter table media_server
  224 + change httpSSlPort http_ssl_port int not null;
  225 +
  226 +alter table media_server
  227 + change rtmpPort rtmp_port int not null;
  228 +
  229 +alter table media_server
  230 + change rtmpSSlPort rtmp_ssl_port int not null;
  231 +
  232 +alter table media_server
  233 + change rtpProxyPort rtp_proxy_port int not null;
  234 +
  235 +alter table media_server
  236 + change rtspPort rtsp_port int not null;
  237 +
  238 +alter table media_server
  239 + change rtspSSLPort rtsp_ssl_port int not null;
  240 +
  241 +alter table media_server
  242 + change autoConfig auto_config bool default true;
  243 +
  244 +alter table media_server
  245 + change rtpEnable rtp_enable bool default false;
  246 +
  247 +alter table media_server
  248 + change rtpPortRange rtp_port_range varchar(50) not null;
  249 +
  250 +alter table media_server
  251 + change recordAssistPort record_assist_port int not null;
  252 +
  253 +alter table media_server
  254 + change defaultServer default_server bool default false;
  255 +
  256 +alter table media_server
  257 + change createTime create_time varchar(50) not null;
  258 +
  259 +alter table media_server
  260 + change updateTime update_time varchar(50) not null;
  261 +
  262 +alter table media_server
  263 + change hookAliveInterval hook_alive_interval int not null;
  264 +
  265 +alter table parent_platform
  266 + change serverGBId server_gb_id varchar(50) not null;
  267 +
  268 +alter table parent_platform
  269 + change serverGBDomain server_gb_domain varchar(50) null;
  270 +
  271 +alter table parent_platform
  272 + change serverIP server_ip varchar(50) null;
  273 +
  274 +alter table parent_platform
  275 + change serverPort server_port int null;
  276 +
  277 +alter table parent_platform
  278 + change deviceGBId device_gb_id varchar(50) not null;
  279 +
  280 +alter table parent_platform
  281 + change deviceIp device_ip varchar(50) null;
  282 +
  283 +alter table parent_platform
  284 + change devicePort device_port varchar(50) null;
  285 +
  286 +alter table parent_platform
  287 + change keepTimeout keep_timeout varchar(50) null;
  288 +
  289 +alter table parent_platform
  290 + change characterSet character_set varchar(50) null;
  291 +
  292 +alter table parent_platform
  293 + change catalogId catalog_id varchar(50) not null;
  294 +
  295 +alter table parent_platform
  296 + change startOfflinePush start_offline_push bool default false;
  297 +
  298 +alter table parent_platform
  299 + change administrativeDivision administrative_division varchar(50) not null;
  300 +
  301 +alter table parent_platform
  302 + change catalogGroup catalog_group int default 1 null;
  303 +
  304 +alter table parent_platform
  305 + change createTime create_time varchar(50) null;
  306 +
  307 +alter table parent_platform
  308 + change updateTime update_time varchar(50) null;
  309 +
  310 +alter table parent_platform
  311 +drop column treeType;
  312 +
  313 +alter table parent_platform
  314 + change asMessageChannel as_message_channel bool default false;
  315 +
  316 +alter table parent_platform
  317 + change enable enable bool default false;
  318 +
  319 +alter table parent_platform
  320 + change ptz ptz bool default false;
  321 +
  322 +alter table parent_platform
  323 + change rtcp rtcp bool default false;
  324 +
  325 +alter table parent_platform
  326 + change status status bool default false;
  327 +
  328 +alter table parent_platform
  329 + change status status bool default false;
  330 +
  331 +alter table platform_catalog
  332 + change platformId platform_id varchar(50) not null;
  333 +
  334 +alter table platform_catalog
  335 + change parentId parent_id varchar(50) null;
  336 +
  337 +alter table platform_catalog
  338 + change civilCode civil_code varchar(50) null;
  339 +
  340 +alter table platform_catalog
  341 + change businessGroupId business_group_id varchar(50) null;
  342 +
  343 +alter table platform_gb_channel
  344 + change platformId platform_id varchar(50) not null;
  345 +
  346 +alter table platform_gb_channel
  347 + change catalogId catalog_id varchar(50) not null;
  348 +
  349 +alter table platform_gb_channel
  350 + change deviceChannelId device_channel_id int not null;
  351 +
  352 +alter table platform_gb_stream
  353 + change platformId platform_id varchar(50) not null;
  354 +
  355 +alter table platform_gb_stream
  356 + change catalogId catalog_id varchar(50) not null;
  357 +
  358 +alter table platform_gb_stream
  359 + change gbStreamId gb_stream_id int not null;
  360 +
  361 +alter table stream_proxy
  362 + change mediaServerId media_server_id varchar(50) null;
  363 +
  364 +alter table stream_proxy
  365 + change createTime create_time varchar(50) not null;
  366 +
  367 +alter table stream_proxy
  368 + change updateTime update_time varchar(50) null;
  369 +
  370 +alter table stream_proxy
  371 + change enable_remove_none_reader enable_remove_none_reader bool default false;
  372 +
  373 +alter table stream_proxy
  374 + change enable_disable_none_reader enable_disable_none_reader bool default false;
  375 +
  376 +alter table stream_proxy
  377 + change enable_audio enable_audio bool default false;
  378 +
  379 +alter table stream_proxy
  380 + change enable_mp4 enable_mp4 bool default false;
  381 +
  382 +alter table stream_proxy
  383 + change enable enable bool default false;
  384 +
  385 +alter table stream_push
  386 + change totalReaderCount total_reader_count varchar(50) null;
  387 +
  388 +alter table stream_push
  389 + change originType origin_type int null;
  390 +
  391 +alter table stream_push
  392 + change originTypeStr origin_type_str varchar(50) null;
  393 +
  394 +alter table stream_push
  395 + change createTime create_time varchar(50) null;
  396 +
  397 +alter table stream_push
  398 + change aliveSecond alive_second int null;
  399 +
  400 +alter table stream_push
  401 + change mediaServerId media_server_id varchar(50) null;
  402 +
  403 +alter table stream_push
  404 + change status status bool default false;
  405 +
  406 +alter table stream_push
  407 + change pushTime push_time varchar(50) null;
  408 +
  409 +alter table stream_push
  410 + change updateTime update_time varchar(50) null;
  411 +
  412 +alter table stream_push
  413 + change pushIng push_ing bool default false;
  414 +
  415 +alter table stream_push
  416 + change status status bool default false;
  417 +
  418 +alter table stream_push
  419 + change self self bool default false;
  420 +
  421 +alter table stream_push
  422 +drop column serverId;
  423 +
  424 +
  425 +alter table user
  426 + change roleId role_id int not null;
  427 +
  428 +alter table user
  429 + change createTime create_time varchar(50) not null;
  430 +
  431 +alter table user
  432 + change updateTime update_time varchar(50) not null;
  433 +
  434 +alter table user
  435 + change pushKey push_key varchar(50) null;
  436 +
  437 +alter table user_role
  438 + change createTime create_time varchar(50) not null;
  439 +
  440 +alter table user_role
  441 + change updateTime update_time varchar(50) not null;
  442 +
  443 +rename table device to wvp_device;
  444 +rename table device_alarm to wvp_device_alarm;
  445 +rename table device_channel to wvp_device_channel;
  446 +rename table device_mobile_position to wvp_device_mobile_position;
  447 +rename table gb_stream to wvp_gb_stream;
  448 +rename table log to wvp_log;
  449 +rename table media_server to wvp_media_server;
  450 +rename table parent_platform to wvp_platform;
  451 +rename table platform_catalog to wvp_platform_catalog;
  452 +rename table platform_gb_channel to wvp_platform_gb_channel;
  453 +rename table platform_gb_stream to wvp_platform_gb_stream;
  454 +rename table stream_proxy to wvp_stream_proxy;
  455 +rename table stream_push to wvp_stream_push;
  456 +rename table user to wvp_user;
  457 +rename table user_role to wvp_user_role;
  458 +
  459 +alter table wvp_device add column broadcast_push_after_ack bool default false;
  460 +alter table wvp_device_channel add column custom_name varchar(255) null ;
  461 +alter table wvp_device_channel add column custom_longitude double null ;
  462 +alter table wvp_device_channel add column custom_latitude double null ;
  463 +alter table wvp_device_channel add column custom_ptz_type int null ;
  464 +
  465 +create table wvp_resources_tree (
  466 + id serial primary key ,
  467 + is_catalog bool default true,
  468 + device_channel_id integer ,
  469 + gb_stream_id integer,
  470 + name character varying(255),
  471 + parentId integer,
  472 + path character varying(255)
  473 +);
3 474
4 alter table wvp_platform 475 alter table wvp_platform
5 add auto_push_channel bool default false; 476 add auto_push_channel bool default false;
sql/更新-postgresql-kingbase-2.6.9.sql
  View file @b7ad0a9
1 -alter table wvp_device_channel  
2 - rename "stream_id" to stream_id ; 1 +
  2 +alter table device
  3 + change deviceId device_id varchar(50) not null;
  4 +
  5 +alter table device
  6 + change streamMode stream_mode varchar(50) null;
  7 +
  8 +alter table device
  9 + change registerTime register_time varchar(50) null;
  10 +
  11 +alter table device
  12 + change keepaliveTime keepalive_time varchar(50) null;
  13 +
  14 +alter table device
  15 + change createTime create_time varchar(50) not null;
  16 +
  17 +alter table device
  18 + change updateTime update_time varchar(50) not null;
  19 +
  20 +alter table device
  21 + change subscribeCycleForCatalog subscribe_cycle_for_catalog bool default false;
  22 +
  23 +alter table device
  24 + change subscribeCycleForMobilePosition subscribe_cycle_for_mobile_position bool default false;
  25 +
  26 +alter table device
  27 + change mobilePositionSubmissionInterval mobile_position_submission_interval int default 5 not null;
  28 +
  29 +alter table device
  30 + change subscribeCycleForAlarm subscribe_cycle_for_alarm bool default false;
  31 +
  32 +alter table device
  33 + change hostAddress host_address varchar(50) null;
  34 +
  35 +alter table device
  36 + change ssrcCheck ssrc_check bool default false;
  37 +
  38 +alter table device
  39 + change geoCoordSys geo_coord_sys varchar(50) not null;
  40 +
  41 +alter table device
  42 +drop column treeType;
  43 +
  44 +alter table device
  45 + change mediaServerId media_server_id varchar(50) default 'auto' null;
  46 +
  47 +alter table device
  48 + change sdpIp sdp_ip varchar(50) null;
  49 +
  50 +alter table device
  51 + change localIp local_ip varchar(50) null;
  52 +
  53 +alter table device
  54 + change asMessageChannel as_message_channel bool default false;
  55 +
  56 +alter table device
  57 + change keepaliveIntervalTime keepalive_interval_time int null;
  58 +
  59 +alter table device
  60 + change online on_line varchar(50) null;
  61 +
  62 +alter table device
  63 + add COLUMN switch_primary_sub_stream bool default false comment '开启主子码流切换的开关（0-不开启，1-开启）现在已知支持设备为 大华、TP——LINK全系设备'
  64 +
  65 +
  66 +alter table device_alarm
  67 + change deviceId device_id varchar(50) not null;
  68 +
  69 +alter table device_alarm
  70 + change channelId channel_id varchar(50) not null;
  71 +
  72 +alter table device_alarm
  73 + change alarmPriority alarm_priority varchar(50) not null;
  74 +
  75 +alter table device_alarm
  76 + change alarmMethod alarm_method varchar(50) null;
  77 +
  78 +alter table device_alarm
  79 + change alarmTime alarm_time varchar(50) not null;
  80 +
  81 +alter table device_alarm
  82 + change alarmDescription alarm_description varchar(255) null;
  83 +
  84 +alter table device_alarm
  85 + change alarmType alarm_type varchar(50) null;
  86 +
  87 +alter table device_alarm
  88 + change createTime create_time varchar(50) null;
  89 +
  90 +alter table device_channel
  91 + change channelId channel_id varchar(50) not null;
  92 +
  93 +alter table device_channel
  94 + change civilCode civil_code varchar(50) null;
  95 +
  96 +alter table device_channel
  97 + change parentId parent_id varchar(50) null;
  98 +
  99 +alter table device_channel
  100 + change safetyWay safety_way int null;
  101 +
  102 +alter table device_channel
  103 + change registerWay register_way int null;
  104 +
  105 +alter table device_channel
  106 + change certNum cert_num varchar(50) null;
  107 +
  108 +alter table device_channel
  109 + change errCode err_code int null;
  110 +
  111 +alter table device_channel
  112 + change endTime end_time varchar(50) null;
  113 +
  114 +alter table device_channel
  115 + change ipAddress ip_address varchar(50) null;
  116 +
  117 +alter table device_channel
  118 + change PTZType ptz_type int null;
  119 +
  120 +alter table device_channel
  121 + change status status bool default false;
  122 +
  123 +alter table device_channel
  124 + change streamId stream_id varchar(255) null;
  125 +
  126 +alter table device_channel
  127 + change deviceId device_id varchar(50) not null;
  128 +
  129 +
  130 +alter table device_channel
  131 + change hasAudio has_audio bool default false;
  132 +
  133 +alter table device_channel
  134 + change createTime create_time varchar(50) not null;
  135 +
  136 +alter table device_channel
  137 + change updateTime update_time varchar(50) not null;
  138 +
  139 +alter table device_channel
  140 + change subCount sub_count int default 0 null;
  141 +
  142 +alter table device_channel
  143 + change longitudeGcj02 longitude_gcj02 double null;
  144 +
  145 +alter table device_channel
  146 + change latitudeGcj02 latitude_gcj02 double null;
  147 +
  148 +alter table device_channel
  149 + change longitudeWgs84 longitude_wgs84 double null;
  150 +
  151 +alter table device_channel
  152 + change latitudeWgs84 latitude_wgs84 double null;
  153 +
  154 +alter table device_channel
  155 + change businessGroupId business_group_id varchar(50) null;
  156 +
  157 +alter table device_channel
  158 + change gpsTime gps_time varchar(50) null;
  159 +
  160 +alter table device_mobile_position
  161 + change deviceId device_id varchar(50) not null;
  162 +
  163 +alter table device_mobile_position
  164 + change channelId channel_id varchar(50) not null;
  165 +
  166 +alter table device_mobile_position
  167 + change deviceName device_name varchar(255) null;
  168 +
  169 +alter table device_mobile_position
  170 + change reportSource report_source varchar(50) null;
  171 +
  172 +alter table device_mobile_position
  173 + change longitudeGcj02 longitude_gcj02 double null;
  174 +
  175 +alter table device_mobile_position
  176 + change latitudeGcj02 latitude_gcj02 double null;
  177 +
  178 +alter table device_mobile_position
  179 + change longitudeWgs84 longitude_wgs84 double null;
  180 +
  181 +alter table device_mobile_position
  182 + change latitudeWgs84 latitude_wgs84 double null;
  183 +
  184 +alter table device_mobile_position
  185 + change createTime create_time varchar(50) null;
  186 +
  187 +alter table gb_stream
  188 + change gbStreamId gb_stream_id int auto_increment;
  189 +
  190 +alter table gb_stream
  191 + change gbId gb_id varchar(50) not null;
  192 +
  193 +alter table gb_stream
  194 + change streamType stream_type varchar(50) null;
  195 +
  196 +alter table gb_stream
  197 + change mediaServerId media_server_id varchar(50) null;
  198 +
  199 +alter table gb_stream
  200 + change createTime create_time varchar(50) null;
  201 +
  202 +alter table log
  203 + change createTime create_time varchar(50) not null;
  204 +
  205 +alter table media_server
  206 + change hookIp hook_ip varchar(50) not null;
  207 +
  208 +alter table media_server
  209 + add send_rtp_port_range varchar(50) not null;
  210 +
  211 +alter table media_server
  212 + add column send_rtp_port_range varchar(50) default null;
  213 +
  214 +alter table media_server
  215 + change sdpIp sdp_ip varchar(50) not null;
  216 +
  217 +alter table media_server
  218 + change streamIp stream_ip varchar(50) not null;
  219 +
  220 +alter table media_server
  221 + change httpPort http_port int not null;
  222 +
  223 +alter table media_server
  224 + change httpSSlPort http_ssl_port int not null;
  225 +
  226 +alter table media_server
  227 + change rtmpPort rtmp_port int not null;
  228 +
  229 +alter table media_server
  230 + change rtmpSSlPort rtmp_ssl_port int not null;
  231 +
  232 +alter table media_server
  233 + change rtpProxyPort rtp_proxy_port int not null;
  234 +
  235 +alter table media_server
  236 + change rtspPort rtsp_port int not null;
  237 +
  238 +alter table media_server
  239 + change rtspSSLPort rtsp_ssl_port int not null;
  240 +
  241 +alter table media_server
  242 + change autoConfig auto_config bool default true;
  243 +
  244 +alter table media_server
  245 + change rtpEnable rtp_enable bool default false;
  246 +
  247 +alter table media_server
  248 + change rtpPortRange rtp_port_range varchar(50) not null;
  249 +
  250 +alter table media_server
  251 + change recordAssistPort record_assist_port int not null;
  252 +
  253 +alter table media_server
  254 + change defaultServer default_server bool default false;
  255 +
  256 +alter table media_server
  257 + change createTime create_time varchar(50) not null;
  258 +
  259 +alter table media_server
  260 + change updateTime update_time varchar(50) not null;
  261 +
  262 +alter table media_server
  263 + change hookAliveInterval hook_alive_interval int not null;
  264 +
  265 +alter table parent_platform
  266 + change serverGBId server_gb_id varchar(50) not null;
  267 +
  268 +alter table parent_platform
  269 + change serverGBDomain server_gb_domain varchar(50) null;
  270 +
  271 +alter table parent_platform
  272 + change serverIP server_ip varchar(50) null;
  273 +
  274 +alter table parent_platform
  275 + change serverPort server_port int null;
  276 +
  277 +alter table parent_platform
  278 + change deviceGBId device_gb_id varchar(50) not null;
  279 +
  280 +alter table parent_platform
  281 + change deviceIp device_ip varchar(50) null;
  282 +
  283 +alter table parent_platform
  284 + change devicePort device_port varchar(50) null;
  285 +
  286 +alter table parent_platform
  287 + change keepTimeout keep_timeout varchar(50) null;
  288 +
  289 +alter table parent_platform
  290 + change characterSet character_set varchar(50) null;
  291 +
  292 +alter table parent_platform
  293 + change catalogId catalog_id varchar(50) not null;
  294 +
  295 +alter table parent_platform
  296 + change startOfflinePush start_offline_push bool default false;
  297 +
  298 +alter table parent_platform
  299 + change administrativeDivision administrative_division varchar(50) not null;
  300 +
  301 +alter table parent_platform
  302 + change catalogGroup catalog_group int default 1 null;
  303 +
  304 +alter table parent_platform
  305 + change createTime create_time varchar(50) null;
  306 +
  307 +alter table parent_platform
  308 + change updateTime update_time varchar(50) null;
  309 +
  310 +alter table parent_platform
  311 +drop column treeType;
  312 +
  313 +alter table parent_platform
  314 + change asMessageChannel as_message_channel bool default false;
  315 +
  316 +alter table parent_platform
  317 + change enable enable bool default false;
  318 +
  319 +alter table parent_platform
  320 + change ptz ptz bool default false;
  321 +
  322 +alter table parent_platform
  323 + change rtcp rtcp bool default false;
  324 +
  325 +alter table parent_platform
  326 + change status status bool default false;
  327 +
  328 +alter table parent_platform
  329 + change status status bool default false;
  330 +
  331 +alter table platform_catalog
  332 + change platformId platform_id varchar(50) not null;
  333 +
  334 +alter table platform_catalog
  335 + change parentId parent_id varchar(50) null;
  336 +
  337 +alter table platform_catalog
  338 + change civilCode civil_code varchar(50) null;
  339 +
  340 +alter table platform_catalog
  341 + change businessGroupId business_group_id varchar(50) null;
  342 +
  343 +alter table platform_gb_channel
  344 + change platformId platform_id varchar(50) not null;
  345 +
  346 +alter table platform_gb_channel
  347 + change catalogId catalog_id varchar(50) not null;
  348 +
  349 +alter table platform_gb_channel
  350 + change deviceChannelId device_channel_id int not null;
  351 +
  352 +alter table platform_gb_stream
  353 + change platformId platform_id varchar(50) not null;
  354 +
  355 +alter table platform_gb_stream
  356 + change catalogId catalog_id varchar(50) not null;
  357 +
  358 +alter table platform_gb_stream
  359 + change gbStreamId gb_stream_id int not null;
  360 +
  361 +alter table stream_proxy
  362 + change mediaServerId media_server_id varchar(50) null;
  363 +
  364 +alter table stream_proxy
  365 + change createTime create_time varchar(50) not null;
  366 +
  367 +alter table stream_proxy
  368 + change updateTime update_time varchar(50) null;
  369 +
  370 +alter table stream_proxy
  371 + change enable_remove_none_reader enable_remove_none_reader bool default false;
  372 +
  373 +alter table stream_proxy
  374 + change enable_disable_none_reader enable_disable_none_reader bool default false;
  375 +
  376 +alter table stream_proxy
  377 + change enable_audio enable_audio bool default false;
  378 +
  379 +alter table stream_proxy
  380 + change enable_mp4 enable_mp4 bool default false;
  381 +
  382 +alter table stream_proxy
  383 + change enable enable bool default false;
  384 +
  385 +alter table stream_push
  386 + change totalReaderCount total_reader_count varchar(50) null;
  387 +
  388 +alter table stream_push
  389 + change originType origin_type int null;
  390 +
  391 +alter table stream_push
  392 + change originTypeStr origin_type_str varchar(50) null;
  393 +
  394 +alter table stream_push
  395 + change createTime create_time varchar(50) null;
  396 +
  397 +alter table stream_push
  398 + change aliveSecond alive_second int null;
  399 +
  400 +alter table stream_push
  401 + change mediaServerId media_server_id varchar(50) null;
  402 +
  403 +alter table stream_push
  404 + change status status bool default false;
  405 +
  406 +alter table stream_push
  407 + change pushTime push_time varchar(50) null;
  408 +
  409 +alter table stream_push
  410 + change updateTime update_time varchar(50) null;
  411 +
  412 +alter table stream_push
  413 + change pushIng push_ing bool default false;
  414 +
  415 +alter table stream_push
  416 + change status status bool default false;
  417 +
  418 +alter table stream_push
  419 + change self self bool default false;
  420 +
  421 +alter table stream_push
  422 +drop column serverId;
  423 +
  424 +
  425 +alter table user
  426 + change roleId role_id int not null;
  427 +
  428 +alter table user
  429 + change createTime create_time varchar(50) not null;
  430 +
  431 +alter table user
  432 + change updateTime update_time varchar(50) not null;
  433 +
  434 +alter table user
  435 + change pushKey push_key varchar(50) null;
  436 +
  437 +alter table user_role
  438 + change createTime create_time varchar(50) not null;
  439 +
  440 +alter table user_role
  441 + change updateTime update_time varchar(50) not null;
  442 +
  443 +rename table device to wvp_device;
  444 +rename table device_alarm to wvp_device_alarm;
  445 +rename table device_channel to wvp_device_channel;
  446 +rename table device_mobile_position to wvp_device_mobile_position;
  447 +rename table gb_stream to wvp_gb_stream;
  448 +rename table log to wvp_log;
  449 +rename table media_server to wvp_media_server;
  450 +rename table parent_platform to wvp_platform;
  451 +rename table platform_catalog to wvp_platform_catalog;
  452 +rename table platform_gb_channel to wvp_platform_gb_channel;
  453 +rename table platform_gb_stream to wvp_platform_gb_stream;
  454 +rename table stream_proxy to wvp_stream_proxy;
  455 +rename table stream_push to wvp_stream_push;
  456 +rename table user to wvp_user;
  457 +rename table user_role to wvp_user_role;
  458 +
  459 +alter table wvp_device add column broadcast_push_after_ack bool default false;
  460 +alter table wvp_device_channel add column custom_name varchar(255) null ;
  461 +alter table wvp_device_channel add column custom_longitude double null ;
  462 +alter table wvp_device_channel add column custom_latitude double null ;
  463 +alter table wvp_device_channel add column custom_ptz_type int null ;
  464 +
  465 +create table wvp_resources_tree (
  466 + id serial primary key ,
  467 + is_catalog bool default true,
  468 + device_channel_id integer ,
  469 + gb_stream_id integer,
  470 + name character varying(255),
  471 + parentId integer,
  472 + path character varying(255)
  473 +);
3 474
4 alter table wvp_platform 475 alter table wvp_platform
5 add auto_push_channel bool default false; 476 add auto_push_channel bool default false;
src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java
  View file @b7ad0a9
@@ -53,7 +53,7 @@ public class VideoManagerConstants { @@ -53,7 +53,7 @@ public class VideoManagerConstants {
53 53
54 public static final String MEDIA_TRANSACTION_USED_PREFIX = "VMP_MEDIA_TRANSACTION_"; 54 public static final String MEDIA_TRANSACTION_USED_PREFIX = "VMP_MEDIA_TRANSACTION_";
55 55
56 - public static final String MEDIA_STREAM_AUTHORITY = "MEDIA_STREAM_AUTHORITY_"; 56 + public static final String MEDIA_STREAM_AUTHORITY = "VMP_MEDIA_STREAM_AUTHORITY_";
57 57
58 public static final String SIP_CSEQ_PREFIX = "VMP_SIP_CSEQ_"; 58 public static final String SIP_CSEQ_PREFIX = "VMP_SIP_CSEQ_";
59 59