From 30e7accdbf19a1210091e96b7a83275183dd32db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Fri, 27 Jun 2025 17:29:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PublishProfiles/FolderProfile.pubxml.user | 2 +- ...ryRecurringJobInputPageExtendController.cs | 20 +++++++++++++++---- .../CherySupplierProMaterialStockService.cs | 2 +- .../Controllers/CustomLogService.cs | 4 ++-- .../Controllers/RecurringJobBaseController.cs | 2 +- .../Controllers/TaskConifgureController.cs | 9 ++++----- 6 files changed, 25 insertions(+), 14 deletions(-) diff --git a/API/Wood.Admin.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user b/API/Wood.Admin.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user index 47295a4..de48d45 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-25T02:54:54.0406425Z||;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-27T06:51:18.0006510Z||;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/CheryRecurringJobInputPageExtendController.cs b/API/Wood.Service/Controllers/CheryRecurringJobInputPageExtendController.cs index f26c01c..a31aaf7 100644 --- a/API/Wood.Service/Controllers/CheryRecurringJobInputPageExtendController.cs +++ b/API/Wood.Service/Controllers/CheryRecurringJobInputPageExtendController.cs @@ -84,7 +84,7 @@ namespace TaskManager.Controllers task.DataCount = total; _jobDbContext.Update(task); await _jobDbContext.SaveChangesAsync(); - var failedCount = await CustomSyncTaskSubTable(taskName, taskId, total, client, tableName, errorlist); + var failedCount = await CustomSyncTaskSubTable(taskName, taskId, total, tableName,Client, errorlist); // await SyncTaskSubTable(TaskName, Client,errorlist); var taskSub = _jobDbContext.TaskSub.FirstOrDefault(p => p.TaskId == taskId); if (failedCount > 0) @@ -596,14 +596,26 @@ namespace TaskManager.Controllers // 新增：记录错误页数和错误记录数 errorRecordCount += records.Count(); + + + if (errorList != null) { - errorList.Add($"第 {i} 页数据保存失败，请检查数据:{result.message}。"); + errorList.Add($"第 {1} 页数据保存失败，请检查数据:{result.message}。"); } - await _logger.AddError($"第 {i} 页数据保存失败，请检查数据:{result.message}。", TaskName, taskId, version, inputjson); + await _logger.AddError($"第 {1} 页数据保存失败，请检查数据:{result.message}。", TaskName, taskId, version, inputjson); + + var firstRecord =_jobDbContext.TaskSub.FirstOrDefault(p => p.TaskId == taskId); + firstRecord.FailedCount = errorRecordCount; + firstRecord.SyncedPageCount = 1; + firstRecord.FailedInfo= $"第 {i} 页数据保存失败，请检查数据:{result.message}"; + _jobDbContext.Update(firstRecord); + _jobDbContext.SaveChanges(); + + // 注意：这里保留了原有的break语句，如果需要继续处理后续页数据，请移除这个break - // break; + break; } await Task.Delay(200); diff --git a/API/Wood.Service/Controllers/CherySupplierProMaterialStockService.cs b/API/Wood.Service/Controllers/CherySupplierProMaterialStockService.cs index e0fd257..12fde2f 100644 --- a/API/Wood.Service/Controllers/CherySupplierProMaterialStockService.cs +++ b/API/Wood.Service/Controllers/CherySupplierProMaterialStockService.cs @@ -7,7 +7,7 @@ namespace TaskManager.Controllers /// /// 来料检验数据 /// - public class SupplierProMaterialStockService : CheryRecurringJobInputPageController + public class SupplierProMaterialStockService : CheryRecurringJobInputPageExtendController { public SupplierProMaterialStockService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository repository) : base(httpClient, jobDbContext, log, repository) { diff --git a/API/Wood.Service/Controllers/CustomLogService.cs b/API/Wood.Service/Controllers/CustomLogService.cs index d69fcb4..0ec9007 100644 --- a/API/Wood.Service/Controllers/CustomLogService.cs +++ b/API/Wood.Service/Controllers/CustomLogService.cs @@ -51,11 +51,11 @@ namespace Wood.Service.Controllers [HttpPost] public async Task GetLogReponseList([FromBody] RequestInputBase requestInputBase) { - var uid = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "Uid").Value; + var uid = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "uId").Value; var first = _context.TaskLogs.FirstOrDefault(x => x.UId == long.Parse(uid)); - var flawtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "Uid"); + var flawtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "uId"); requestInputBase.Condition.Filters.Remove(flawtask); switch (first.TaskName) diff --git a/API/Wood.Service/Controllers/RecurringJobBaseController.cs b/API/Wood.Service/Controllers/RecurringJobBaseController.cs index 4cae335..709fa90 100644 --- a/API/Wood.Service/Controllers/RecurringJobBaseController.cs +++ b/API/Wood.Service/Controllers/RecurringJobBaseController.cs @@ -24,7 +24,7 @@ using Wood.Entity; namespace TaskManager.Controllers { - //[AllowAnonymous] + [AllowAnonymous] public class RecurringJobBaseController :ControllerBase, IDoExecute, IScoped { protected string appKey = "8EG566b9bedd2bf46d"; diff --git a/API/Wood.Service/Controllers/TaskConifgureController.cs b/API/Wood.Service/Controllers/TaskConifgureController.cs index dd860e2..e4033cd 100644 --- a/API/Wood.Service/Controllers/TaskConifgureController.cs +++ b/API/Wood.Service/Controllers/TaskConifgureController.cs @@ -81,7 +81,7 @@ namespace TaskManager.Controllers await Task.Delay(1000); - var taskcount = _context.TaskSub.Count(p => p.TaskName == taskName && p.WriteState == false && taskName!= "来料检验数据"); + var taskcount = _context.TaskSub.Count(p => p.TaskName == taskName && p.WriteState == false ); if (taskcount>0) { return new JsonResult(new @@ -117,18 +117,17 @@ namespace TaskManager.Controllers task.CreationTime = DateTime.Now; task.SyncedPageCount = 0; task.ReadState = true; - if (taskName != "来料检验数据") - { + _context.TaskSub.Add(task); _context.SaveChanges(); await Task.Delay(TimeSpan.FromSeconds(2)); - } + switch (taskName) { case "来料检验数据": BackgroundJob.Schedule( //"materialstock", - x => x.CustomInvokeAsync(taskName, client ), + x => x.CustomInvokeAsync(taskName, client,taskId ), TimeSpan.FromSeconds(10) ); break;