Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修复国标级联点播

结构优化
648540858 2024-01-25 18:18:42 +08:00
parent 7c7c1cf398
commit 932eff1d73
5 changed files with 145 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
View File

@ -256,6 +256,7 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
} }
sendRtpItem.setTcpActive(gb28181Sdp.isTcpActive()); sendRtpItem.setTcpActive(gb28181Sdp.isTcpActive());
sendRtpItem.setCallId(callIdHeader.getCallId()); sendRtpItem.setCallId(callIdHeader.getCallId());
sendRtpItem.setStreamId(streamInfo.getStream());
if ("Play".equalsIgnoreCase(sessionName)) { if ("Play".equalsIgnoreCase(sessionName)) {
sendRtpItem.setPlayType(InviteStreamType.PLAY); sendRtpItem.setPlayType(InviteStreamType.PLAY);
}else if ("Playback".equalsIgnoreCase(sessionName)) { }else if ("Playback".equalsIgnoreCase(sessionName)) {

2
src/main/java/com/genersoft/iot/vmp/storager/dao/CommonChannelPlatformMapper.java
View File

@ -62,7 +62,7 @@ public interface CommonChannelPlatformMapper {
" left join wvp_common_channel_platform cp " + " left join wvp_common_channel_platform cp " +
" on cc.common_gb_id = cp.common_gb_channel_id " + " on cc.common_gb_id = cp.common_gb_channel_id " +
" where cp.platform_id = #{platformId}" + " where cp.platform_id = #{platformId}" +
" and cp.common_gb_channel_id = #{channelId}" + " and cc.common_gb_device_id = #{channelId}" +
" </script>") " </script>")
CommonGbChannel queryChannelByPlatformIdAndChannelDeviceId(@Param("platformId") Integer platformId, CommonGbChannel queryChannelByPlatformIdAndChannelDeviceId(@Param("platformId") Integer platformId,
@Param("channelId") String channelId); @Param("channelId") String channelId);

139
数据库/结构优化/common.sql
View File

@ -1,84 +1,77 @@
CREATE TABLE `wvp_common_channel` CREATE TABLE wvp_common_channel
( (
`common_gb_id` bigint unsigned NOT NULL AUTO_INCREMENT, common_gb_id serial primary key,
`common_gb_device_id` varchar(50) NOT NULL, common_gb_device_id varchar(50) NOT NULL,
`common_gb_name` varchar(255) DEFAULT NULL, common_gb_name varchar(255) DEFAULT NULL,
`common_gb_manufacturer` varchar(255) DEFAULT NULL, common_gb_manufacturer varchar(255) DEFAULT NULL,
`common_gb_model` varchar(255) DEFAULT NULL, common_gb_model varchar(255) DEFAULT NULL,
`common_gb_owner` varchar(255) DEFAULT NULL, common_gb_owner varchar(255) DEFAULT NULL,
`common_gb_civilCode` varchar(50) DEFAULT NULL, common_gb_civilCode varchar(50) DEFAULT NULL,
`common_gb_block` varchar(255) DEFAULT NULL, common_gb_block varchar(255) DEFAULT NULL,
`common_gb_address` varchar(255) DEFAULT NULL, common_gb_address varchar(255) DEFAULT NULL,
`common_gb_parental` integer, common_gb_parental integer,
`common_gb_parent_id` varchar(50) DEFAULT NULL, common_gb_parent_id varchar(50) DEFAULT NULL,
`common_gb_safety_way` integer, common_gb_safety_way integer,
`common_gb_register_way` integer, common_gb_register_way integer,
`common_gb_cert_num` varchar(255) DEFAULT NULL, common_gb_cert_num varchar(255) DEFAULT NULL,
`common_gb_certifiable` integer, common_gb_certifiable integer,
`common_gb_err_code` integer, common_gb_err_code integer,
`common_gb_end_time` varchar(50) DEFAULT NULL, common_gb_end_time varchar(50) DEFAULT NULL,
`common_gb_secrecy` integer, common_gb_secrecy integer,
`common_gb_ip_address` varchar(50) DEFAULT NULL, common_gb_ip_address varchar(50) DEFAULT NULL,
`common_gb_port` integer, common_gb_port integer,
`common_gb_password` varchar(50) DEFAULT NULL, common_gb_password varchar(50) DEFAULT NULL,
`common_gb_status` bool default false, common_gb_status bool default false,
`common_gb_longitude` double, common_gb_longitude double,
`common_gb_latitude` double, common_gb_latitude double,
`common_gb_ptz_type` integer, common_gb_ptz_type integer,
`common_gb_position_type` integer, common_gb_position_type integer,
`common_gb_room_type` integer, common_gb_room_type integer,
`common_gb_use_type` integer, common_gb_use_type integer,
`common_gb_supply_light_type` integer, common_gb_supply_light_type integer,
`common_gb_direction_type` integer, common_gb_direction_type integer,
`common_gb_resolution` varchar(255) DEFAULT NULL, common_gb_resolution varchar(255) DEFAULT NULL,
`common_gb_business_group_id` varchar(255) DEFAULT NULL, common_gb_business_group_id varchar(255) DEFAULT NULL,
`common_gb_download_speed` varchar(255) DEFAULT NULL, common_gb_download_speed varchar(255) DEFAULT NULL,
`common_gb_svc_time_support_mode` integer, common_gb_svc_time_support_mode integer,
`common_gb_svc_space_support_mode` integer, common_gb_svc_space_support_mode integer,
`type` varchar(255) NOT NULL, type varchar(255) NOT NULL,
`update_time` varchar(50) NOT NULL, update_time varchar(50) NOT NULL,
`create_time` varchar(50) NOT NULL, create_time varchar(50) NOT NULL,
PRIMARY KEY (`common_gb_id`), UNIQUE KEY common_gb_device_id (common_gb_device_id)
UNIQUE KEY `common_gb_device_id` (`common_gb_device_id`) );
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
CREATE TABLE `wvp_common_group` CREATE TABLE wvp_common_group
( (
`common_group_id` bigint unsigned NOT NULL AUTO_INCREMENT, common_group_id serial primary key,
`common_group_device_id` varchar(50) NOT NULL, common_group_device_id varchar(50) NOT NULL,
`common_group_name` varchar(255) NOT NULL, common_group_name varchar(255) NOT NULL,
`common_group_parent_id` varchar(50) DEFAULT NULL, common_group_parent_id varchar(50) DEFAULT NULL,
`common_group_top_id` varchar(50) DEFAULT NULL, common_group_top_id varchar(50) DEFAULT NULL,
`common_group_create_time` varchar(50) NOT NULL, common_group_create_time varchar(50) NOT NULL,
`common_group_update_time` varchar(50) NOT NULL, common_group_update_time varchar(50) NOT NULL,
PRIMARY KEY (`common_group_id`), UNIQUE KEY common_group_device_id (common_group_device_id)
UNIQUE KEY `common_group_device_id` (`common_group_device_id`) );
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
CREATE TABLE `wvp_common_region` CREATE TABLE wvp_common_region
( (
`common_region_id` bigint unsigned NOT NULL AUTO_INCREMENT, common_region_id serial primary key,
`common_region_device_id` varchar(50) NOT NULL, common_region_device_id varchar(50) NOT NULL,
`common_region_name` varchar(255) NOT NULL, common_region_name varchar(255) NOT NULL,
`common_region_parent_id` varchar(50) DEFAULT NULL, common_region_parent_id varchar(50) DEFAULT NULL,
`common_region_create_time` varchar(50) NOT NULL, common_region_create_time varchar(50) NOT NULL,
`common_region_update_time` varchar(50) NOT NULL, common_region_update_time varchar(50) NOT NULL,
PRIMARY KEY (`common_region_id`), UNIQUE KEY common_region_device_id (common_region_device_id)
UNIQUE KEY `common_region_device_id` (`common_region_device_id`) );
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
CREATE TABLE `wvp_common_channel_platform` CREATE TABLE wvp_common_channel_platform
( (
`id` bigint unsigned NOT NULL AUTO_INCREMENT, id serial primary key,
`platform_id` bigint unsigned NOT NULL, platform_id integer,
`common_gb_channel_id` bigint unsigned NOT NULL, common_gb_channel_id integer,
PRIMARY KEY (`id`), UNIQUE KEY uk_platform_id_common_gb_channel_id (platform_id,common_gb_channel_id)
UNIQUE KEY `id` (`id`), );
UNIQUE KEY `uk_platform_id_common_gb_channel_id` (`platform_id`,`common_gb_channel_id`)
) ENGINE = InnoDB
DEFAULT CHARSET = utf8mb4
COLLATE = utf8mb4_0900_ai_ci;
drop table wvp_platform_gb_stream; drop table wvp_platform_gb_stream;

75
数据库/结构优化/初始化-mysql.sql
View File

@ -277,6 +277,81 @@ create table wvp_user_role (
); );
CREATE TABLE wvp_common_channel
(
common_gb_id serial primary key,
common_gb_device_id varchar(50) NOT NULL,
common_gb_name varchar(255) DEFAULT NULL,
common_gb_manufacturer varchar(255) DEFAULT NULL,
common_gb_model varchar(255) DEFAULT NULL,
common_gb_owner varchar(255) DEFAULT NULL,
common_gb_civilCode varchar(50) DEFAULT NULL,
common_gb_block varchar(255) DEFAULT NULL,
common_gb_address varchar(255) DEFAULT NULL,
common_gb_parental integer,
common_gb_parent_id varchar(50) DEFAULT NULL,
common_gb_safety_way integer,
common_gb_register_way integer,
common_gb_cert_num varchar(255) DEFAULT NULL,
common_gb_certifiable integer,
common_gb_err_code integer,
common_gb_end_time varchar(50) DEFAULT NULL,
common_gb_secrecy integer,
common_gb_ip_address varchar(50) DEFAULT NULL,
common_gb_port integer,
common_gb_password varchar(50) DEFAULT NULL,
common_gb_status bool default false,
common_gb_longitude double,
common_gb_latitude double,
common_gb_ptz_type integer,
common_gb_position_type integer,
common_gb_room_type integer,
common_gb_use_type integer,
common_gb_supply_light_type integer,
common_gb_direction_type integer,
common_gb_resolution varchar(255) DEFAULT NULL,
common_gb_business_group_id varchar(255) DEFAULT NULL,
common_gb_download_speed varchar(255) DEFAULT NULL,
common_gb_svc_time_support_mode integer,
common_gb_svc_space_support_mode integer,
type varchar(255) NOT NULL,
update_time varchar(50) NOT NULL,
create_time varchar(50) NOT NULL,
UNIQUE KEY common_gb_device_id (common_gb_device_id)
);
CREATE TABLE wvp_common_group
(
common_group_id serial primary key,
common_group_device_id varchar(50) NOT NULL,
common_group_name varchar(255) NOT NULL,
common_group_parent_id varchar(50) DEFAULT NULL,
common_group_top_id varchar(50) DEFAULT NULL,
common_group_create_time varchar(50) NOT NULL,
common_group_update_time varchar(50) NOT NULL,
UNIQUE KEY common_group_device_id (common_group_device_id)
);
CREATE TABLE wvp_common_region
(
common_region_id serial primary key,
common_region_device_id varchar(50) NOT NULL,
common_region_name varchar(255) NOT NULL,
common_region_parent_id varchar(50) DEFAULT NULL,
common_region_create_time varchar(50) NOT NULL,
common_region_update_time varchar(50) NOT NULL,
UNIQUE KEY common_region_device_id (common_region_device_id)
);
CREATE TABLE wvp_common_channel_platform
(
id serial primary key,
platform_id integer,
common_gb_channel_id integer,
UNIQUE KEY uk_platform_id_common_gb_channel_id (platform_id,common_gb_channel_id)
);
/*初始数据*/ /*初始数据*/
INSERT INTO wvp_user VALUES (1, 'admin','21232f297a57a5a743894a0e4a801fc3',1,'2021-04-13 14:14:57','2021-04-13 14:14:57','3e80d1762a324d5b0ff636e0bd16f1e3'); INSERT INTO wvp_user VALUES (1, 'admin','21232f297a57a5a743894a0e4a801fc3',1,'2021-04-13 14:14:57','2021-04-13 14:14:57','3e80d1762a324d5b0ff636e0bd16f1e3');
INSERT INTO wvp_user_role VALUES (1, 'admin','0','2021-04-13 14:14:57','2021-04-13 14:14:57'); INSERT INTO wvp_user_role VALUES (1, 'admin','0','2021-04-13 14:14:57','2021-04-13 14:14:57');

2
数据库/结构优化/初始化-postgresql-kingbase.sql
View File

@ -338,7 +338,7 @@ CREATE TABLE wvp_common_channel_platform
id serial primary key, id serial primary key,
platform_id integer, platform_id integer,
common_gb_channel_id integer, common_gb_channel_id integer,
constraint uk_platform_id_common_gb_channel_id unique (platform_id,common_gb_channel_id) constraint uk_platform_id_common_channel_id unique (platform_id,common_gb_channel_id)
); );