From 51c19c397d86259cdf2d9483a6f39332f8be3724 Mon Sep 17 00:00:00 2001
From: yanggs <yanggs@goldencis.com>
Date: 星期四, 01 六月 2023 13:30:48 +0800
Subject: [PATCH] 修复 启用代理失败： ->缺少必要参数:"src_url","dst_url","timeout_ms"

---
 src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java |   33 ++++++++++++++++++++-------------
 1 files changed, 20 insertions(+), 13 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..f73392f 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
@@ -23,7 +23,7 @@
 import com.genersoft.iot.vmp.storager.dao.StreamProxyMapper;
 import com.genersoft.iot.vmp.utils.DateUtil;
 import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
-import com.genersoft.iot.vmp.vmanager.bean.ResourceBaceInfo;
+import com.genersoft.iot.vmp.vmanager.bean.ResourceBaseInfo;
 import com.github.pagehelper.PageInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -96,7 +96,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());
         }
@@ -106,7 +106,7 @@
         }
         String dstUrl = String.format("rtmp://%s:%s/%s/%s", "127.0.0.1", mediaInfo.getRtmpPort(), param.getApp(),
                 param.getStream() );
-        param.setDst_url(dstUrl);
+        param.setDstUrl(dstUrl);
         StringBuffer resultMsg = new StringBuffer();
         param.setMediaServerId(mediaInfo.getId());
         boolean saveResult;
@@ -127,7 +127,7 @@
                 resultMsg.append(", 浣嗘槸鍚敤澶辫触锛岃妫�鏌ユ祦鍦板潃鏄惁鍙敤");
                 param.setEnable(false);
                 // 鐩存帴绉婚櫎
-                if (param.isEnable_remove_none_reader()) {
+                if (param.isEnableRemoveNoneReader()) {
                     del(param.getApp(), param.getStream());
                 }else {
                     updateStreamProxy(param);
@@ -207,7 +207,7 @@
             dataSourceTransactionManager.commit(transactionStatus);     //鎵嬪姩鎻愪氦
             result = true;
         }catch (Exception e) {
-            e.printStackTrace();
+            logger.error("鏈鐞嗙殑寮傚父 ", e);
             dataSourceTransactionManager.rollback(transactionStatus);
         }
         return result;
@@ -228,11 +228,11 @@
         }
         if ("default".equals(param.getType())){
             result = zlmresTfulUtils.addStreamProxy(mediaServerItem, param.getApp(), param.getStream(), param.getUrl(),
-                    param.isEnable_audio(), param.isEnable_mp4(), param.getRtp_type());
+                    param.isEnableAudio(), param.isEnableMp4(), param.getRtpType());
         }else if ("ffmpeg".equals(param.getType())) {
-            result = zlmresTfulUtils.addFFmpegSource(mediaServerItem, param.getSrc_url(), param.getDst_url(),
-                    param.getTimeout_ms() + "", param.isEnable_audio(), param.isEnable_mp4(),
-                    param.getFfmpeg_cmd_key());
+            result = zlmresTfulUtils.addFFmpegSource(mediaServerItem, param.getSrcUrl(), param.getDstUrl(),
+                    param.getTimeoutMs() + "", param.isEnableAudio(), param.isEnableMp4(),
+                    param.getFfmpegCmdKey());
         }
         return result;
     }
@@ -284,6 +284,9 @@
                 result = true;
                 streamProxy.setEnable(true);
                 updateStreamProxy(streamProxy);
+            }else {
+                logger.info("鍚敤浠ｇ悊澶辫触锛� {}/{}->{}({})", app, stream, jsonObject.getString("msg"),
+                        streamProxy.getSrcUrl() == null? streamProxy.getUrl():streamProxy.getSrcUrl());
             }
         }
         return result;
@@ -329,7 +332,7 @@
     @Override
     public void zlmServerOnline(String mediaServerId) {
         // 绉婚櫎寮�鍚簡鏃犱汉瑙傜湅鑷姩绉婚櫎鐨勬祦
-        List<StreamProxyItem> streamProxyItemList = streamProxyMapper.selecAutoRemoveItemByMediaServerId(mediaServerId);
+        List<StreamProxyItem> streamProxyItemList = streamProxyMapper.selectAutoRemoveItemByMediaServerId(mediaServerId);
         if (streamProxyItemList.size() > 0) {
             gbStreamMapper.batchDel(streamProxyItemList);
         }
@@ -357,7 +360,7 @@
     @Override
     public void zlmServerOffline(String mediaServerId) {
         // 绉婚櫎寮�鍚簡鏃犱汉瑙傜湅鑷姩绉婚櫎鐨勬祦
-        List<StreamProxyItem> streamProxyItemList = streamProxyMapper.selecAutoRemoveItemByMediaServerId(mediaServerId);
+        List<StreamProxyItem> streamProxyItemList = streamProxyMapper.selectAutoRemoveItemByMediaServerId(mediaServerId);
         if (streamProxyItemList.size() > 0) {
             gbStreamMapper.batchDel(streamProxyItemList);
         }
@@ -435,7 +438,11 @@
     }
 
     @Override
-    public ResourceBaceInfo getOverview() {
-        return streamProxyMapper.getOverview();
+    public ResourceBaseInfo getOverview() {
+
+        int total = streamProxyMapper.getAllCount();
+        int online = streamProxyMapper.getOnline();
+
+        return new ResourceBaseInfo(total, online);
     }
 }

--
Gitblit v1.8.0