From 82fd369ce554467f794c9aa66e453adecefc73a9 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 17 十月 2022 16:56:13 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0'
---
src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java | 10 ++--------
1 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
index e217ca9..bd64d30 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
@@ -77,12 +77,6 @@
private PlatformGbStreamMapper platformGbStreamMapper;
@Autowired
- private EventPublisher eventPublisher;
-
- @Autowired
- private ParentPlatformMapper parentPlatformMapper;
-
- @Autowired
private IGbStreamService gbStreamService;
@Autowired
@@ -98,7 +92,7 @@
@Override
public StreamInfo save(StreamProxyItem param) {
MediaServerItem mediaInfo;
- if (param.getMediaServerId() == null || "auto".equals(param.getMediaServerId())){
+ if (ObjectUtils.isEmpty(param.getMediaServerId()) || "auto".equals(param.getMediaServerId())){
mediaInfo = mediaServerService.getMediaServerForMinimumLoad();
}else {
mediaInfo = mediaServerService.getOne(param.getMediaServerId());
@@ -296,7 +290,7 @@
public boolean start(String app, String stream) {
boolean result = false;
StreamProxyItem streamProxy = videoManagerStorager.queryStreamProxy(app, stream);
- if (!streamProxy.isEnable() ) {
+ if (streamProxy != null && !streamProxy.isEnable() ) {
JSONObject jsonObject = addStreamProxyToZlm(streamProxy);
if (jsonObject == null) {
return false;
--
Gitblit v1.8.0