marking
/
Learn.VideoAnalysis
19
0
Fork 0
Code Pull Requests Actions Releases Activity

修复 新增任务流程异常问题

This commit is contained in:
小肥羊 2024-11-14 17:10:26 +08:00
parent 79d024f9f6
commit c597adf48f
5 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VideoAnalysis/Components/Pages/VideoTaskPage.razor.cs
View File

@ -38,7 +38,7 @@ namespace Learn.VideoAnalysis.Components.Pages
async void ReStart(VideoTaskDto query) async void ReStart(VideoTaskDto query)
{ {
var lastEnum = (await RedisExpand.Redis.HMGetAsync<RedisChannelEnum>(RedisExpandKey.Task(query.Id), "LastEnum")).FirstOrDefault() ; var lastEnum = (await RedisExpand.Redis.HMGetAsync<RedisChannelEnum>(RedisExpandKey.Task(query.Id), "LastEnum")).FirstOrDefault() ;
await RedisExpand.SetTaskErrorMessage(query.Id, string.Empty); await RedisExpand.SetTaskErrorMessage(query.Id, null);
RedisExpand.InsertChannel(lastEnum, query.Id); RedisExpand.InsertChannel(lastEnum, query.Id);
} }
private QueryModel<VideoTaskDto> lastQuery = null; private QueryModel<VideoTaskDto> lastQuery = null;

2
VideoAnalysis/Controllers/ApiController.cs
View File

@ -94,7 +94,7 @@ namespace Learn.VideoAnalysis.Controllers
.GetProperties(BindingFlags.Public | BindingFlags.Instance) .GetProperties(BindingFlags.Public | BindingFlags.Instance)
.ToDictionary(s => s.Name, s => s.GetValue(task)); .ToDictionary(s => s.Name, s => s.GetValue(task));
RedisExpand.Redis.HMSet(RedisExpandKey.Task(task.Id), hashEntries); RedisExpand.Redis.HMSet(RedisExpandKey.Task(task.Id), hashEntries);
RedisExpand.Redis.Set(RedisExpandKey.ChannelKey, task.Id); RedisExpand.Redis.LPush(RedisExpandKey.ChannelKey, task.Id);
return Ok(task.Id); return Ok(task.Id);
} }
} }

2
VideoAnalysis/Program.cs
View File

@ -51,6 +51,7 @@ namespace Learn.VideoAnalysis
builder.Configuration.GetSection("AppConfig").Bind(AppCommon.Config); builder.Configuration.GetSection("AppConfig").Bind(AppCommon.Config);
//³õʼ»¯ ²å¼þ //³õʼ»¯ ²å¼þ
builder.Services.InitSqlSugar();
RedisExpand.Init(); RedisExpand.Init();
Speaker.Init(); Speaker.Init();
//SenseVoice.Init(); //SenseVoice.Init();
@ -72,7 +73,6 @@ namespace Learn.VideoAnalysis
//VideoAnalysisRazor.Program.AddClientServices(builder.Services); //VideoAnalysisRazor.Program.AddClientServices(builder.Services);
builder.Services.AddAntDesign(); builder.Services.AddAntDesign();
builder.Services.InitSqlSugar();
builder.Services.AddMapster(); builder.Services.AddMapster();

5
VideoAnalysisCore/Common/DownloadFile.cs
View File

@ -129,9 +129,12 @@ namespace VideoAnalysisCore.Common
.WithFileName(task + fileExtension) .WithFileName(task + fileExtension)
.WithConfiguration(Opt) .WithConfiguration(Opt)
.Build(); .Build();
var pI = 0;
download.DownloadProgressChanged += (object? sender, Downloader.DownloadProgressChangedEventArgs e) => download.DownloadProgressChanged += (object? sender, Downloader.DownloadProgressChangedEventArgs e) =>
{ {
RedisExpand.SetTaskProgress(task, e.ProgressPercentage); pI++;
if(pI%20==0)
RedisExpand.SetTaskProgress(task, e.ProgressPercentage);
}; };
download.DownloadFileCompleted +=async (object? sender, AsyncCompletedEventArgs e) => download.DownloadFileCompleted +=async (object? sender, AsyncCompletedEventArgs e) =>
{ {

4
VideoAnalysisCore/Common/RedisExpand.cs
View File

@ -255,9 +255,13 @@ namespace VideoAnalysisCore.Common
Console.WriteLine(ex.Message); Console.WriteLine(ex.Message);
Console.WriteLine(ex.StackTrace); Console.WriteLine(ex.StackTrace);
Console.WriteLine("=============================================="); Console.WriteLine("==============================================");
//清除失败任务 重新接收任务
await Redis.DelAsync(RedisExpandKey.IDTask);
await ReceivingTaskAsync();
} }
Redis.HMSet(RedisExpandKey.Task(taskID), "ErrorMessage", error); Redis.HMSet(RedisExpandKey.Task(taskID), "ErrorMessage", error);
return await DbScoped.SugarScope.Updateable<VideoTask>() return await DbScoped.SugarScope.Updateable<VideoTask>()
.SetColumns(it => it.ErrorMessage == error)//SetColumns是可以叠加的 写2个就2个字段赋值 .SetColumns(it => it.ErrorMessage == error)//SetColumns是可以叠加的 写2个就2个字段赋值
.Where(it => it.Id == taskID) .Where(it => it.Id == taskID)