From 1e1364e51a66614469b91e396d33a54bdf8f6e98 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期一, 17 十月 2022 14:33:25 +0800 Subject: [PATCH] 修复开始点播功能接口调用返回参数与定义的不符 #635 --- src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamPushItem.java | 37 ++++++++++++++++++++++++++++++++++++- 1 files changed, 36 insertions(+), 1 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 d583006..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 @@ -2,37 +2,43 @@ 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; /** * 娴乮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; /** @@ -46,67 +52,88 @@ * mp4_vod=6, * device_chn=7 */ + @Schema(description = "浜х敓婧愮被鍨�") private int originType; /** * 瀹㈡埛绔拰鏈嶅姟鍣ㄧ綉缁滀俊鎭紝鍙兘涓簄ull绫诲瀷 */ + @Schema(description = "瀹㈡埛绔拰鏈嶅姟鍣ㄧ綉缁滀俊鎭紝鍙兘涓簄ull绫诲瀷") 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; /** * 浣跨敤鐨勬湇鍔D */ + @Schema(description = "浣跨敤鐨勬湇鍔D") private String serverId; /** * 鎺ㄦ祦鏃堕棿 */ + @Schema(description = "鎺ㄦ祦鏃堕棿") private String pushTime; /** * 鏇存柊鏃堕棿 */ + @Schema(description = "鏇存柊鏃堕棿") private String updateTime; /** * 鍒涘缓鏃堕棿 */ + @Schema(description = "鍒涘缓鏃堕棿") private String createTime; /** * 鏄惁姝e湪鎺ㄦ祦 */ + @Schema(description = "鏄惁姝e湪鎺ㄦ祦") private boolean pushIng; + + /** + * 鏄惁鑷繁骞冲彴鐨勬帹娴� + */ + @Schema(description = "鏄惁鑷繁骞冲彴鐨勬帹娴�") + private boolean self; + + public String getVhost() { return vhost; @@ -290,5 +317,13 @@ public void setPushIng(boolean pushIng) { this.pushIng = pushIng; } + + public boolean isSelf() { + return self; + } + + public void setSelf(boolean self) { + this.self = self; + } } -- Gitblit v1.8.0