From 94cde3af7083f9c44ded2e477810e94778011b0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=82=A5=E7=BE=8A?= <1048382248@qq.com>
Date: Fri, 26 Sep 2025 15:11:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E6=B6=88=E8=B4=B9=E4=B8=AD=E7=9A=84=E9=98=9F=E5=88=97=E7=BC=93?=
 =?UTF-8?q?=E5=AD=98=20=E4=BF=AE=E6=94=B9=20sql=E4=BB=93=E5=82=A8=E5=B1=82?=
 =?UTF-8?q?=E7=9A=84=E6=B3=A8=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 VideoAnalysis/AntDeploy.json                      |  4 ++--
 VideoAnalysisCore/AICore/SherpaOnnx/SenseVoice.cs |  2 +-
 VideoAnalysisCore/Common/Expand/SqlSugarExpand.cs |  2 +-
 VideoAnalysisCore/Common/RedisExpand.cs           | 11 +++++++----
 VideoAnalysisCore/Common/Repository.cs            |  8 ++++----
 VideoAnalysisCore/Controllers/ApiController.cs    | 13 ++++++++-----
 6 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/VideoAnalysis/AntDeploy.json b/VideoAnalysis/AntDeploy.json
index c4da2cd..4b4d6b7 100644
--- a/VideoAnalysis/AntDeploy.json
+++ b/VideoAnalysis/AntDeploy.json
@@ -120,7 +120,7 @@
     "LastEnvName": "10楼刀片机",
     "RemoveDaysFromPublished": "10",
     "WorkDir": "/home/heyang/",
-    "Volume": "/home/hy/VideoAnalysis/AICore:/app/AICore/_Static;/home/hy/VideoAnalysis/TaskCachedFile:/app/TaskCachedFile",
+    "Volume": "/home/hy/VideoAnalysis/AICore:/app/AICore/_Static;/mnt/2tb/VideoAnalysis/TaskCachedFile:/app/TaskCachedFile",
     "Other": "-e va_args=\"\"",
     "EnvPairList": [
       {
@@ -129,7 +129,7 @@
         "LinuxEnvParam": null,
         "DockerPort": "9040",
         "DockerEnvName": "",
-        "DockerVolume": "/home/hy/VideoAnalysis/AICore:/app/AICore/_Static;/home/hy/VideoAnalysis/TaskCachedFile:/app/TaskCachedFile",
+        "DockerVolume": "/home/hy/VideoAnalysis/AICore:/app/AICore/_Static;/mnt/2tb/VideoAnalysis/TaskCachedFile:/app/TaskCachedFile",
         "DockerOther": "-e va_args=\"\""
       },
       {
diff --git a/VideoAnalysisCore/AICore/SherpaOnnx/SenseVoice.cs b/VideoAnalysisCore/AICore/SherpaOnnx/SenseVoice.cs
index b18f3de..08038ea 100644
--- a/VideoAnalysisCore/AICore/SherpaOnnx/SenseVoice.cs
+++ b/VideoAnalysisCore/AICore/SherpaOnnx/SenseVoice.cs
@@ -180,7 +180,7 @@ namespace VideoAnalysisCore.AICore.SherpaOnnx
                     .ExecuteCommandAsync();
                 await RedisExpand.Redis.HMSetAsync(RedisExpandKey.Task(task), "Captions", res);
                 //分析完成视频字幕后继续接收任务
-                RedisExpand.NewTaskAsync();
+                RedisExpand.NewTask();
             }
             return res;
         }
diff --git a/VideoAnalysisCore/Common/Expand/SqlSugarExpand.cs b/VideoAnalysisCore/Common/Expand/SqlSugarExpand.cs
index ea2d7cc..d1ac4fc 100644
--- a/VideoAnalysisCore/Common/Expand/SqlSugarExpand.cs
+++ b/VideoAnalysisCore/Common/Expand/SqlSugarExpand.cs
@@ -44,7 +44,7 @@ namespace VideoAnalysisCore.Common.Expand
                 DbType = s.SqlType,
                 IsAutoCloseConnection = true
             }));
