From b4048fbe80dba8e7756ae557a15ab60b4f80a44b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 04 四月 2023 09:09:07 +0800
Subject: [PATCH] 合并开源主线
---
src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java | 13 +++++--------
1 files changed, 5 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 7dcd7f2..acadee6 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
@@ -74,12 +74,6 @@
private PlatformGbStreamMapper platformGbStreamMapper;
@Autowired
- private EventPublisher eventPublisher;
-
- @Autowired
- private ParentPlatformMapper parentPlatformMapper;
-
- @Autowired
private IGbStreamService gbStreamService;
@Autowired
@@ -96,7 +90,7 @@
public StreamInfo save(StreamProxyItem param) {
MediaServerItem mediaInfo;
if (ObjectUtils.isEmpty(param.getMediaServerId()) || "auto".equals(param.getMediaServerId())){
- mediaInfo = mediaServerService.getMediaServerForMinimumLoad();
+ mediaInfo = mediaServerService.getMediaServerForMinimumLoad(null);
}else {
mediaInfo = mediaServerService.getOne(param.getMediaServerId());
}
@@ -207,7 +201,7 @@
dataSourceTransactionManager.commit(transactionStatus); //鎵嬪姩鎻愪氦
result = true;
}catch (Exception e) {
- e.printStackTrace();
+ logger.error("鏈鐞嗙殑寮傚父 ", e);
dataSourceTransactionManager.rollback(transactionStatus);
}
return result;
@@ -284,6 +278,9 @@
result = true;
streamProxy.setEnable(true);
updateStreamProxy(streamProxy);
+ }else {
+ logger.info("鍚敤浠ｇ悊澶辫触锛� {}/{}->{}({})", app, stream, jsonObject.getString("msg"),
+ streamProxy.getSrc_url() == null? streamProxy.getUrl():streamProxy.getSrc_url());
}
}
return result;
--
Gitblit v1.8.0