修复执行部分任务时没使用await等待导致的数据库连接异常

新增任务完成后立马删除视频文件
修复尝试解决多线程sql异常问题
2025-10-27 10:01:11 +08:00 · 2025-10-23 17:07:48 +08:00 · 2025-10-22 14:18:00 +08:00
6 changed files with 87 additions and 85 deletions
--- a/VideoAnalysis/Components/Pages/VideoTaskPage.razor.cs
+++ b/VideoAnalysis/Components/Pages/VideoTaskPage.razor.cs
@ -39,7 +39,7 @@ namespace Learn.VideoAnalysis.Components.Pages
        bool tableLoading = false;
        private VideoTaskDto selectData;
        private bool rowRestartLoading = false;
-        private VideoTaskDto reStartTask ;
+        private VideoTaskDto reStartTask;

        static TextValue[] SelectDataSource =
            Enum.GetValues(typeof(RedisChannelEnum))
@ -47,7 +47,7 @@ namespace Learn.VideoAnalysis.Components.Pages
           .Select(s => new TextValue(s.ToString(), (int)s))
           .ToArray();
        int selectEnum = 1;
-        int selectDefaultValue =1;
+        int selectDefaultValue = 1;

        /// <summary>
        /// 点击重试
@ -63,17 +63,17 @@ namespace Learn.VideoAnalysis.Components.Pages
        }
        void PreviewTask(VideoTaskDto task)
        {
-            NavigationManager.NavigateTo("/VideoTaskShow/"+task.Id);
+            NavigationManager.NavigateTo("/VideoTaskShow/" + task.Id);
        }
        /// <summary>
        /// 重试
        /// </summary>
        /// <param name="query"></param>
-        async void ReStart()
+        async Task ReStart()
        {
            await redisManager.ClearTaskError(reStartTask.Id);
-            _=Task.Run(() =>
-                redisManager.InsertChannel((RedisChannelEnum)selectEnum, reStartTask.Id)
+            await Task.Run(async () =>
+                await redisManager.InsertChannel((RedisChannelEnum)selectEnum, reStartTask.Id)
            );
            modalShow = false;
        }
@ -111,7 +111,7 @@ namespace Learn.VideoAnalysis.Components.Pages
                .Where(where)
                .Select<VideoTaskDto>()
                .OrderByDescending(s => s.Id)
-                .ToPageListAsync(query.PageIndex , query.PageSize, _total);
+                .ToPageListAsync(query.PageIndex, query.PageSize, _total);

            tableLoading = false;
            StateHasChanged();
@ -130,18 +130,18 @@ namespace Learn.VideoAnalysis.Components.Pages
            var data = redisManager.Redis.HMGet<string>(RedisExpandKey.Task(item.Id),
                "Progress", "LastEnum", "StartTime", "ErrorMessage");
            item.Progress = data[0];
-            item.LastEnum = data[1] == null ?default:data[1].ToEnum<RedisChannelEnum>() ?? default;
-            item.StartTimeDic = data[2]==null?null: System.Text.Json.JsonSerializer.Deserialize<Dictionary<RedisChannelEnum, DateTime>>(data[2]) ?? null;
+            item.LastEnum = data[1] == null ? default : data[1].ToEnum<RedisChannelEnum>() ?? default;
+            item.StartTimeDic = data[2] == null ? null : System.Text.Json.JsonSerializer.Deserialize<Dictionary<RedisChannelEnum, DateTime>>(data[2]) ?? null;
            item.ErrorMessage = data[3];
            rowRestartLoading = false;
            var statusStr = "wait";
            var dic = rowData.Data.StartTimeDic;
            if (dic is null)
-                statusStr= "wait";
+                statusStr = "wait";
            else if (!string.IsNullOrEmpty(rowData.Data.ErrorMessage))
-                statusStr= "error";
+                statusStr = "error";
            else if (dic.ContainsKey(RedisChannelEnum.结束任务))
-                statusStr= "finish";
+                statusStr = "finish";
            item.TaskStatus = statusStr;
            StateHasChanged();
        }
@ -158,7 +158,7 @@ namespace Learn.VideoAnalysis.Components.Pages
        }
        private void OnExpand(RowData<VideoTaskDto> rowData)
        {
-            if(rowData.Expanded)
+            if (rowData.Expanded)
                RowRload(rowData);
        }
        /// <summary>
--- a/VideoAnalysisCore/AICore/GPT/DeepSeek/DeepSeek_GPT.cs
+++ b/VideoAnalysisCore/AICore/GPT/DeepSeek/DeepSeek_GPT.cs
@ -554,12 +554,6 @@ namespace VideoAnalysisCore.AICore.GPT.DeepSeek
                    await videoKonwPointDB.InsertRangeAsync(insertData);
                    break;
                }
