添加公用国标通道与sql

结构优化
648540858 2023-08-21 17:54:15 +08:00
parent 43a92588dc
commit dbe5b8f5a8
5 changed files with 469 additions and 12 deletions

90
sql/common.sql Normal file
View File

@ -0,0 +1,90 @@
CREATE TABLE `wvp_common_gb_channel`
(
`common_gb_id` bigint unsigned NOT NULL AUTO_INCREMENT,
`common_gb_device_id` varchar(50) NOT NULL,
`common_gb_name` varchar(255) NOT 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) NOT 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` varchar(50) DEFAULT 'OFF',
`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,
`type` varchar(255) NOT NULL,
PRIMARY KEY (`common_gb_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_business_group`
(
`common_business_group_id` bigint unsigned NOT NULL AUTO_INCREMENT,
`common_business_group_device_id` varchar(50) NOT NULL,
`common_business_group_name` varchar(255) NOT NULL,
`common_business_group_civilCode` varchar(50) DEFAULT NULL,
`common_business_group_parent_id` varchar(50) DEFAULT NULL,
`common_business_group_path` varchar(500) DEFAULT NULL,
`type` varchar(255) NOT NULL,
PRIMARY KEY (`common_business_group_id`),
UNIQUE KEY `common_business_group_device_id` (`common_business_group_device_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
CREATE TABLE `wvp_common_region`
(
`common_region_id` bigint unsigned NOT NULL AUTO_INCREMENT,
`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_path` varchar(255) NOT NULL,
PRIMARY KEY (`common_region_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_platform_channel`
(
`id` bigint unsigned NOT NULL AUTO_INCREMENT,
`platform_id` varchar(50) DEFAULT NULL,
`common_gb_channel_id` int DEFAULT NULL,
PRIMARY KEY (`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
CREATE TABLE `wvp_common_platform_channel`
(
`id` bigint unsigned NOT NULL AUTO_INCREMENT,
`platform_id` varchar(50) DEFAULT NULL,
`catalog_id` varchar(50) DEFAULT NULL,
`device_channel_id` int DEFAULT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `id` (`id`),
UNIQUE KEY `uk_platform_gb_channel_platform_id_catalog_id_device_channel_id` (`platform_id`,`catalog_id`,`device_channel_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci

View File

@ -4,6 +4,13 @@ import io.swagger.v3.oas.annotations.media.Schema;
public class CommonGbChannel {
/**
* ID
*/
@Schema(description = "自增ID")
private int commonGbId;
/**
* //()
*/
@ -118,26 +125,26 @@ public class CommonGbChannel {
* //IP()
*/
@Schema(description = "设备/区域/系统IP地址(可选)")
private String commonIPAddress;
private String commonGbIPAddress;
/**
* //()
*/
@Schema(description = "设备/区域/系统端口(可选)")
private String commonPort;
private Integer commonGbPort;
/**
* ()
*/
@Schema(description = "设备口令(可选)")
private String commonPassword;
private String commonGbPassword;
/**
* ()
*/
@Schema(description = "设备状态(必选)")
private String commonStatus;
private String commonGbStatus;
/**
* ()
@ -252,7 +259,7 @@ public class CommonGbChannel {
*/
@Schema(description = "摄像机支持的分辨率,可有多个分辨率值,各个取值间以“/”分隔。" +
"分辨率取值参见附录 F中SDPf字段规定。当目录项为摄像机时可选。")
private Integer commonGbResolution;
private String commonGbResolution;
/**
* ID,,
@ -261,7 +268,7 @@ public class CommonGbChannel {
*/
@Schema(description = "虚拟组织所属的业务分组ID,业务分组根据特定的业务需求制定," +
"一个业务分组包含一组特定的虚拟组织。")
private Integer commonGbBusinessGroupID;
private String commonGbBusinessGroupID;
/**
* (),/,1,2,4
@ -269,15 +276,297 @@ public class CommonGbChannel {
*/
@Schema(description = "下载倍速范围(可选),各可选参数以“/”分隔,如设备支持1,2,4倍速下\n" +
"载则应写为“1/2/4")
private Integer commonGbDownloadSpeed;
private String commonGbDownloadSpeed;
/**
* (),/,1,2,4
* 1/2/4
* ,0:;1:1;2:2;3:3()
*/
@Schema(description = "时域编码能力,取值0:不支持;1:1级增强;2:2级增强;3:3级增强(可\n" +
"选)")
@Schema(description = "时域编码能力,取值0:不支持;1:1级增强;2:2级增强;3:3级增强(可选)")
private Integer commonGbSVCTimeSupportMode;
/**
* : 28181, push, proxy
*/
@Schema(description = "类型: 28181, push, proxy")
private String type;
public int getCommonGbId() {
return commonGbId;
}
public void setCommonGbId(int commonGbId) {
this.commonGbId = commonGbId;
}
public String getCommonGbDeviceID() {
return commonGbDeviceID;
}
public void setCommonGbDeviceID(String commonGbDeviceID) {
this.commonGbDeviceID = commonGbDeviceID;
}
public String getCommonGbName() {
return commonGbName;
}
public void setCommonGbName(String commonGbName) {
this.commonGbName = commonGbName;
}
public String getCommonGbManufacturer() {
return commonGbManufacturer;
}
public void setCommonGbManufacturer(String commonGbManufacturer) {
this.commonGbManufacturer = commonGbManufacturer;
}
public String getCommonGbModel() {
return commonGbModel;
}
public void setCommonGbModel(String commonGbModel) {
this.commonGbModel = commonGbModel;
}
public String getCommonGbOwner() {
return commonGbOwner;
}
public void setCommonGbOwner(String commonGbOwner) {
this.commonGbOwner = commonGbOwner;
}
public String getCommonGbCivilCode() {
return commonGbCivilCode;
}
public void setCommonGbCivilCode(String commonGbCivilCode) {
this.commonGbCivilCode = commonGbCivilCode;
}
public String getCommonGbBlock() {
return commonGbBlock;
}
public void setCommonGbBlock(String commonGbBlock) {
this.commonGbBlock = commonGbBlock;
}
public String getCommonGbAddress() {
return commonGbAddress;
}
public void setCommonGbAddress(String commonGbAddress) {
this.commonGbAddress = commonGbAddress;
}
public Integer getCommonGbParental() {
return commonGbParental;
}
public void setCommonGbParental(Integer commonGbParental) {
this.commonGbParental = commonGbParental;
}
public String getCommonGbParentID() {
return commonGbParentID;
}
public void setCommonGbParentID(String commonGbParentID) {
this.commonGbParentID = commonGbParentID;
}
public Integer getCommonGbSafetyWay() {
return commonGbSafetyWay;
}
public void setCommonGbSafetyWay(Integer commonGbSafetyWay) {
this.commonGbSafetyWay = commonGbSafetyWay;
}
public Integer getCommonGbRegisterWay() {
return commonGbRegisterWay;
}
public void setCommonGbRegisterWay(Integer commonGbRegisterWay) {
this.commonGbRegisterWay = commonGbRegisterWay;
}
public String getCommonGbCertNum() {
return commonGbCertNum;
}
public void setCommonGbCertNum(String commonGbCertNum) {
this.commonGbCertNum = commonGbCertNum;
}
public Integer getCommonGbCertifiable() {
return commonGbCertifiable;
}
public void setCommonGbCertifiable(Integer commonGbCertifiable) {
this.commonGbCertifiable = commonGbCertifiable;
}
public Integer getCommonGbErrCode() {
return commonGbErrCode;
}
public void setCommonGbErrCode(Integer commonGbErrCode) {
this.commonGbErrCode = commonGbErrCode;
}
public String getCommonGbEndTime() {
return commonGbEndTime;
}
public void setCommonGbEndTime(String commonGbEndTime) {
this.commonGbEndTime = commonGbEndTime;
}
public Integer getCommonGbSecrecy() {
return commonGbSecrecy;
}
public void setCommonGbSecrecy(Integer commonGbSecrecy) {
this.commonGbSecrecy = commonGbSecrecy;
}
public String getCommonGbIPAddress() {
return commonGbIPAddress;
}
public void setCommonGbIPAddress(String commonGbIPAddress) {
this.commonGbIPAddress = commonGbIPAddress;
}
public Integer getCommonGbPort() {
return commonGbPort;
}
public void setCommonGbPort(Integer commonGbPort) {
this.commonGbPort = commonGbPort;
}
public String getCommonGbPassword() {
return commonGbPassword;
}
public void setCommonGbPassword(String commonGbPassword) {
this.commonGbPassword = commonGbPassword;
}
public String getCommonGbStatus() {
return commonGbStatus;
}
public void setCommonGbStatus(String commonGbStatus) {
this.commonGbStatus = commonGbStatus;
}
public Double getCommonGbLongitude() {
return commonGbLongitude;
}
public void setCommonGbLongitude(Double commonGbLongitude) {
this.commonGbLongitude = commonGbLongitude;
}
public Double getCommonGbLatitude() {
return commonGbLatitude;
}
public void setCommonGbLatitude(Double commonGbLatitude) {
this.commonGbLatitude = commonGbLatitude;
}
public Integer getCommonGbPtzType() {
return commonGbPtzType;
}
public void setCommonGbPtzType(Integer commonGbPtzType) {
this.commonGbPtzType = commonGbPtzType;
}
public Integer getCommonGbPositionType() {
return commonGbPositionType;
}
public void setCommonGbPositionType(Integer commonGbPositionType) {
this.commonGbPositionType = commonGbPositionType;
}
public Integer getCommonGbRoomType() {
return commonGbRoomType;
}
public void setCommonGbRoomType(Integer commonGbRoomType) {
this.commonGbRoomType = commonGbRoomType;
}
public Integer getCommonGbUseType() {
return commonGbUseType;
}
public void setCommonGbUseType(Integer commonGbUseType) {
this.commonGbUseType = commonGbUseType;
}
public Integer getCommonGbSupplyLightType() {
return commonGbSupplyLightType;
}
public void setCommonGbSupplyLightType(Integer commonGbSupplyLightType) {
this.commonGbSupplyLightType = commonGbSupplyLightType;
}
public Integer getCommonGbDirectionType() {
return commonGbDirectionType;
}
public void setCommonGbDirectionType(Integer commonGbDirectionType) {
this.commonGbDirectionType = commonGbDirectionType;
}
public String getCommonGbResolution() {
return commonGbResolution;
}
public void setCommonGbResolution(String commonGbResolution) {
this.commonGbResolution = commonGbResolution;
}
public String getCommonGbBusinessGroupID() {
return commonGbBusinessGroupID;
}
public void setCommonGbBusinessGroupID(String commonGbBusinessGroupID) {
this.commonGbBusinessGroupID = commonGbBusinessGroupID;
}
public String getCommonGbDownloadSpeed() {
return commonGbDownloadSpeed;
}
public void setCommonGbDownloadSpeed(String commonGbDownloadSpeed) {
this.commonGbDownloadSpeed = commonGbDownloadSpeed;
}
public Integer getCommonGbSVCTimeSupportMode() {
return commonGbSVCTimeSupportMode;
}
public void setCommonGbSVCTimeSupportMode(Integer commonGbSVCTimeSupportMode) {
this.commonGbSVCTimeSupportMode = commonGbSVCTimeSupportMode;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
}

View File

@ -1,9 +1,10 @@
package com.genersoft.iot.vmp.gb28181.bean;
import com.genersoft.iot.vmp.common.CommonGbChannel;
import io.swagger.v3.oas.annotations.media.Schema;
@Schema(description = "通道信息")
public class DeviceChannel {
public class DeviceChannel extends CommonGbChannel {
/**
@ -246,6 +247,18 @@ public class DeviceChannel {
@Schema(description = "GPS的更新时间")
private String gpsTime;
/**
* , truefalse
*/
@Schema(description = "是否同步国标通用信息")
private boolean syncToCommonGbChannel;
/**
* ID
*/
@Schema(description = "国标通用信息ID")
private int CommonGbChannelId;
public int getId() {
return id;
}
@ -574,4 +587,20 @@ public class DeviceChannel {
public void setGpsTime(String gpsTime) {
this.gpsTime = gpsTime;
}
public boolean isSyncToCommonGbChannel() {
return syncToCommonGbChannel;
}
public void setSyncToCommonGbChannel(boolean syncToCommonGbChannel) {
this.syncToCommonGbChannel = syncToCommonGbChannel;
}
public int getCommonGbChannelId() {
return CommonGbChannelId;
}
public void setCommonGbChannelId(int commonGbChannelId) {
CommonGbChannelId = commonGbChannelId;
}
}

View File

@ -0,0 +1,16 @@
package com.genersoft.iot.vmp.service;
import com.genersoft.iot.vmp.common.CommonGbChannel;
public interface ICommonGbChannelService {
CommonGbChannel getChannel(String channelId);
int add(CommonGbChannel channel);
int delete(String channelId);
int update(CommonGbChannel channel);
boolean checkChannelInPlatform(String channelId, String platformServerId);
}

View File

@ -0,0 +1,33 @@
package com.genersoft.iot.vmp.service.impl;
import com.genersoft.iot.vmp.common.CommonGbChannel;
import com.genersoft.iot.vmp.service.ICommonGbChannelService;
import org.springframework.stereotype.Service;
@Service
public class CommonGbChannelServiceImpl implements ICommonGbChannelService {
@Override
public CommonGbChannel getChannel(String channelId) {
return null;
}
@Override
public int add(CommonGbChannel channel) {
return 0;
}
@Override
public int delete(String channelId) {
return 0;
}
@Override
public int update(CommonGbChannel channel) {
return 0;
}
@Override
public boolean checkChannelInPlatform(String channelId, String platformServerId) {
return false;
}
}