-            services.AddTransient(typeof(Repository<>));
+            services.AddScoped(typeof(Repository<>));
 
             //注入SqlSugar 主库
             services.AddSqlSugar(dbList);
diff --git a/VideoAnalysisCore/Common/RedisExpand.cs b/VideoAnalysisCore/Common/RedisExpand.cs
index acd79f8..7d8942e 100644
--- a/VideoAnalysisCore/Common/RedisExpand.cs
+++ b/VideoAnalysisCore/Common/RedisExpand.cs
@@ -297,20 +297,23 @@ namespace VideoAnalysisCore.Common
         /// <summary>
         /// 开始接收新任务
         /// </summary>
-        public static void RestartTaskAsync()
+        public static void RestartTask()
         {
             StopTask = false;
-            NewTaskAsync();
+            NewTask();
         }
         /// <summary>
         /// 重新执行新任务
         /// </summary>
         /// <returns></returns>
-        public static async void NewTaskAsync()
+        public static void NewTask()
         {
             // 取消 消费机的任务订阅
             if (StopTask)
+            {
+                Console.WriteLine(DateTime.Now.ToString("HH:mm:ss") + "-------------> 接收任务已经暂停 ");
                 return;
+            }
             ReceivingTaskAsync();
         }
 
@@ -374,7 +377,7 @@ namespace VideoAnalysisCore.Common
                 Console.WriteLine(ex.StackTrace);
                 Console.WriteLine("==============================================");
                 //清除失败任务 重新接收任务
-                NewTaskAsync();
+                NewTask();
             }
             return await SetTaskError(taskID, error);
         }
diff --git a/VideoAnalysisCore/Common/Repository.cs b/VideoAnalysisCore/Common/Repository.cs
index 37f0cc6..2281a9b 100644
--- a/VideoAnalysisCore/Common/Repository.cs
+++ b/VideoAnalysisCore/Common/Repository.cs
@@ -24,16 +24,16 @@ namespace VideoAnalysisCore.Common
             if (CID.ContainsKey(t))
             {
                 base.Context = CID[t]!=null
-                    ? DbScoped.Sugar.GetConnectionScope(CID[t])
-                    : DbScoped.Sugar;
+                    ? DbScoped.SugarScope.GetConnectionScope(CID[t])
+                    : DbScoped.SugarScope;
                 return;
             }
             var c = t.GetCustomAttribute<TenantAttribute>();
             if (!CID.ContainsKey(t))
                 CID.Add(t, c?.configId);
             base.Context = c != null
-                ? DbScoped.Sugar.GetConnectionScope(c.configId)
-                 : DbScoped.Sugar;
+                ? DbScoped.SugarScope.GetConnectionScope(c.configId)
+                 : DbScoped.SugarScope;
         }
     }
 }
diff --git a/VideoAnalysisCore/Controllers/ApiController.cs b/VideoAnalysisCore/Controllers/ApiController.cs
index 625f7eb..10ce01f 100644
--- a/VideoAnalysisCore/Controllers/ApiController.cs
+++ b/VideoAnalysisCore/Controllers/ApiController.cs
@@ -76,13 +76,16 @@ namespace VideoAnalysisCore.Controllers
         /// <summary>
         /// ��ʼ�������
         /// </summary>
-        /// <param name="url">�ļ���</param>
+        /// <param name="task">�Ƿ�ִ������</param>
         /// <returns></returns>
-        [HttpGet(Name = "tets1")]
-        public IActionResult tets1(string task)
+        [HttpGet(Name = "StartTask")]
+        public IActionResult StartTask(bool task)
         {
-            var courseArr = courseInfoDB.AsQueryable().ToArray();
-            return Ok(courseArr);
+            if(task)
+                RedisExpand.RestartTask();
+            else
+                RedisExpand.StopTaskAsync();
+            return Ok();
         }
         /// <summary>
         /// ����ʶ��