From 63a35ffaaf248f1c6eb7d660e9d3dba5d664eed7 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期五, 22 三月 2024 17:44:42 +0800 Subject: [PATCH] 调整节点管理代码结构 --- src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamPushItem.java | 82 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 82 insertions(+), 0 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 ddcfbdd..85d481a --- 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,5 +1,6 @@ package com.genersoft.iot.vmp.media.zlm.dto; +import com.genersoft.iot.vmp.common.StreamInfo; 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; @@ -148,6 +149,27 @@ public int compareTo(@NotNull StreamPushItem streamPushItem) { return Long.valueOf(DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(super.createTime) - DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(streamPushItem.getCreateTime())).intValue(); + } + + public StreamPushItem instance(StreamInfo streamInfo) { + StreamPushItem streamPushItem = new StreamPushItem(); + streamPushItem.setApp(streamInfo.getApp()); + streamPushItem.setMediaServerId(streamInfo.getMediaServerId()); + streamPushItem.setStream(streamInfo.getStream()); + streamPushItem.setAliveSecond(streamInfo.getMediaInfo().getAliveSecond()); +// streamPushItem.setOriginSock(streamInfo.getMediaInfo().getOriginSock()); + streamPushItem.setTotalReaderCount(streamInfo.getMediaInfo().getReaderCount() + ""); + streamPushItem.setOriginType(streamInfo.getOriginType()); +// streamPushItem.setOriginTypeStr(streamInfo.getMediaInfo().getOriginTypeStr()); +// streamPushItem.setOriginUrl(streamInfo.getMediaInfo().getOriginUrl()); + streamPushItem.setCreateTime(DateUtil.getNow()); + streamPushItem.setAliveSecond(streamInfo.getMediaInfo().getAliveSecond()); + streamPushItem.setStatus(true); + streamPushItem.setStreamType("push"); +// streamPushItem.setVhost(streamInfo.getVhost()); + streamPushItem.setServerId(streamInfo.getMediaServerId()); + return streamPushItem; + } public static class MediaSchema { @@ -325,5 +347,65 @@ 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