From bbf19c79091c46ac5465909429caef6e79c02e55 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: Tue, 9 Apr 2024 10:40:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=B8=BB=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../request/impl/InviteRequestProcessor.java | 11 ++++-- .../iot/vmp/media/bean/MediaInfo.java | 38 ------------------- .../iot/vmp/media/bean/RecordInfo.java | 7 ---- .../media/event/media/MediaArrivalEvent.java | 10 ----- .../event/media/MediaDepartureEvent.java | 9 ----- .../media/event/media/MediaNotFoundEvent.java | 9 ----- .../event/media/MediaRecordMp4Event.java | 12 ------ .../media/zlm/ZLMMediaServerStatusManger.java | 1 + .../RedisPushStreamCloseResponseListener.java | 6 ++- .../cloudRecord/CloudRecordController.java | 1 - 10 files changed, 13 insertions(+), 91 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java index b5296cea..b1a6611c 100755 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java @@ -20,13 +20,18 @@ import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorP import com.genersoft.iot.vmp.gb28181.utils.SipUtils; import com.genersoft.iot.vmp.media.bean.MediaServer; import com.genersoft.iot.vmp.media.event.hook.Hook; +import com.genersoft.iot.vmp.media.event.hook.HookSubscribe; import com.genersoft.iot.vmp.media.event.hook.HookType; import com.genersoft.iot.vmp.media.service.IMediaServerService; import com.genersoft.iot.vmp.media.zlm.ZLMMediaListManager; import com.genersoft.iot.vmp.media.zlm.ZLMServerFactory; -import com.genersoft.iot.vmp.media.event.hook.HookSubscribe; -import com.genersoft.iot.vmp.media.zlm.dto.*; -import com.genersoft.iot.vmp.service.*; +import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem; +import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem; +import com.genersoft.iot.vmp.media.zlm.dto.hook.OnStreamChangedHookParam; +import com.genersoft.iot.vmp.service.IInviteStreamService; +import com.genersoft.iot.vmp.service.IPlayService; +import com.genersoft.iot.vmp.service.IStreamProxyService; +import com.genersoft.iot.vmp.service.IStreamPushService; import com.genersoft.iot.vmp.service.bean.ErrorCallback; import com.genersoft.iot.vmp.service.bean.InviteErrorCode; import com.genersoft.iot.vmp.service.bean.MessageForPushChannel; 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 8ee0eaf3..f1c3d585 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 @@ -2,9 +2,7 @@ package com.genersoft.iot.vmp.media.bean; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; -import com.genersoft.iot.vmp.media.abl.bean.hook.OnStreamArriveABLHookParam; import com.genersoft.iot.vmp.media.zlm.dto.hook.OnStreamChangedHookParam; -import com.genersoft.iot.vmp.media.zlm.dto.hook.OriginType; import io.swagger.v3.oas.annotations.media.Schema; import java.util.List; @@ -178,42 +176,6 @@ public class MediaInfo { return mediaInfo; } - public static MediaInfo getInstance(OnStreamArriveABLHookParam param, MediaServer mediaServer) { - - MediaInfo mediaInfo = new MediaInfo(); - mediaInfo.setApp(param.getApp()); - mediaInfo.setStream(param.getStream()); - mediaInfo.setMediaServer(mediaServer); - mediaInfo.setReaderCount(param.getReaderCount()); - mediaInfo.setOnline(true); - mediaInfo.setVideoCodec(param.getVideoCodec()); - switch (param.getNetworkType()) { - case 21: - mediaInfo.setOriginType(OriginType.RTMP_PUSH.ordinal()); - break; - case 23: - mediaInfo.setOriginType(OriginType.RTSP_PUSH.ordinal()); - break; - case 30: - case 31: - case 32: - case 33: - mediaInfo.setOriginType(OriginType.PULL.ordinal()); - break; - default: - mediaInfo.setOriginType(OriginType.UNKNOWN.ordinal()); - break; - - } - mediaInfo.setWidth(param.getWidth()); - mediaInfo.setHeight(param.getHeight()); - mediaInfo.setAudioCodec(param.getAudioCodec()); - mediaInfo.setAudioChannels(param.getAudioChannels()); - mediaInfo.setAudioSampleRate(param.getAudioSampleRate()); - - return mediaInfo; - } - public Integer getReaderCount() { return readerCount; } diff --git a/src/main/java/com/genersoft/iot/vmp/media/bean/RecordInfo.java b/src/main/java/com/genersoft/iot/vmp/media/bean/RecordInfo.java index eb60ed91..aafc5db1 100644 --- a/src/main/java/com/genersoft/iot/vmp/media/bean/RecordInfo.java +++ b/src/main/java/com/genersoft/iot/vmp/media/bean/RecordInfo.java @@ -1,6 +1,5 @@ package com.genersoft.iot.vmp.media.bean; -import com.genersoft.iot.vmp.media.abl.bean.hook.OnRecordMp4ABLHookParam; import com.genersoft.iot.vmp.media.zlm.dto.hook.OnRecordMp4HookParam; public class RecordInfo { @@ -24,12 +23,6 @@ public class RecordInfo { return recordInfo; } - public static RecordInfo getInstance(OnRecordMp4ABLHookParam hookParam) { - RecordInfo recordInfo = new RecordInfo(); - recordInfo.setFileName(hookParam.getFileName()); - return recordInfo; - } - public String getFileName() { return fileName; } diff --git a/src/main/java/com/genersoft/iot/vmp/media/event/media/MediaArrivalEvent.java b/src/main/java/com/genersoft/iot/vmp/media/event/media/MediaArrivalEvent.java index cebcccdf..2379321a 100644 --- a/src/main/java/com/genersoft/iot/vmp/media/event/media/MediaArrivalEvent.java +++ b/src/main/java/com/genersoft/iot/vmp/media/event/media/MediaArrivalEvent.java @@ -1,6 +1,5 @@ package com.genersoft.iot.vmp.media.event.media; -import com.genersoft.iot.vmp.media.abl.bean.hook.OnStreamArriveABLHookParam; import com.genersoft.iot.vmp.media.bean.MediaInfo; import com.genersoft.iot.vmp.media.bean.MediaServer; import com.genersoft.iot.vmp.media.zlm.dto.hook.OnStreamChangedHookParam; @@ -23,15 +22,6 @@ public class MediaArrivalEvent extends MediaEvent { mediaArrivalEvent.setCallId(hookParam.getCallId()); return mediaArrivalEvent; } - public static MediaArrivalEvent getInstance(Object source, OnStreamArriveABLHookParam hookParam, MediaServer mediaServer){ - MediaArrivalEvent mediaArrivalEvent = new MediaArrivalEvent(source); - mediaArrivalEvent.setMediaInfo(MediaInfo.getInstance(hookParam, mediaServer)); - mediaArrivalEvent.setApp(hookParam.getApp()); - mediaArrivalEvent.setStream(hookParam.getStream()); - mediaArrivalEvent.setMediaServer(mediaServer); - mediaArrivalEvent.setCallId(hookParam.getCallId()); - return mediaArrivalEvent; - } private MediaInfo mediaInfo; diff --git a/src/main/java/com/genersoft/iot/vmp/media/event/media/MediaDepartureEvent.java b/src/main/java/com/genersoft/iot/vmp/media/event/media/MediaDepartureEvent.java index 02b99f31..edd945ad 100644 --- a/src/main/java/com/genersoft/iot/vmp/media/event/media/MediaDepartureEvent.java +++ b/src/main/java/com/genersoft/iot/vmp/media/event/media/MediaDepartureEvent.java @@ -1,6 +1,5 @@ package com.genersoft.iot.vmp.media.event.media; -import com.genersoft.iot.vmp.media.abl.bean.hook.ABLHookParam; import com.genersoft.iot.vmp.media.bean.MediaServer; import com.genersoft.iot.vmp.media.zlm.dto.hook.OnStreamChangedHookParam; @@ -20,12 +19,4 @@ public class MediaDepartureEvent extends MediaEvent { mediaDepartureEven.setMediaServer(mediaServer); return mediaDepartureEven; } - - public static MediaDepartureEvent getInstance(Object source, ABLHookParam hookParam, MediaServer mediaServer){ - MediaDepartureEvent mediaDepartureEven = new MediaDepartureEvent(source); - mediaDepartureEven.setApp(hookParam.getApp()); - mediaDepartureEven.setStream(hookParam.getStream()); - mediaDepartureEven.setMediaServer(mediaServer); - return mediaDepartureEven; - } } diff --git a/src/main/java/com/genersoft/iot/vmp/media/event/media/MediaNotFoundEvent.java b/src/main/java/com/genersoft/iot/vmp/media/event/media/MediaNotFoundEvent.java index 675d6e9d..2415566a 100644 --- a/src/main/java/com/genersoft/iot/vmp/media/event/media/MediaNotFoundEvent.java +++ b/src/main/java/com/genersoft/iot/vmp/media/event/media/MediaNotFoundEvent.java @@ -1,6 +1,5 @@ package com.genersoft.iot.vmp.media.event.media; -import com.genersoft.iot.vmp.media.abl.bean.hook.ABLHookParam; import com.genersoft.iot.vmp.media.bean.MediaServer; import com.genersoft.iot.vmp.media.zlm.dto.hook.OnStreamNotFoundHookParam; @@ -20,12 +19,4 @@ public class MediaNotFoundEvent extends MediaEvent { mediaDepartureEven.setMediaServer(mediaServer); return mediaDepartureEven; } - - public static MediaNotFoundEvent getInstance(Object source, ABLHookParam hookParam, MediaServer mediaServer){ - MediaNotFoundEvent mediaDepartureEven = new MediaNotFoundEvent(source); - mediaDepartureEven.setApp(hookParam.getApp()); - mediaDepartureEven.setStream(hookParam.getStream()); - mediaDepartureEven.setMediaServer(mediaServer); - return mediaDepartureEven; - } } diff --git a/src/main/java/com/genersoft/iot/vmp/media/event/media/MediaRecordMp4Event.java b/src/main/java/com/genersoft/iot/vmp/media/event/media/MediaRecordMp4Event.java index 9fd6defc..093c3c25 100644 --- a/src/main/java/com/genersoft/iot/vmp/media/event/media/MediaRecordMp4Event.java +++ b/src/main/java/com/genersoft/iot/vmp/media/event/media/MediaRecordMp4Event.java @@ -1,7 +1,5 @@ package com.genersoft.iot.vmp.media.event.media; -import com.genersoft.iot.vmp.media.abl.ABLHttpHookListener; -import com.genersoft.iot.vmp.media.abl.bean.hook.OnRecordMp4ABLHookParam; import com.genersoft.iot.vmp.media.bean.RecordInfo; import com.genersoft.iot.vmp.media.bean.MediaServer; import com.genersoft.iot.vmp.media.zlm.dto.hook.OnRecordMp4HookParam; @@ -26,16 +24,6 @@ public class MediaRecordMp4Event extends MediaEvent { return mediaRecordMp4Event; } - public static MediaRecordMp4Event getInstance(ABLHttpHookListener source, OnRecordMp4ABLHookParam hookParam, MediaServer mediaServer) { - MediaRecordMp4Event mediaRecordMp4Event = new MediaRecordMp4Event(source); - mediaRecordMp4Event.setApp(hookParam.getApp()); - mediaRecordMp4Event.setStream(hookParam.getStream()); - RecordInfo recordInfo = RecordInfo.getInstance(hookParam); - mediaRecordMp4Event.setRecordInfo(recordInfo); - mediaRecordMp4Event.setMediaServer(mediaServer); - return mediaRecordMp4Event; - } - public RecordInfo getRecordInfo() { return recordInfo; } diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaServerStatusManger.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaServerStatusManger.java index d4d65636..d744850d 100644 --- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaServerStatusManger.java +++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaServerStatusManger.java @@ -74,6 +74,7 @@ public class ZLMMediaServerStatusManger { logger.info("[ZLM-添加待上线节点] ID：" + mediaServerItem.getId()); offlineZlmPrimaryMap.put(mediaServerItem.getId(), mediaServerItem); offlineZlmTimeMap.put(mediaServerItem.getId(), System.currentTimeMillis()); + execute(); } } diff --git a/src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamCloseResponseListener.java b/src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamCloseResponseListener.java index 208bfac3..e7cba6ba 100755 --- a/src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamCloseResponseListener.java +++ b/src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamCloseResponseListener.java @@ -2,13 +2,14 @@ package com.genersoft.iot.vmp.service.redisMsg; import com.alibaba.fastjson2.JSON; import com.genersoft.iot.vmp.conf.UserSetting; +import com.genersoft.iot.vmp.gb28181.bean.InviteStreamType; import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform; import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem; import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommanderForPlatform; -import com.genersoft.iot.vmp.media.zlm.ZLMServerFactory; import com.genersoft.iot.vmp.media.bean.MediaServer; -import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem; import com.genersoft.iot.vmp.media.service.IMediaServerService; +import com.genersoft.iot.vmp.media.zlm.ZLMServerFactory; +import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem; import com.genersoft.iot.vmp.service.IStreamPushService; import com.genersoft.iot.vmp.service.bean.MessageForPushChannel; import com.genersoft.iot.vmp.service.bean.MessageForPushChannelResponse; @@ -24,6 +25,7 @@ import org.springframework.stereotype.Component; import javax.sip.InvalidArgumentException; import javax.sip.SipException; import java.text.ParseException; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java index 2e3aa710..da8bbc8c 100755 --- a/src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java +++ b/src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java @@ -4,7 +4,6 @@ import com.alibaba.fastjson2.JSONArray; import com.genersoft.iot.vmp.conf.exception.ControllerException; import com.genersoft.iot.vmp.conf.security.JwtUtils; import com.genersoft.iot.vmp.media.bean.MediaServer; -import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem; import com.genersoft.iot.vmp.service.ICloudRecordService; import com.genersoft.iot.vmp.media.service.IMediaServerService; import com.genersoft.iot.vmp.service.bean.CloudRecordItem;