From f1d079f9c0b3d384090477ca54e0548373d62b57 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 16 Jan 2025 11:56:39 +0800
Subject: [PATCH] 配置修改
---
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamPushItem.java | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 112 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamPushItem.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamPushItem.java
index 1336807..1a73a20 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamPushItem.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamPushItem.java
@@ -1,36 +1,44 @@
package com.genersoft.iot.vmp.media.zlm.dto;
import com.genersoft.iot.vmp.gb28181.bean.GbStream;
+import com.genersoft.iot.vmp.utils.DateUtil;
+import io.swagger.v3.oas.annotations.media.Schema;
import org.jetbrains.annotations.NotNull;
+import org.springframework.util.unit.DataUnit;
import java.util.List;
-
+@Schema(description = "推流信息")
public class StreamPushItem extends GbStream implements Comparable<StreamPushItem>{
/**
* id
*/
+ @Schema(description = "id")
private Integer id;
/**
* 应用名
*/
+ @Schema(description = "应用名")
private String app;
/**
* 流id
*/
+ @Schema(description = "流id")
private String stream;
/**
* 观看总人数，包括hls/rtsp/rtmp/http-flv/ws-flv
*/
+ @Schema(description = "观看总人数")
private String totalReaderCount;
/**
* 协议 包括hls/rtsp/rtmp/http-flv/ws-flv
*/
+ @Schema(description = "协议 包括hls/rtsp/rtmp/http-flv/ws-flv")
private List<MediaSchema> schemas;
/**
@@ -44,42 +52,88 @@
* mp4_vod=6,
* device_chn=7
*/
+ @Schema(description = "产生源类型")
private int originType;
/**
* 客户端和服务器网络信息，可能为null类型
*/
+ @Schema(description = "客户端和服务器网络信息，可能为null类型")
private MediaItem.OriginSock originSock;
/**
* 产生源类型的字符串描述
*/
+ @Schema(description = "产生源类型的字符串描述")
private String originTypeStr;
/**
* 产生源的url
*/
+ @Schema(description = "产生源的url")
private String originUrl;
/**
* 存活时间，单位秒
*/
+ @Schema(description = "存活时间，单位秒")
private Long aliveSecond;
/**
* 音视频轨道
*/
+ @Schema(description = "音视频轨道")
private List<MediaItem.MediaTrack> tracks;
/**
* 音视频轨道
*/
+ @Schema(description = "音视频轨道")
private String vhost;
/**
* 使用的流媒体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;
+
+
public String getVhost() {
return vhost;
@@ -92,7 +146,8 @@
@Override
public int compareTo(@NotNull StreamPushItem streamPushItem) {
- return Long.valueOf(super.createStamp - streamPushItem.getCreateStamp().intValue()).intValue();
+ return Long.valueOf(DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(super.createTime)
+ - DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(streamPushItem.getCreateTime())).intValue();
}
public static class MediaSchema {
@@ -124,18 +179,22 @@
this.id = id;
}
+ @Override
public String getApp() {
return app;
}
+ @Override
public void setApp(String app) {
this.app = app;
}
+ @Override
public String getStream() {
return stream;
}
+ @Override
public void setStream(String stream) {
this.stream = stream;
}
@@ -215,5 +274,56 @@
public void setMediaServerId(String mediaServerId) {
this.mediaServerId = mediaServerId;
}
+
+ public String getServerId() {
+ return serverId;
+ }
+
+ public void setServerId(String serverId) {
+ this.serverId = serverId;
+ }
+
+
+ public String getPushTime() {
+ return pushTime;
+ }
+
+ public void setPushTime(String pushTime) {
+ this.pushTime = pushTime;
+ }
+
+ public String getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(String updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ @Override
+ public String getCreateTime() {
+ return createTime;
+ }
+
+ @Override
+ public void setCreateTime(String createTime) {
+ this.createTime = createTime;
+ }
+
+ public boolean isPushIng() {
+ return pushIng;
+ }
+
+ public void setPushIng(boolean pushIng) {
+ this.pushIng = pushIng;
+ }
+
+ public boolean isSelf() {
+ return self;
+ }
+
+ public void setSelf(boolean self) {
+ this.self = self;
+ }
}
--
Gitblit v1.9.3