临时提交

This commit is contained in:
648540858
2024-06-27 16:02:43 +08:00
parent 1616a2a731
commit 400eef2d2e
25 changed files with 135 additions and 162 deletions

View File

@@ -24,6 +24,7 @@ import com.genersoft.iot.vmp.service.*;
import com.genersoft.iot.vmp.service.redisMsg.IRedisRpcService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import com.genersoft.iot.vmp.streamPush.service.IStreamPushService;
import com.genersoft.iot.vmp.utils.MediaServerUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

View File

@@ -1,118 +0,0 @@
package com.genersoft.iot.vmp.media.zlm.dto;
import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.gb28181.bean.CommonGBChannel;
import com.genersoft.iot.vmp.media.event.media.MediaArrivalEvent;
import com.genersoft.iot.vmp.utils.DateUtil;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.jetbrains.annotations.NotNull;
import org.springframework.util.ObjectUtils;
@Data
@Schema(description = "推流信息")
@EqualsAndHashCode(callSuper = true)
public class StreamPush extends CommonGBChannel implements Comparable<StreamPush>{
/**
* id
*/
@Schema(description = "id")
private Integer id;
/**
* 应用名
*/
@Schema(description = "应用名")
private String app;
/**
* 流id
*/
@Schema(description = "流id")
private String stream;
/**
* 使用的流媒体ID
*/
@Schema(description = "使用的流媒体ID")
private String mediaServerId;
/**
* 使用的服务ID
*/
@Schema(description = "使用的服务ID")
private String serverId;
/**
* 推流时间
*/
@Schema(description = "推流时间")
private String pushTime;
/**
* 更新时间
*/
@Schema(description = "更新时间")
private String updateTime;
/**
* 创建时间
*/
@Schema(description = "创建时间")
private String createTime;
/**
* 是否正在推流
*/
@Schema(description = "是否正在推流")
private boolean pushIng;
/**
* 是否自己平台的推流
*/
@Schema(description = "是否自己平台的推流")
private boolean self;
@Override
public int compareTo(@NotNull StreamPush streamPushItem) {
return Long.valueOf(DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(this.createTime)
- DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(streamPushItem.getCreateTime())).intValue();
}
public StreamPush getInstance(StreamInfo streamInfo) {
StreamPush streamPushItem = new StreamPush();
streamPushItem.setApp(streamInfo.getApp());
streamPushItem.setMediaServerId(streamInfo.getMediaServerId());
streamPushItem.setStream(streamInfo.getStream());
streamPushItem.setCreateTime(DateUtil.getNow());
streamPushItem.setServerId(streamInfo.getMediaServerId());
return streamPushItem;
}
public static StreamPush getInstance(MediaArrivalEvent event, String serverId){
StreamPush streamPushItem = new StreamPush();
streamPushItem.setApp(event.getApp());
streamPushItem.setMediaServerId(event.getMediaServer().getId());
streamPushItem.setStream(event.getStream());
streamPushItem.setCreateTime(DateUtil.getNow());
streamPushItem.setServerId(serverId);
return streamPushItem;
}
public CommonGBChannel getCommonGBChannel() {
if (ObjectUtils.isEmpty(this.getGbDeviceId())) {
return null;
}
if (ObjectUtils.isEmpty(this.getGbName())) {
this.setGbName( app+ "-" +stream);
}
return this;
}
}