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/StreamProxyItem.java | 127 +++++++++++++++++++++++++++---------------
1 files changed, 81 insertions(+), 46 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamProxyItem.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamProxyItem.java
old mode 100644
new mode 100755
index 40ba215..0486d00
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamProxyItem.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamProxyItem.java
@@ -1,24 +1,48 @@
package com.genersoft.iot.vmp.media.zlm.dto;
import com.genersoft.iot.vmp.gb28181.bean.GbStream;
+import io.swagger.v3.oas.annotations.media.Schema;
+/**
+ * @author lin
+ */
+@Schema(description = "鎷夋祦浠ｇ悊鐨勪俊鎭�")
public class StreamProxyItem extends GbStream {
+ @Schema(description = "绫诲瀷")
private String type;
+ @Schema(description = "搴旂敤鍚�")
private String app;
+ @Schema(description = "娴両D")
private String stream;
+ @Schema(description = "娴佸獟浣撴湇鍔D")
private String mediaServerId;
+ @Schema(description = "鎷夋祦鍦板潃")
private String url;
- private String src_url;
- private String dst_url;
- private int timeout_ms;
- private String ffmpeg_cmd_key;
- private String rtp_type;
+ @Schema(description = "鎷夋祦鍦板潃")
+ private String srcUrl;
+ @Schema(description = "鐩爣鍦板潃")
+ private String dstUrl;
+ @Schema(description = "瓒呮椂鏃堕棿")
+ private int timeoutMs;
+ @Schema(description = "ffmpeg妯℃澘KEY")
+ private String ffmpegCmdKey;
+ @Schema(description = "rtsp鎷夋祦鏃讹紝鎷夋祦鏂瑰紡锛�0锛歵cp锛�1锛歶dp锛�2锛氱粍鎾�")
+ private String rtpType;
+ @Schema(description = "鏄惁鍚敤")
private boolean enable;
- private boolean enable_hls;
- private boolean enable_mp4;
- private String platformGbId;
- private String createTime;
+ @Schema(description = "鏄惁鍚敤闊抽")
+ private boolean enableAudio;
+ @Schema(description = "鏄惁鍚敤MP4")
+ private boolean enableMp4;
+ @Schema(description = "鏄惁 鏃犱汉瑙傜湅鏃跺垹闄�")
+ private boolean enableRemoveNoneReader;
+
+ @Schema(description = "鏄惁 鏃犱汉瑙傜湅鏃惰嚜鍔ㄥ仠鐢�")
+ private boolean enableDisableNoneReader;
+
+ @Schema(description = "鎷夋祦浠ｇ悊鏃秡lm杩斿洖鐨刱ey锛岀敤浜庡仠姝㈡媺娴佷唬鐞�")
+ private String streamKey;
public String getType() {
return type;
@@ -28,18 +52,22 @@
this.type = type;
}
+ @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;
}
@@ -62,44 +90,44 @@
this.url = url;
}
- public String getSrc_url() {
- return src_url;
+ public String getSrcUrl() {
+ return srcUrl;
}
- public void setSrc_url(String src_url) {
- this.src_url = src_url;
+ public void setSrcUrl(String src_url) {
+ this.srcUrl = src_url;
}
- public String getDst_url() {
- return dst_url;
+ public String getDstUrl() {
+ return dstUrl;
}
- public void setDst_url(String dst_url) {
- this.dst_url = dst_url;
+ public void setDstUrl(String dst_url) {
+ this.dstUrl = dst_url;
}
- public int getTimeout_ms() {
- return timeout_ms;
+ public int getTimeoutMs() {
+ return timeoutMs;
}
- public void setTimeout_ms(int timeout_ms) {
- this.timeout_ms = timeout_ms;
+ public void setTimeoutMs(int timeout_ms) {
+ this.timeoutMs = timeout_ms;
}
- public String getFfmpeg_cmd_key() {
- return ffmpeg_cmd_key;
+ public String getFfmpegCmdKey() {
+ return ffmpegCmdKey;
}
- public void setFfmpeg_cmd_key(String ffmpeg_cmd_key) {
- this.ffmpeg_cmd_key = ffmpeg_cmd_key;
+ public void setFfmpegCmdKey(String ffmpeg_cmd_key) {
+ this.ffmpegCmdKey = ffmpeg_cmd_key;
}
- public String getRtp_type() {
- return rtp_type;
+ public String getRtpType() {
+ return rtpType;
}
- public void setRtp_type(String rtp_type) {
- this.rtp_type = rtp_type;
+ public void setRtpType(String rtp_type) {
+ this.rtpType = rtp_type;
}
public boolean isEnable() {
@@ -110,36 +138,43 @@
this.enable = enable;
}
- public boolean isEnable_hls() {
- return enable_hls;
+ public boolean isEnableMp4() {
+ return enableMp4;
}
- public void setEnable_hls(boolean enable_hls) {
- this.enable_hls = enable_hls;
+ public void setEnableMp4(boolean enable_mp4) {
+ this.enableMp4 = enable_mp4;
}
- public boolean isEnable_mp4() {
- return enable_mp4;
+ public boolean isEnableRemoveNoneReader() {
+ return enableRemoveNoneReader;
}
- public void setEnable_mp4(boolean enable_mp4) {
- this.enable_mp4 = enable_mp4;
+ public void setEnableRemoveNoneReader(boolean enable_remove_none_reader) {
+ this.enableRemoveNoneReader = enable_remove_none_reader;
}
-
- public String getPlatformGbId() {
- return platformGbId;
+ public boolean isEnableDisableNoneReader() {
+ return enableDisableNoneReader;
}
- public void setPlatformGbId(String platformGbId) {
- this.platformGbId = platformGbId;
+ public void setEnableDisableNoneReader(boolean enable_disable_none_reader) {
+ this.enableDisableNoneReader = enable_disable_none_reader;
}
- public String getCreateTime() {
- return createTime;
+ public boolean isEnableAudio() {
+ return enableAudio;
}
- public void setCreateTime(String createTime) {
- this.createTime = createTime;
+ public void setEnableAudio(boolean enable_audio) {
+ this.enableAudio = enable_audio;
+ }
+
+ public String getStreamKey() {
+ return streamKey;
+ }
+
+ public void setStreamKey(String streamKey) {
+ this.streamKey = streamKey;
}
}
--
Gitblit v1.8.0