diff --git a/sql/mysql/video.sql b/sql/mysql/video.sql index cf215762..efda5da6 100644 --- a/sql/mysql/video.sql +++ b/sql/mysql/video.sql @@ -72,6 +72,7 @@ CREATE TABLE `video_device` ( `heart_beat_interval` int NULL COMMENT '心跳间隔', `heart_beat_count` int NULL COMMENT '心跳失败次数', `position_capability` int NULL COMMENT '定位能力标识', + `channel_count` int NOT NULL DEFAULT 0 COMMENT '通道数量', `broadcast_push_after_ack` tinyint(1) NOT NULL DEFAULT 0 COMMENT 'ACK后是否自动推流', `server_id` varchar(50) NULL COMMENT '所属信令服务器ID', `creator` varchar(64) NOT NULL DEFAULT '' COMMENT '创建者', @@ -219,7 +220,7 @@ DROP TABLE IF EXISTS `video_device_mobile_position`; CREATE TABLE `video_device_mobile_position` ( `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键ID', `device_id` varchar(50) NOT NULL COMMENT '设备ID', - `channel_id` varchar(50) NOT NULL COMMENT '通道ID', + `channel_id` bigint NULL COMMENT '通道表主键（FK→video_device_channel.id）', `device_name` varchar(255) NULL COMMENT '设备名称', `time` varchar(50) NULL COMMENT '上报时间', `longitude` double NULL COMMENT '经度', @@ -376,6 +377,10 @@ CREATE TABLE `video_platform` ( `ptz` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否支持PTZ', `rtcp` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否开启RTCP', `status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '注册状态', + `channel_count` int NOT NULL DEFAULT 0 COMMENT '已同步通道数量', + `catalog_subscribe` tinyint(1) NOT NULL DEFAULT 0 COMMENT '已被订阅目录信息', + `alarm_subscribe` tinyint(1) NOT NULL DEFAULT 0 COMMENT '已被订阅报警信息', + `mobile_position_subscribe` tinyint(1) NOT NULL DEFAULT 0 COMMENT '已被订阅移动位置信息', `catalog_group` int NULL COMMENT '目录分组方式', `register_way` int NULL COMMENT '注册方式', `secrecy` int NULL COMMENT '保密级别', @@ -527,6 +532,8 @@ CREATE TABLE `video_media_server` ( `record_day` int NOT NULL DEFAULT 7 COMMENT '录像保留天数', `transcode_suffix` varchar(255) NULL COMMENT '转码指令后缀', `server_id` varchar(50) NULL COMMENT '对应信令服务器ID', + `status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '媒体服务器在线状态（0离线,1在线）', + `last_keepalive_time` varchar(50) NULL COMMENT '最近心跳时间', `creator` varchar(64) NOT NULL DEFAULT '' COMMENT '创建者', `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `updater` varchar(64) NOT NULL DEFAULT '' COMMENT '更新者', @@ -621,6 +628,7 @@ CREATE TABLE `video_cloud_record` ( `folder` varchar(500) NULL COMMENT '目录', `file_path` varchar(500) NULL COMMENT '完整路径', `collect` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否收藏', + `reserve` tinyint(1) NULL DEFAULT 0 COMMENT '是否保留（保留的文件不自动清除）', `file_size` bigint NULL COMMENT '文件大小', `time_len` double NULL COMMENT '时长', `creator` varchar(64) NOT NULL DEFAULT '' COMMENT '创建者', diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/bean/AiAlert.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/bean/AiAlert.java index a2c8a3be..63334dc4 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/bean/AiAlert.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/bean/AiAlert.java @@ -1,6 +1,7 @@ package com.viewsh.module.video.aiot.bean; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.viewsh.framework.tenant.core.db.ProjectBaseDO; @@ -24,12 +25,14 @@ public class AiAlert extends ProjectBaseDO { @Schema(description = "摄像头ID") private String cameraId; + @TableField(exist = false) @Schema(description = "摄像头名称（关联查询）") private String cameraName; @Schema(description = "ROI区域ID") private String roiId; + @TableField(exist = false) @Schema(description = "ROI区域名称（关联查询）") private String roiName; diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/bean/AiAlgorithm.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/bean/AiAlgorithm.java index 356bd546..757ac631 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/bean/AiAlgorithm.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/bean/AiAlgorithm.java @@ -36,6 +36,9 @@ public class AiAlgorithm extends TenantBaseDO { @Schema(description = "是否可用") private Integer isActive; + @Schema(description = "全局参数JSON（整个算法的默认参数）") + private String globalParams; + @Schema(description = "最后同步时间") private String syncTime; } diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/bean/CommonGBChannel.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/bean/CommonGBChannel.java index de408e82..8a175a57 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/bean/CommonGBChannel.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/bean/CommonGBChannel.java @@ -10,7 +10,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; @Data -@TableName("video_device_channel") +@TableName("video_common_gb_channel") @EqualsAndHashCode(callSuper = true) @Schema(description = "国标通道") public class CommonGBChannel extends ProjectBaseDO { @@ -140,8 +140,8 @@ public class CommonGBChannel extends ProjectBaseDO { @Schema(description = "国标-时域编码能力,取值0-不支持;1-1级增强;2-2级增强;3-3级增强(可选)") private Integer gbSvcTimeSupportMode; - @Schema(description = "二进制保存的录制计划, 每一位表示每个小时的前半个小时") - private Long recordPLan; + @Schema(description = "绑定的录像计划ID") + private Long recordPlanId; @Schema(description = "关联的数据类型") private Integer dataType; @@ -440,7 +440,7 @@ public class CommonGBChannel extends ProjectBaseDO { ", gbDownloadSpeed='" + gbDownloadSpeed + '\'' + ", gbSvcSpaceSupportMod=" + gbSvcSpaceSupportMod + ", gbSvcTimeSupportMode=" + gbSvcTimeSupportMode + - ", recordPLan=" + recordPLan + + ", recordPlanId=" + recordPlanId + ", dataType=" + dataType + ", dataDeviceId=" + dataDeviceId + ", streamId='" + streamId + '\'' + diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/bean/Device.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/bean/Device.java index b62365be..efeb6607 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/bean/Device.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/bean/Device.java @@ -1,6 +1,7 @@ package com.viewsh.module.video.gb28181.bean; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.viewsh.framework.tenant.core.db.ProjectBaseDO; @@ -199,6 +200,7 @@ public class Device extends ProjectBaseDO { @Schema(description = "是否作为消息通道") private boolean asMessageChannel; + @TableField(exist = false) @Schema(description = "设备注册的事务信息") private SipTransactionInfo sipTransactionInfo; diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/bean/DeviceAlarm.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/bean/DeviceAlarm.java index 0ac86183..3df5c6df 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/bean/DeviceAlarm.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/bean/DeviceAlarm.java @@ -1,6 +1,7 @@ package com.viewsh.module.video.gb28181.bean; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.viewsh.framework.tenant.core.db.ProjectBaseDO; @@ -27,6 +28,7 @@ public class DeviceAlarm extends ProjectBaseDO { @Schema(description = "设备的国标编号") private String deviceId; + @TableField(exist = false) @Schema(description = "设备名称") private String deviceName; @@ -42,6 +44,7 @@ public class DeviceAlarm extends ProjectBaseDO { @Schema(description = "报警级别, 1为一级警情, 2为二级警情, 3为三级警情, 4为四级警情") private String alarmPriority; + @TableField(exist = false) @Schema(description = "报警级别, 1为一级警情, 2为二级警情, 3为三级警情, 4为四级警情") private String alarmPriorityDescription; @@ -69,6 +72,7 @@ public class DeviceAlarm extends ProjectBaseDO { private String alarmMethod; + @TableField(exist = false) private String alarmMethodDescription; public String getAlarmMethodDescription() { @@ -268,6 +272,7 @@ public class DeviceAlarm extends ProjectBaseDO { return result; } + @TableField(exist = false) @Schema(description = "报警类型描述") private String alarmTypeDescription; diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/bean/DeviceChannel.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/bean/DeviceChannel.java index fea93e60..b0f64fb3 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/bean/DeviceChannel.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/bean/DeviceChannel.java @@ -1,5 +1,7 @@ package com.viewsh.module.video.gb28181.bean; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import com.viewsh.module.video.common.enums.ChannelDataType; import com.viewsh.module.video.gb28181.utils.MessageElementForCatalog; import com.viewsh.module.video.gb28181.utils.XmlUtil; @@ -14,6 +16,7 @@ import java.lang.reflect.InvocationTargetException; @Data @Slf4j +@TableName("video_device_channel") @Schema(description = "通道信息") @EqualsAndHashCode(callSuper = true) public class DeviceChannel extends CommonGBChannel { @@ -21,9 +24,11 @@ public class DeviceChannel extends CommonGBChannel { @Schema(description = "数据库自增ID") private Long id; + @TableField(exist = false) @Schema(description = "父设备编码") private String parentDeviceId; + @TableField(exist = false) @Schema(description = "父设备名称") private String parentName; @@ -172,6 +177,7 @@ public class DeviceChannel extends CommonGBChannel { @Schema(description = "时域编码能力,取值0-不支持;1-1级增强;2-2级增强;3-3级增强(可选)") private Integer svcTimeSupportMode; + @TableField(exist = false) @Schema(description = "云台类型描述字符串") private String ptzTypeText; diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/bean/MobilePosition.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/bean/MobilePosition.java index 95df6d6a..a9cc52b3 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/bean/MobilePosition.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/bean/MobilePosition.java @@ -1,6 +1,7 @@ package com.viewsh.module.video.gb28181.bean; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.viewsh.framework.tenant.core.db.ProjectBaseDO; @@ -27,13 +28,14 @@ public class MobilePosition extends ProjectBaseDO { private String deviceId; /** - * 通道Id + * 通道Id（外键，对应 video_device_channel.id） */ private Long channelId; /** - * 通道国标编号 + * 通道国标编号（JOIN查询填充，不落库） */ + @TableField(exist = false) private String channelDeviceId; /** diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/bean/PlatformChannel.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/bean/PlatformChannel.java index 912c3b67..33205103 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/bean/PlatformChannel.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/bean/PlatformChannel.java @@ -1,9 +1,11 @@ package com.viewsh.module.video.gb28181.bean; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; +@TableName("video_platform_channel") @EqualsAndHashCode(callSuper = true) @Data public class PlatformChannel extends CommonGBChannel { diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/media/abl/ABLMediaNodeServerService.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/media/abl/ABLMediaNodeServerService.java index 01b4d6d7..875d52e7 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/media/abl/ABLMediaNodeServerService.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/media/abl/ABLMediaNodeServerService.java @@ -240,9 +240,9 @@ public class ABLMediaNodeServerService implements IMediaNodeServerService { streamInfoResult.setFmp4(addr, mediaServer.getMp4Port(), null, mp4File); } - streamInfoResult.setHls(addr, mediaServer.getHttpPort(), mediaServer.getHttpSSlPort(), app, stream, callIdParam); - streamInfoResult.setTs(addr, mediaServer.getHttpPort(), mediaServer.getHttpSSlPort(), app, stream, callIdParam); - streamInfoResult.setRtc(addr, mediaServer.getHttpPort(), mediaServer.getHttpSSlPort(), app, stream, callIdParam, isPlay); + streamInfoResult.setHls(addr, mediaServer.getHttpPort(), mediaServer.getHttpSslPort(), app, stream, callIdParam); + streamInfoResult.setTs(addr, mediaServer.getHttpPort(), mediaServer.getHttpSslPort(), app, stream, callIdParam); + streamInfoResult.setRtc(addr, mediaServer.getHttpPort(), mediaServer.getHttpSslPort(), app, stream, callIdParam, isPlay); streamInfoResult.setMediaInfo(mediaInfo); diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/media/bean/MediaServer.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/media/bean/MediaServer.java index 91e7bc08..42da81d4 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/media/bean/MediaServer.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/media/bean/MediaServer.java @@ -35,7 +35,7 @@ public class MediaServer extends BaseDO { private int httpPort; @Schema(description = "HTTPS端口") - private int httpSSlPort; + private int httpSslPort; @Schema(description = "RTMP端口") private int rtmpPort; @@ -44,7 +44,7 @@ public class MediaServer extends BaseDO { private int flvPort; @Schema(description = "https-flv端口") - private int flvSSLPort; + private int flvSslPort; @Schema(description = "mp4端口") private int mp4Port; @@ -53,7 +53,7 @@ public class MediaServer extends BaseDO { private int wsFlvPort; @Schema(description = "wss-flv端口") - private int wsFlvSSLPort; + private int wsFlvSslPort; @Schema(description = "RTMPS端口") private int rtmpSSlPort; @@ -124,7 +124,7 @@ public class MediaServer extends BaseDO { sdpIp = ObjectUtils.isEmpty(zlmServerConfig.getSdpIp())? zlmServerConfig.getIp(): zlmServerConfig.getSdpIp(); streamIp = ObjectUtils.isEmpty(zlmServerConfig.getStreamIp())? zlmServerConfig.getIp(): zlmServerConfig.getStreamIp(); httpPort = zlmServerConfig.getHttpPort(); - httpSSlPort = zlmServerConfig.getHttpSSLport(); + httpSslPort = zlmServerConfig.getHttpSSLport(); rtmpPort = zlmServerConfig.getRtmpPort(); rtmpSSlPort = zlmServerConfig.getRtmpSslPort(); rtpProxyPort = zlmServerConfig.getRtpProxyPort(); diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/media/zlm/ZLMMediaNodeServerService.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/media/zlm/ZLMMediaNodeServerService.java index 36f7bd45..81a0f831 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/media/zlm/ZLMMediaNodeServerService.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/media/zlm/ZLMMediaNodeServerService.java @@ -121,7 +121,7 @@ public class ZLMMediaNodeServerService implements IMediaNodeServerService { throw new ControllerException(ErrorCode.ERROR100.getCode(), "读取配置失败"); } mediaServer.setId(zlmServerConfig.getGeneralMediaServerId()); - mediaServer.setHttpSSlPort(zlmServerConfig.getHttpSSLport()); + mediaServer.setHttpSslPort(zlmServerConfig.getHttpSSLport()); mediaServer.setRtmpPort(zlmServerConfig.getRtmpPort()); mediaServer.setRtmpSSlPort(zlmServerConfig.getRtmpSslPort()); mediaServer.setRtspPort(zlmServerConfig.getRtspPort()); @@ -604,11 +604,11 @@ public class ZLMMediaNodeServerService implements IMediaNodeServerService { recordInfo.getFilePath())); // 同样作为第4个参数 - if (mediaServerItem.getHttpSSlPort() > 0) { + if (mediaServerItem.getHttpSslPort() > 0) { info.setHttpsPath(String.format(pathTemplate, "https", mediaServerItem.getStreamIp(), - mediaServerItem.getHttpSSlPort(), + mediaServerItem.getHttpSslPort(), recordInfo.getFilePath())); } return info; @@ -662,20 +662,20 @@ public class ZLMMediaNodeServerService implements IMediaNodeServerService { streamInfoResult.setRtsp(addr, mediaServer.getRtspPort(),mediaServer.getRtspSSLPort(), app, stream, callIdParam); String flvFile = String.format("%s/%s.live.flv%s", app, stream, callIdParam); - streamInfoResult.setFlv(addr, mediaServer.getHttpPort(),mediaServer.getHttpSSlPort(), flvFile); - streamInfoResult.setWsFlv(addr, mediaServer.getHttpPort(),mediaServer.getHttpSSlPort(), flvFile); + streamInfoResult.setFlv(addr, mediaServer.getHttpPort(),mediaServer.getHttpSslPort(), flvFile); + streamInfoResult.setWsFlv(addr, mediaServer.getHttpPort(),mediaServer.getHttpSslPort(), flvFile); String mp4File = String.format("%s/%s.live.mp4%s", app, stream, callIdParam); - streamInfoResult.setFmp4(addr, mediaServer.getHttpPort(),mediaServer.getHttpSSlPort(), mp4File); - streamInfoResult.setWsMp4(addr, mediaServer.getHttpPort(),mediaServer.getHttpSSlPort(), mp4File); + streamInfoResult.setFmp4(addr, mediaServer.getHttpPort(),mediaServer.getHttpSslPort(), mp4File); + streamInfoResult.setWsMp4(addr, mediaServer.getHttpPort(),mediaServer.getHttpSslPort(), mp4File); - streamInfoResult.setHls(addr, mediaServer.getHttpPort(), mediaServer.getHttpSSlPort(), app, stream, callIdParam); - streamInfoResult.setWsHls(addr, mediaServer.getHttpPort(), mediaServer.getHttpSSlPort(), app, stream, callIdParam); + streamInfoResult.setHls(addr, mediaServer.getHttpPort(), mediaServer.getHttpSslPort(), app, stream, callIdParam); + streamInfoResult.setWsHls(addr, mediaServer.getHttpPort(), mediaServer.getHttpSslPort(), app, stream, callIdParam); - streamInfoResult.setTs(addr, mediaServer.getHttpPort(), mediaServer.getHttpSSlPort(), app, stream, callIdParam); - streamInfoResult.setWsTs(addr, mediaServer.getHttpPort(), mediaServer.getHttpSSlPort(), app, stream, callIdParam); + streamInfoResult.setTs(addr, mediaServer.getHttpPort(), mediaServer.getHttpSslPort(), app, stream, callIdParam); + streamInfoResult.setWsTs(addr, mediaServer.getHttpPort(), mediaServer.getHttpSslPort(), app, stream, callIdParam); - streamInfoResult.setRtc(addr, mediaServer.getHttpPort(), mediaServer.getHttpSSlPort(), app, stream, callIdParam, isPlay); + streamInfoResult.setRtc(addr, mediaServer.getHttpPort(), mediaServer.getHttpSslPort(), app, stream, callIdParam, isPlay); streamInfoResult.setMediaInfo(mediaInfo); diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/media/zlm/ZLMMediaServerStatusManager.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/media/zlm/ZLMMediaServerStatusManager.java index 2ebb3a60..80011f0a 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/media/zlm/ZLMMediaServerStatusManager.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/media/zlm/ZLMMediaServerStatusManager.java @@ -219,14 +219,14 @@ public class ZLMMediaServerStatusManager { } private void initPort(MediaServer mediaServerItem, ZLMServerConfig zlmServerConfig) { // 端口只会从配置中读取一次，一旦自己配置或者读取过了将不在配置 - mediaServerItem.setHttpSSlPort(zlmServerConfig.getHttpSSLport()); + mediaServerItem.setHttpSslPort(zlmServerConfig.getHttpSSLport()); mediaServerItem.setRtmpPort(zlmServerConfig.getRtmpPort()); mediaServerItem.setRtmpSSlPort(zlmServerConfig.getRtmpSslPort()); mediaServerItem.setRtspPort(zlmServerConfig.getRtspPort()); mediaServerItem.setRtspSSLPort(zlmServerConfig.getRtspSSlport()); mediaServerItem.setRtpProxyPort(zlmServerConfig.getRtpProxyPort()); - mediaServerItem.setFlvSSLPort(zlmServerConfig.getHttpSSLport()); - mediaServerItem.setWsFlvSSLPort(zlmServerConfig.getHttpSSLport()); + mediaServerItem.setFlvSslPort(zlmServerConfig.getHttpSSLport()); + mediaServerItem.setWsFlvSslPort(zlmServerConfig.getHttpSSLport()); if (Objects.isNull(zlmServerConfig.getTranscodeSuffix())) { mediaServerItem.setTranscodeSuffix(null); }else { diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/storager/dao/MediaServerMapper.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/storager/dao/MediaServerMapper.java index ae67e2b4..ec8ad9ec 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/storager/dao/MediaServerMapper.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/storager/dao/MediaServerMapper.java @@ -56,7 +56,7 @@ public interface MediaServerMapper extends BaseMapperX { "#{sdpIp}, " + "#{streamIp}, " + "#{httpPort}, " + - "#{httpSSlPort}, " + + "#{httpSslPort}, " + "#{rtmpPort}, " + "#{rtmpSSlPort}, " + "#{rtpProxyPort}, " + @@ -64,9 +64,9 @@ public interface MediaServerMapper extends BaseMapperX { "#{rtspPort}, " + "#{flvPort}, " + "#{mp4Port}, " + - "#{flvSSLPort}, " + + "#{flvSslPort}, " + "#{wsFlvPort}, " + - "#{wsFlvSSLPort}, " + + "#{wsFlvSslPort}, " + "#{rtspSSLPort}, " + "#{autoConfig}, " + "#{secret}, " + @@ -89,10 +89,10 @@ public interface MediaServerMapper extends BaseMapperX { "UPDATE video_media_server " + "SET update_time=#{updateTime}, transcode_suffix=#{transcodeSuffix} " + ", ip=#{ip}, hook_ip=#{hookIp}, sdp_ip=#{sdpIp}, stream_ip=#{streamIp}, http_port=#{httpPort}" + - ", http_ssl_port=#{httpSSlPort}, rtmp_port=#{rtmpPort}, rtmp_ssl_port=#{rtmpSSlPort}" + + ", http_ssl_port=#{httpSslPort}, rtmp_port=#{rtmpPort}, rtmp_ssl_port=#{rtmpSSlPort}" + ", rtp_proxy_port=#{rtpProxyPort}, jtt_proxy_port=#{jttProxyPort}, rtsp_port=#{rtspPort}" + ", rtsp_ssl_port=#{rtspSSLPort}, flv_port=#{flvPort}, mp4_port=#{mp4Port}" + - ", flv_ssl_port=#{flvSSLPort}, ws_flv_port=#{wsFlvPort}, ws_flv_ssl_port=#{wsFlvSSLPort}" + + ", flv_ssl_port=#{flvSslPort}, ws_flv_port=#{wsFlvPort}, ws_flv_ssl_port=#{wsFlvSslPort}" + ", auto_config=#{autoConfig}, rtp_enable=#{rtpEnable}, rtp_port_range=#{rtpPortRange}" + ", send_rtp_port_range=#{sendRtpPortRange}, secret=#{secret}, record_assist_port=#{recordAssistPort}" + ", hook_alive_interval=#{hookAliveInterval}, record_day=#{recordDay}, record_path=#{recordPath}" + @@ -108,7 +108,7 @@ public interface MediaServerMapper extends BaseMapperX { ", hook_ip=#{hookIp}" + ", sdp_ip=#{sdpIp}" + ", stream_ip=#{streamIp}" + - ", http_ssl_port=#{httpSSlPort}" + + ", http_ssl_port=#{httpSslPort}" + ", rtmp_port=#{rtmpPort}" + ", rtmp_ssl_port=#{rtmpSSlPort}" + ", rtp_proxy_port=#{rtpProxyPort}" + @@ -117,9 +117,9 @@ public interface MediaServerMapper extends BaseMapperX { ", rtsp_ssl_port=#{rtspSSLPort}" + ", flv_port=#{flvPort}" + ", mp4_port=#{mp4Port}" + - ", flv_ssl_port=#{flvSSLPort}" + + ", flv_ssl_port=#{flvSslPort}" + ", ws_flv_port=#{wsFlvPort}" + - ", ws_flv_ssl_port=#{wsFlvSSLPort}" + + ", ws_flv_ssl_port=#{wsFlvSslPort}" + ", auto_config=#{autoConfig}" + ", rtp_enable=#{rtpEnable}" + ", rtp_port_range=#{rtpPortRange}" + diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/streamPush/bean/StreamPush.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/streamPush/bean/StreamPush.java index 737d90e8..ff50f4d1 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/streamPush/bean/StreamPush.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/streamPush/bean/StreamPush.java @@ -1,6 +1,7 @@ package com.viewsh.module.video.streamPush.bean; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.viewsh.module.video.common.StreamInfo; @@ -95,10 +96,17 @@ public class StreamPush extends CommonGBChannel implements Comparable cloudRecordItemPageInfo = cloudRecordService.getList(page, count, query, app, stream, startTime, endTime, mediaServers, callId, null); List cloudRecordUrlList = new ArrayList<>();