diff --git a/API/Wood.Admin.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user b/API/Wood.Admin.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user index 3946d67..396b902 100644 --- a/API/Wood.Admin.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/API/Wood.Admin.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -3,7 +3,7 @@ <_PublishTargetUrl>D:\QRAPI20250528\API\Wood.Admin.WebApi\bin\Release\net8.0\publish\ - True|2025-06-30T06:40:36.2678533Z||;True|2025-06-30T14:22:36.2631903+08:00||;True|2025-06-30T09:23:23.0780295+08:00||;True|2025-06-28T10:37:00.4525422+08:00||;True|2025-06-27T14:51:18.0006510+08:00||;True|2025-06-27T14:46:36.7189818+08:00||;True|2025-06-25T10:54:54.0406425+08:00||;True|2025-06-24T15:53:07.6141315+08:00||;True|2025-06-24T15:48:22.4116425+08:00||;True|2025-06-24T15:47:33.3794364+08:00||;True|2025-06-24T15:21:28.5600646+08:00||;True|2025-06-23T17:18:30.1990173+08:00||;True|2025-06-23T17:12:33.6485743+08:00||;True|2025-06-19T17:18:07.6086155+08:00||; + True|2025-06-30T07:39:43.7918723Z||;True|2025-06-30T14:40:36.2678533+08:00||;True|2025-06-30T14:22:36.2631903+08:00||;True|2025-06-30T09:23:23.0780295+08:00||;True|2025-06-28T10:37:00.4525422+08:00||;True|2025-06-27T14:51:18.0006510+08:00||;True|2025-06-27T14:46:36.7189818+08:00||;True|2025-06-25T10:54:54.0406425+08:00||;True|2025-06-24T15:53:07.6141315+08:00||;True|2025-06-24T15:48:22.4116425+08:00||;True|2025-06-24T15:47:33.3794364+08:00||;True|2025-06-24T15:21:28.5600646+08:00||;True|2025-06-23T17:18:30.1990173+08:00||;True|2025-06-23T17:12:33.6485743+08:00||;True|2025-06-19T17:18:07.6086155+08:00||; \ No newline at end of file diff --git a/API/Wood.Service/Controllers/RecurringJobBaseController.cs b/API/Wood.Service/Controllers/RecurringJobBaseController.cs index 709fa90..d663477 100644 --- a/API/Wood.Service/Controllers/RecurringJobBaseController.cs +++ b/API/Wood.Service/Controllers/RecurringJobBaseController.cs @@ -27,8 +27,13 @@ namespace TaskManager.Controllers [AllowAnonymous] public class RecurringJobBaseController :ControllerBase, IDoExecute, IScoped { - protected string appKey = "8EG566b9bedd2bf46d"; - protected string appSecret = "48edc4425647425d87f806a1ba492580"; + protected string appKey = "8EG72d84c872668401"; + protected string appSecret = "d092b9df0d504726a3790d7ad6172cc3"; + + + + //protected string appKey = "8EG566b9bedd2bf46d"; + //protected string appSecret = "48edc4425647425d87f806a1ba492580"; protected readonly HttpClient _httpClient; protected readonly JobDbContext _jobDbContext; protected string Client { set; get; } = "Chery"; diff --git a/API/Wood.Service/Controllers/TaskSubService.cs b/API/Wood.Service/Controllers/TaskSubService.cs index 9a911ab..e9cdb8d 100644 --- a/API/Wood.Service/Controllers/TaskSubService.cs +++ b/API/Wood.Service/Controllers/TaskSubService.cs @@ -2,6 +2,7 @@ using Hangfire; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Storage; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using System; @@ -257,12 +258,35 @@ namespace Wood.Service.Controllers try { var mmrplist = _context.Database.GetDbConnection().Query($"select * from {tablename} where taskid='{taskId}' and writestate=0"); - foreach (var item in mmrplist) + using (var transaction = await _context.Database.BeginTransactionAsync(System.Data.IsolationLevel.ReadUncommitted)) { - item.ReadState = false; - item.WriteState = false; + var tran = transaction.GetDbTransaction(); + try + { + var first = _context.TaskSub.FirstOrDefault(p => p.TaskId == taskId); + if (first != null) + { + first.FailedCount = 0; + _context.Update(first); + } + foreach (var item in mmrplist) + { + item.ReadState = false; + item.WriteState = false; + } + + await _context.BulkUpdateAsync(mmrplist,options=>options.Transaction=tran); + _context.SaveChanges(); + // 提交事务 + await transaction.CommitAsync(); + } + catch (Exception ex) + { + await transaction.RollbackAsync(); + + } } - await _context.BulkUpdateAsync(mmrplist); + } catch (Exception ex)