From 41d9c347bf648a49fc11fbd4c451298f164230ec Mon Sep 17 00:00:00 2001
From: tonyjianhua <575414312@qq.com>
Date: Wed, 19 Jul 2023 13:33:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8B=89=E6=B5=81=E4=BB=A3?=
 =?UTF-8?q?=E7=90=86=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/StreamProxyServiceImpl.java  | 42 ++++++++++---------
 1 file changed, 22 insertions(+), 20 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 a1c5b1c4..d699bbcd 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
@@ -161,25 +161,24 @@ public class StreamProxyServiceImpl implements IStreamProxyService {
             return;
         }
 
-        String talkKey = UUID.randomUUID().toString();
-        dynamicTask.startCron(talkKey, ()->{
-            StreamInfo streamInfo = mediaService.getStreamInfoByAppAndStreamWithCheck(param.getApp(), param.getStream(), mediaInfo.getId(), false);
-            if (streamInfo != null) {
-                callback.run(ErrorCode.SUCCESS.getCode(), ErrorCode.SUCCESS.getMsg(), streamInfo);
-            }
-        }, 1000);
-        String delayTalkKey = UUID.randomUUID().toString();
-        dynamicTask.startDelay(delayTalkKey, ()->{
-            StreamInfo streamInfo = mediaService.getStreamInfoByAppAndStreamWithCheck(param.getApp(), param.getStream(), mediaInfo.getId(), false);
-            if (streamInfo != null) {
-                callback.run(ErrorCode.SUCCESS.getCode(), ErrorCode.SUCCESS.getMsg(), streamInfo);
-            }else {
-                dynamicTask.stop(talkKey);
-                callback.run(ErrorCode.ERROR100.getCode(), "超时", null);
-            }
-        }, 5000);
-
         if (param.isEnable()) {
+            String talkKey = UUID.randomUUID().toString();
+            dynamicTask.startCron(talkKey, ()->{
+                StreamInfo streamInfo = mediaService.getStreamInfoByAppAndStreamWithCheck(param.getApp(), param.getStream(), mediaInfo.getId(), false);
+                if (streamInfo != null) {
+                    callback.run(ErrorCode.SUCCESS.getCode(), ErrorCode.SUCCESS.getMsg(), streamInfo);
+                }
+            }, 1000);
+            String delayTalkKey = UUID.randomUUID().toString();
+            dynamicTask.startDelay(delayTalkKey, ()->{
+                StreamInfo streamInfo = mediaService.getStreamInfoByAppAndStreamWithCheck(param.getApp(), param.getStream(), mediaInfo.getId(), false);
+                if (streamInfo != null) {
+                    callback.run(ErrorCode.SUCCESS.getCode(), ErrorCode.SUCCESS.getMsg(), streamInfo);
+                }else {
+                    dynamicTask.stop(talkKey);
+                    callback.run(ErrorCode.ERROR100.getCode(), "超时", null);
+                }
+            }, 5000);
             JSONObject jsonObject = addStreamProxyToZlm(param);
             if (jsonObject != null && jsonObject.getInteger("code") == 0) {
                 dynamicTask.stop(talkKey);
@@ -196,13 +195,16 @@ public class StreamProxyServiceImpl implements IStreamProxyService {
                 }
                 if (jsonObject == null){
                     callback.run(ErrorCode.ERROR100.getCode(), "记录已保存，启用失败", null);
-                    return;
                 }else {
                     callback.run(ErrorCode.ERROR100.getCode(), jsonObject.getString("msg"), null);
-                    return;
                 }
             }
         }
+        else{
+            StreamInfo streamInfo = mediaService.getStreamInfoByAppAndStream(
+                    mediaInfo, param.getApp(), param.getStream(), null, null);
+            callback.run(ErrorCode.SUCCESS.getCode(), ErrorCode.SUCCESS.getMsg(), streamInfo);
+        }
     }
 
     private String getSchemaFromFFmpegCmd(String ffmpegCmd) {