From 8bdedf4ba3248027b783617ec294ba13ab0885f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Thu, 5 Jun 2025 09:50:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- API/Wood.Admin.WebApi/Startup.cs | 3 ++- .../Controllers/CheryRecurringJobInputPageController.cs | 2 +- .../Controllers/CheryRecurringJobOutPageController.cs | 7 ++++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/API/Wood.Admin.WebApi/Startup.cs b/API/Wood.Admin.WebApi/Startup.cs index 042d041..01fd093 100644 --- a/API/Wood.Admin.WebApi/Startup.cs +++ b/API/Wood.Admin.WebApi/Startup.cs @@ -419,6 +419,7 @@ namespace Wood.Admin.WebApi app.UseEndpoints(endpoints => { endpoints.MapControllerRoute("default", "{controller=ApiHome}/{action=Index}/{id?}"); + endpoints.MapFallbackToFile("Index.Html"); }); //启用 自动job @@ -437,7 +438,7 @@ namespace Wood.Admin.WebApi { c.RoutePrefix = "api-doc"; foreach (var assembly in assembly) - c.SwaggerEndpoint(assembly.GetName().Name + "/swagger.json", "Wood Api " + assembly.GetName().Name); + c.SwaggerEndpoint(assembly.GetName().Name + "/swagger.json", "TaskManager" + assembly.GetName().Name); }); //自动 注册所有事件 app.UseEventBus(assembly); diff --git a/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs b/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs index 3accf55..e6da44c 100644 --- a/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs +++ b/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs @@ -146,7 +146,7 @@ namespace TaskManager.Controllers await _logger.AddError("任务名称或客户端不能为空",taskName); return; } - var sublist = _jobDbContext.TaskSub.Where(p => p.TaskName == taskName && p.WriteState == false && p.Subscriber == client ).ToList(); + var sublist = _jobDbContext.TaskSub.Where(p => taskName.Contains(p.TaskName) && p.WriteState == false && p.Subscriber == client ).ToList(); int pageSize = 1000; if (!sublist.Any()) { diff --git a/API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs b/API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs index bdedc2d..a70ca64 100644 --- a/API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs +++ b/API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs @@ -48,7 +48,12 @@ namespace TaskManager.Controllers var tran = transaction.GetDbTransaction(); try { - _jobDbContext.BulkInsert(list); + await _jobDbContext.BulkInsertAsync(list); + //_jobDbContext.BulkMerge(list, options => { + // options.ColumnPrimaryKeyExpression = p => p.Id; + + + //}); await ConfirmDataInsertAsync(list, _jobDbContext, tran); // 提交事务