From 8874c90db2c238fa4c55df491675fe7fec9d93b2 Mon Sep 17 00:00:00 2001
From: fine <54142345+criver31@users.noreply.github.com>
Date: 星期二, 09 一月 2024 11:45:30 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamPushItem.java | 169 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 161 insertions(+), 8 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
old mode 100644
new mode 100755
index ceb48b3..6befe46
--- 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.media.zlm.dto.hook.OnStreamChangedHookParam;
+import com.genersoft.iot.vmp.utils.DateUtil;
+import io.swagger.v3.oas.annotations.media.Schema;
import org.jetbrains.annotations.NotNull;
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;
/**
* 娴乮d
*/
+ @Schema(description = "娴乮d")
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,47 +52,88 @@
* mp4_vod=6,
* device_chn=7
*/
+ @Schema(description = "浜х敓婧愮被鍨�")
private int originType;
/**
* 瀹㈡埛绔拰鏈嶅姟鍣ㄧ綉缁滀俊鎭紝鍙兘涓簄ull绫诲瀷
*/
- private MediaItem.OriginSock originSock;
+ @Schema(description = "瀹㈡埛绔拰鏈嶅姟鍣ㄧ綉缁滀俊鎭紝鍙兘涓簄ull绫诲瀷")
+ private OnStreamChangedHookParam.OriginSock originSock;
/**
* 浜х敓婧愮被鍨嬬殑瀛楃涓叉弿杩�
*/
+ @Schema(description = "浜х敓婧愮被鍨嬬殑瀛楃涓叉弿杩�")
private String originTypeStr;
/**
* 浜х敓婧愮殑url
*/
+ @Schema(description = "浜х敓婧愮殑url")
private String originUrl;
/**
* 瀛樻椿鏃堕棿锛屽崟浣嶇
*/
+ @Schema(description = "瀛樻椿鏃堕棿锛屽崟浣嶇")
private Long aliveSecond;
/**
* 闊宠棰戣建閬�
*/
- private List<MediaItem.MediaTrack> tracks;
+ @Schema(description = "闊宠棰戣建閬�")
+ private List<OnStreamChangedHookParam.MediaTrack> tracks;
/**
* 闊宠棰戣建閬�
*/
+ @Schema(description = "闊宠棰戣建閬�")
private String vhost;
/**
* 浣跨敤鐨勬祦濯掍綋ID
*/
+ @Schema(description = "浣跨敤鐨勬祦濯掍綋ID")
private String mediaServerId;
/**
* 浣跨敤鐨勬湇鍔D
*/
+ @Schema(description = "浣跨敤鐨勬湇鍔D")
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;
@@ -97,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 {
@@ -173,11 +223,11 @@
this.originType = originType;
}
- public MediaItem.OriginSock getOriginSock() {
+ public OnStreamChangedHookParam.OriginSock getOriginSock() {
return originSock;
}
- public void setOriginSock(MediaItem.OriginSock originSock) {
+ public void setOriginSock(OnStreamChangedHookParam.OriginSock originSock) {
this.originSock = originSock;
}
@@ -206,11 +256,11 @@
this.aliveSecond = aliveSecond;
}
- public List<MediaItem.MediaTrack> getTracks() {
+ public List<OnStreamChangedHookParam.MediaTrack> getTracks() {
return tracks;
}
- public void setTracks(List<MediaItem.MediaTrack> tracks) {
+ public void setTracks(List<OnStreamChangedHookParam.MediaTrack> tracks) {
this.tracks = tracks;
}
@@ -232,5 +282,108 @@
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;
+ }
+
+// @Override
+// public Integer getGbStreamId() {
+// return super.getGbStreamId();
+// }
+//
+// @Override
+// public void setGbStreamId(Integer gbStreamId) {
+// super.setGbStreamId(gbStreamId);
+// }
+//
+//
+// public String getGbId() {
+// return super.getGbId();
+// }
+//
+// public void setGbId(String gbId) {
+// super.setGbId(gbId);
+// }
+//
+// public String getName() {
+// return super.getName();
+// }
+//
+// public void setName(String name) {
+// super.setName(name);
+// }
+//
+// public double getLongitude() {
+// return super.getLongitude();
+// }
+//
+// public void setLongitude(double longitude) {
+// super.setLongitude(longitude);
+// }
+//
+// public double getLatitude() {
+// return super.getLatitude();
+// }
+//
+// public void setLatitude(double latitude) {
+// super.setLatitude(latitude);
+// }
+//
+// public String getStreamType() {
+// return super.getStreamType();
+// }
+//
+// public void setStreamType(String streamType) {
+// super.setStreamType(streamType);
+// }
+//
+// public boolean isStatus() {
+// return super.isStatus();
+// }
+//
+// public void setStatus(boolean status) {
+// super.setStatus(status);
+// }
+
}
--
Gitblit v1.8.0