-                else
-                {
-                    Console.WriteLine(DateTime.Now + $"=>{task} 得分过低/分段长度不匹配  得分{checkRes?.Score} ");
-                    Console.WriteLine(checkRes.Evaluation);
-                    Console.WriteLine();
-                }
                if (questionRes.Any(s => s.KeepTime < 30))
                {
                    Console.WriteLine(DateTime.Now + "=>视频分段过短!! 重新进行AI分析");
@ -618,7 +612,7 @@ namespace VideoAnalysisCore.AICore.GPT.DeepSeek
        {

            var taskId = long.Parse(task);
-            var taskInfo = await videoTaskDB.AsQueryable()
+            var taskInfo = await videoTaskDB.CopyNew().AsQueryable()
                .Where(s => s.Id == taskId)
                .FirstAsync();
            if (taskInfo.VideoType != null&& taskInfo.VideoType!=AttachmentsInfoType.无)
--- a/VideoAnalysisCore/Common/Expand/SqlSugarExpand.cs
+++ b/VideoAnalysisCore/Common/Expand/SqlSugarExpand.cs
@ -76,7 +76,8 @@ namespace VideoAnalysisCore.Common.Expand
                    if (ex.Parametres == null) return;
                    //var originColor = Console.ForegroundColor;
                    //Console.ForegroundColor = ConsoleColor.DarkRed;
-                    Console.WriteLine($"【{DateTime.Now}——错误SQL  - [{config.ConfigId}]】\r\n"+ ex.Message + "\r\n" + UtilMethods.GetSqlString(config.DbType, ex.Sql, (SugarParameter[])ex.Parametres) + "\r\n");
+                    Console.WriteLine($"【{DateTime.Now}——错误SQL  - [{config.ConfigId}]】\r\n"+ ex.Message + "\r\n" 
+                        + UtilMethods.GetSqlString(config.DbType, ex.Sql, (SugarParameter[])ex.Parametres) + "\r\n");
                    Console.WriteLine();
                    //Console.ForegroundColor = originColor;
                };
--- a/VideoAnalysisCore/Common/RedisExpand.cs
+++ b/VideoAnalysisCore/Common/RedisExpand.cs
@ -113,41 +113,40 @@ namespace VideoAnalysisCore.Common
        public void Init()
        {
            var SubscribeList = RedisManager.SubscribeList;
-            SubscribeList.Add(RedisChannelEnum.下载文件, (task) =>
+            SubscribeList.Add(RedisChannelEnum.下载文件, async (task) =>
            {
                using var scope = AppCommon.Services?.CreateScope();
                if (scope is null || scope.ServiceProvider.GetService<DownloadFile>() is null)
                    throw new Exception("DownloadFile 未注入");
                else
-                    return scope.ServiceProvider.GetService<DownloadFile>()?.RunTask(task) ?? Task.CompletedTask;
+                    await scope.ServiceProvider.GetService<DownloadFile>()?.RunTask(task) ;
            });
            SubscribeList.Add(RedisChannelEnum.分离音频, FFMPGE.RunAsync);
            SubscribeList.Add(RedisChannelEnum.解析字幕, senseVoice.RunTask);
            //SubscribeList.Add(RedisChannelEnum.解析说话人,Speaker.Run);
-            SubscribeList.Add(RedisChannelEnum.AI课程类型,
-            (task) =>
+            SubscribeList.Add(RedisChannelEnum.AI课程类型, async (task) =>
            {
                using var scope = AppCommon.Services?.CreateScope();
                if (scope is null || scope.ServiceProvider.GetService<IBserGPT>() is null)
                    throw new Exception("IBserGPT 未注入");
                else
-                    return scope.ServiceProvider.GetService<IBserGPT>()?.GetVideoType(task) ?? Task.CompletedTask;
+                    await scope.ServiceProvider.GetService<IBserGPT>()?.GetVideoType(task);
            });
-            SubscribeList.Add(RedisChannelEnum.AI模型分析, (task) =>
+            SubscribeList.Add(RedisChannelEnum.AI模型分析, async (task) =>
            {
                using var scope = AppCommon.Services?.CreateScope();
                if (scope is null || scope.ServiceProvider.GetService<IBserGPT>() is null)
                    throw new Exception("IBserGPT 未注入");
                else
-                    return scope.ServiceProvider.GetService<IBserGPT>()?.GetKnow(task) ?? Task.CompletedTask;
+                    await scope.ServiceProvider?.GetService<IBserGPT>()?.GetKnow(task);
            });
-            SubscribeList.Add(RedisChannelEnum.AI分析试题, (task) =>
+            SubscribeList.Add(RedisChannelEnum.AI分析试题, async (task) =>
            {
                using var scope = AppCommon.Services?.CreateScope();
                if (scope is null || scope.ServiceProvider.GetService<IBserGPT>() is null)
                    throw new Exception("IBserGPT 未注入");
                else
-                    return scope.ServiceProvider.GetService<IBserGPT>()?.GetVideoQuestion(task) ?? Task.CompletedTask;
+                    await scope.ServiceProvider?.GetService<IBserGPT>()?.GetVideoQuestion(task);
            });
            SubscribeList.Add(RedisChannelEnum.结束任务, redisManager.TaskEnd);

@ -159,7 +158,7 @@ namespace VideoAnalysisCore.Common
    public class RedisManager
    {
        public static bool StopTask { get; set; } = false;
-        public static Dictionary<RedisChannelEnum, Func<string,Task>> SubscribeList = new Dictionary<RedisChannelEnum, Func<string, Task>>();
+        public static Dictionary<RedisChannelEnum, Func<string, Task>> SubscribeList = new Dictionary<RedisChannelEnum, Func<string, Task>>();
        /// <summary>
        /// 队列池
        /// </summary>
@ -178,7 +177,7 @@ namespace VideoAnalysisCore.Common
        /// 缓存GPT任务缓存
        /// </summary>
        /// <param name="taskId"></param>
-        public void SetTaskGPTCached(object taskId,string time, object? data)
+        public void SetTaskGPTCached(object taskId, string time, object? data)
        {
            Redis.Set(RedisExpandKey.TaskGPT(taskId) + ":" + time, data, 3600 * 24);
        }
@ -264,7 +263,7 @@ namespace VideoAnalysisCore.Common
            //if (gptRes is null)
            //    throw new Exception("未能读取到GPT处理结果");
            //删除任务执行状态
-            await Redis.LRemAsync(RedisExpandKey.IDTask,1,task);
+            await Redis.LRemAsync(RedisExpandKey.IDTask, 1, task);
            var taskData = await videoTaskDB
                .GetFirstAsync(s => s.Id == tId);
            if (taskData.Captions == "[]")
@ -275,7 +274,7 @@ namespace VideoAnalysisCore.Common

            //未使用结果暂时屏蔽
            //taskData.ChatAnalysis = JsonSerializer.Serialize(gptRes);
-            taskData.ChatAnalysisScore =0;
+            taskData.ChatAnalysisScore = 0;
            taskData.ErrorMessage = string.Empty;
            taskData.LastEnum = RedisChannelEnum.结束任务;
            taskData.EndTime = DateTime.Now;
@ -291,7 +290,15 @@ namespace VideoAnalysisCore.Common
                    it.LastEnum,
                    it.EndTime
                }).ExecuteCommandAsync();
+            try
+            {
+                ExpandFunction.DeleteTaskFile(tId);
+            }
+            catch (Exception)
+            {

+                throw;
+            }
            //NewTask();
        }

@ -301,14 +308,13 @@ namespace VideoAnalysisCore.Common
        public async void InitChannel()
        {
            if (Redis is null) throw new Exception("redis未初始化");
-
-
            //处理之前程序结束前未能执行完的情况
            var oldTaskCount = Redis.LLen(RedisExpandKey.IDTask);
            if (oldTaskCount > 0)
            {
                var oldTaskArr = Redis.LRange(RedisExpandKey.IDTask, 0, oldTaskCount);
-                Redis.LTrim(RedisExpandKey.IDTask, 1, 0);//删除 redis 列表
+                //不自动清理未完成任务 等待执行完毕/失败后自动清理
+                //Redis.LTrim(RedisExpandKey.IDTask, 1, 0);//删除 redis 列表   
                foreach (var oldTask in oldTaskArr)
                {
                    _ = Task.Run(async () =>
@ -378,7 +384,7 @@ namespace VideoAnalysisCore.Common
                Console.WriteLine($"{DateTime.Now} =>服务端不接收任务");
                return;
            }
-            Task.Run(async () =>
+            Task.Run(() =>
            {
                lock (Redis)
                {
@ -396,7 +402,6 @@ namespace VideoAnalysisCore.Common
                }

            });
-
        }

        /// <summary>
@ -428,7 +433,7 @@ namespace VideoAnalysisCore.Common
        /// </summary>
        /// <param name="taskID"></param>
        /// <returns></returns>
-        public  async Task<bool> ClearTaskError(long taskID) =>await SetTaskError(taskID, string.Empty);
+        public async Task<bool> ClearTaskError(long taskID) => await SetTaskError(taskID, string.Empty);
        /// <summary>
        /// 修改任务的错误信息
        /// </summary>
@ -437,8 +442,9 @@ namespace VideoAnalysisCore.Common
        /// <returns></returns>
        public async Task<bool> SetTaskError(long taskID, string? error)
        {
+            var vDB = AppCommon.Services.GetService<Repository<VideoTask>>();
            Redis.HMSet(RedisExpandKey.Task(taskID), "ErrorMessage", error);
-            return await videoTaskDB.AsUpdateable()
+            return await vDB.CopyNew().AsUpdateable()
                .SetColumns(it => it.ErrorMessage == error)//SetColumns是可以叠加的 写2个就2个字段赋值
                .Where(it => it.Id == taskID)
                .ExecuteCommandAsync() == 1;
@ -464,14 +470,11 @@ namespace VideoAnalysisCore.Common
                    {
                        Redis.HMSet(RedisExpandKey.Task(taskId), "LastEnum", key);
                        Redis.HMSet(RedisExpandKey.Task(taskId), "Progress", 0);
-                        lock (Redis)
-                        {
-                            videoTaskDB.AsUpdateable()
+                        var vDB = AppCommon.Services.GetService<Repository<VideoTask>>();
+                        await vDB.CopyNew().AsUpdateable()
                            .SetColumns(it => it.LastEnum == key)
                            .Where(it => it.Id == tID)
-                                .ExecuteCommand();
-
-                        }
+                            .ExecuteCommandAsync();
                        await action(taskId);
                        return;
                    }
@ -483,7 +486,7 @@ namespace VideoAnalysisCore.Common
                        Console.WriteLine("==============================================");
                        Thread.Sleep(1000);
                        Console.WriteLine(DateTime.Now.ToString("HH:mm:ss") + "-> 稍后后重试." + key + " " + taskId);
-                        if (i+1== tryCount)
+                        if (i + 1 == tryCount)
                            throw;
                    }
                }
--- a/VideoAnalysisCore/Common/Repository.cs
+++ b/VideoAnalysisCore/Common/Repository.cs
@ -13,7 +13,7 @@ namespace VideoAnalysisCore.Common
 {
    public class Repository<T> : SimpleClient<T> where T : class, new()
    {
-        readonly Dictionary<Type, object?> CID= new Dictionary<Type, object?>();
+        readonly Dictionary<Type, object?> CID = new Dictionary<Type, object?>();
        public Repository()
        {
            SwitchConnection();
@ -23,11 +23,12 @@ namespace VideoAnalysisCore.Common
            var t = typeof(T);
            if (CID.ContainsKey(t))
            {
-                base.Context = CID[t]!=null
+                base.Context = CID[t] != null
                    ? DbScoped.Sugar.GetConnectionScope(CID[t])
                    : DbScoped.Sugar;
-                return;
            }
+            else
+            {
                var c = t.GetCustomAttribute<TenantAttribute>();
                if (!CID.ContainsKey(t))
                    CID.Add(t, c?.configId);
@ -35,5 +36,8 @@ namespace VideoAnalysisCore.Common
                    ? DbScoped.Sugar.GetConnectionScope(c.configId)
                     : DbScoped.Sugar;
            }
+            //这个变量也要保证是线程安全的，尽量CopyNew在方法中使用
+            base.Context = base.Context.CopyNew();
+        }
    }
 }
--- a/VideoAnalysisCore/VideoAnalysisCore.csproj
+++ b/VideoAnalysisCore/VideoAnalysisCore.csproj
@ -74,7 +74,7 @@
 		<PackageReference Include="org.k2fsa.sherpa.onnx" Version="1.10.32" />
 		<PackageReference Include="SixLabors.ImageSharp" Version="3.1.7" />
 		<PackageReference Include="SqlSugar.IOC" Version="2.0.0" />
-		<PackageReference Include="SqlSugarCore" Version="5.1.4.170" />
+		<PackageReference Include="SqlSugarCore" Version="5.1.4.205" />
 		<PackageReference Include="UserCenter.Model" Version="1.3.5" />
 		<PackageReference Include="Whisper.net" Version="1.5.0" />
 		<PackageReference Include="Whisper.net.Runtime" Version="1.5.0" />
Author	SHA1	Message	Date
小肥羊	5a6dc49615	修复执行部分任务时没使用await等待导致的数据库连接异常	2025-10-27 10:01:11 +08:00
小肥羊	0a654c72ed	新增任务完成后立马删除视频文件	2025-10-23 17:07:48 +08:00
小肥羊	1151068185	修复尝试解决多线程sql异常问题	2025-10-22 14:18:00 +08:00