From 1fcdf5a8f369e020e78d524db2fe3cc7ffc86293 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 08 三月 2024 09:30:48 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into main-dev
---
src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java | 8 ++------
1 files changed, 2 insertions(+), 6 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 7b9744e..59c5ace 100755
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
@@ -90,12 +90,6 @@
private PlatformGbStreamMapper platformGbStreamMapper;
@Autowired
- private EventPublisher eventPublisher;
-
- @Autowired
- private ParentPlatformMapper parentPlatformMapper;
-
- @Autowired
private IGbStreamService gbStreamService;
@Autowired
@@ -415,6 +409,8 @@
logger.info("鍚敤浠ｇ悊澶辫触锛� {}/{}->{}({})", app, stream, jsonObject.getString("msg"),
streamProxy.getSrcUrl() == null? streamProxy.getUrl():streamProxy.getSrcUrl());
}
+ } else if (streamProxy != null && streamProxy.isEnable()) {
+ return true ;
}
return result;
}
--
Gitblit v1.8.0