diff --git a/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java b/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java index 280c11ba..1a7995ab 100644 --- a/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java +++ b/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java @@ -275,7 +275,7 @@ public class StreamInfo implements Serializable, Cloneable{ } } - public void channgeStreamIp(String localAddr) { + public void changeStreamIp(String localAddr) { if (this.flv != null) { this.flv.setHost(localAddr); } diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/controller/CommonChannelController.java b/src/main/java/com/genersoft/iot/vmp/gb28181/controller/CommonChannelController.java index 3590fc2a..5d058a6f 100755 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/controller/CommonChannelController.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/controller/CommonChannelController.java @@ -246,7 +246,7 @@ public class CommonChannelController { } catch (MalformedURLException e) { host=request.getLocalAddr(); } - streamInfo.channgeStreamIp(host); + streamInfo.changeStreamIp(host); } if (!ObjectUtils.isEmpty(streamInfo.getMediaServer().getTranscodeSuffix()) && !"null".equalsIgnoreCase(streamInfo.getMediaServer().getTranscodeSuffix())) { diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/controller/GBRecordController.java b/src/main/java/com/genersoft/iot/vmp/gb28181/controller/GBRecordController.java index c56389b2..4b9129af 100755 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/controller/GBRecordController.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/controller/GBRecordController.java @@ -147,7 +147,7 @@ public class GBRecordController { if (data != null) { StreamInfo streamInfo = (StreamInfo)data; if (userSetting.getUseSourceIpAsStreamIp()) { - streamInfo.channgeStreamIp(request.getLocalAddr()); + streamInfo.changeStreamIp(request.getLocalAddr()); } wvpResult.setData(new StreamContent(streamInfo)); } diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/controller/PlayController.java b/src/main/java/com/genersoft/iot/vmp/gb28181/controller/PlayController.java index 6d5352fe..4eb68215 100755 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/controller/PlayController.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/controller/PlayController.java @@ -123,7 +123,7 @@ public class PlayController { } catch (MalformedURLException e) { host=request.getLocalAddr(); } - streamInfo.channgeStreamIp(host); + streamInfo.changeStreamIp(host); } if (!ObjectUtils.isEmpty(streamInfo.getMediaServer().getTranscodeSuffix()) && !"null".equalsIgnoreCase(streamInfo.getMediaServer().getTranscodeSuffix())) { streamInfo.setStream(streamInfo.getStream() + "_" + streamInfo.getMediaServer().getTranscodeSuffix()); diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/controller/PlaybackController.java b/src/main/java/com/genersoft/iot/vmp/gb28181/controller/PlaybackController.java index 87108508..11b22159 100755 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/controller/PlaybackController.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/controller/PlaybackController.java @@ -122,7 +122,7 @@ public class PlaybackController { } catch (MalformedURLException e) { host=request.getLocalAddr(); } - streamInfo.channgeStreamIp(host); + streamInfo.changeStreamIp(host); } wvpResult.setData(new StreamContent(streamInfo)); } diff --git a/src/main/java/com/genersoft/iot/vmp/media/bean/MediaInfo.java b/src/main/java/com/genersoft/iot/vmp/media/bean/MediaInfo.java index 63064f86..624d6b6b 100644 --- a/src/main/java/com/genersoft/iot/vmp/media/bean/MediaInfo.java +++ b/src/main/java/com/genersoft/iot/vmp/media/bean/MediaInfo.java @@ -6,12 +6,11 @@ import com.genersoft.iot.vmp.media.zlm.dto.hook.OnStreamChangedHookParam; import com.genersoft.iot.vmp.utils.MediaServerUtils; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import org.springframework.util.ObjectUtils; import java.util.List; import java.util.Map; -import org.springframework.util.ObjectUtils; - /** * 视频信息 */ @@ -49,8 +48,10 @@ public class MediaInfo { private Long duration; @Schema(description = "在线") private Boolean online; - @Schema(description = "unknown = 0,rtmp_push=1,rtsp_push=2,rtp_push=3,pull=4,ffmpeg_pull=5,mp4_vod=6,device_chn=7") + @Schema(description = "unknown = 0,rtmp_push=1,rtsp_push=2,rtp_push=3,pull=4,ffmpeg_pull=5,mp4_vod=6,device_chn=7,rtc_push=8") private Integer originType; + @Schema(description = "originType的文本描述") + private String originTypeStr; @Schema(description = "产生流的源流地址") private String originUrl; @Schema(description = "存活时间，单位秒") @@ -79,6 +80,7 @@ public class MediaInfo { Boolean online = jsonObject.getBoolean("online"); Integer originType = jsonObject.getInteger("originType"); String originUrl = jsonObject.getString("originUrl"); + String originTypeStr = jsonObject.getString("originUrl"); Long aliveSecond = jsonObject.getLong("aliveSecond"); String params = jsonObject.getString("params"); Long bytesSpeed = jsonObject.getLong("bytesSpeed"); @@ -93,8 +95,8 @@ public class MediaInfo { if (originType != null) { mediaInfo.setOriginType(originType); } - if (originUrl != null) { - mediaInfo.setOriginUrl(originUrl); + if (originTypeStr != null) { + mediaInfo.setOriginTypeStr(originTypeStr); } if (aliveSecond != null) { @@ -182,6 +184,7 @@ public class MediaInfo { mediaInfo.setReaderCount(param.getTotalReaderCount()); mediaInfo.setOnline(param.isRegist()); mediaInfo.setOriginType(param.getOriginType()); + mediaInfo.setOriginTypeStr(param.getOriginTypeStr()); mediaInfo.setOriginUrl(param.getOriginUrl()); mediaInfo.setAliveSecond(param.getAliveSecond()); mediaInfo.setBytesSpeed(param.getBytesSpeed());