diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/service/impl/GbChannelPlayServiceImpl.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/service/impl/GbChannelPlayServiceImpl.java index cbee3008..99bd6f58 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/service/impl/GbChannelPlayServiceImpl.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/service/impl/GbChannelPlayServiceImpl.java @@ -10,7 +10,6 @@ import com.viewsh.module.video.gb28181.service.IGbChannelPlayService; import com.viewsh.module.video.gb28181.service.ISourceDownloadService; import com.viewsh.module.video.gb28181.service.ISourcePlayService; import com.viewsh.module.video.gb28181.service.ISourcePlaybackService; -import com.viewsh.module.video.jt1078.service.Ijt1078PlayService; import com.viewsh.module.video.service.bean.ErrorCallback; import com.viewsh.module.video.service.bean.InviteErrorCode; import lombok.extern.slf4j.Slf4j; @@ -34,9 +33,6 @@ public class GbChannelPlayServiceImpl implements IGbChannelPlayService { @Autowired private Map sourcePlayServiceMap; - @Autowired - private Ijt1078PlayService jt1078PlayService; - @Autowired private Map sourcePlaybackServiceMap; diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/service/impl/MediaServiceImpl.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/service/impl/MediaServiceImpl.java index 29cc1e95..2cea6991 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/service/impl/MediaServiceImpl.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/service/impl/MediaServiceImpl.java @@ -62,10 +62,16 @@ public class MediaServiceImpl implements IMediaService { @Autowired private SipInviteSessionManager sessionManager; - @Autowired + // JT1078 模块尚未从 WVP 原始代码迁移过来: + // - Ijt1078Service / Ijt1078PlayService 是 stub 接口,当前没有 @Service 实现 + // - GbChannelPlayServiceImpl 已彻底删除对这两个接口的依赖(它原本的字段就没在方法体里用过) + // - 本类是唯一仍然需要这两个接口的地方,用 required=false 做软依赖,接口缺失时走下方 null guard + // 直接拒绝"1078" app 的请求(见 checkStreamFromJt 调用点) + // TODO(JT1078 迁移完成后):去掉 required=false,把 null guard 改回强校验;或引入 JtModuleProperties.enabled 开关统一管理。 + @Autowired(required = false) private Ijt1078Service ijt1078Service; - @Autowired + @Autowired(required = false) private Ijt1078PlayService jt1078PlayService; @Autowired @@ -259,6 +265,10 @@ public class MediaServiceImpl implements IMediaService { return result; } }else if ("1078".equals(app)) { + // JT1078 模块未迁移时直接拒绝 + if (ijt1078Service == null || jt1078PlayService == null) { + return false; + } // 判断是否是1078播放类型 JTMediaStreamType jtMediaStreamType = ijt1078Service.checkStreamFromJt(stream); if (jtMediaStreamType != null) {