From 2e6bb8e24c8a9c9568aa23b22abce1936ad6efd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Tue, 24 Jun 2025 09:09:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- API/TaskManager.Entity/Entity.cs | 12 +----------- API/TaskManager.EntityFramework/JobDbContext.cs | 17 +++++++++++++++-- .../PublishProfiles/FolderProfile.pubxml.user | 2 +- API/Wood.Admin.WebApi/Startup.cs | 2 +- API/Wood.Service/Commons/CommonService.cs | 2 ++ ...heryRecurringJobInputPageExtendController.cs | 12 +++++++----- .../Controllers/CherySupplierSinvDataService.cs | 2 +- .../Controllers/TaskConifgureController.cs | 2 +- 8 files changed, 29 insertions(+), 22 deletions(-) diff --git a/API/TaskManager.Entity/Entity.cs b/API/TaskManager.Entity/Entity.cs index 9e12a82..7d00720 100644 --- a/API/TaskManager.Entity/Entity.cs +++ b/API/TaskManager.Entity/Entity.cs @@ -191,17 +191,7 @@ namespace TaskManager.Entity [ExporterHeader(DisplayName = "任务ID")] public Guid TaskId { get; set; } - /// - /// 创建时间 - /// - [ExporterHeader(DisplayName = "创建时间")] - public DateTime? CreationTime { set; get; } - /// - /// 备注 - /// - [ExporterHeader(DisplayName = "备注")] - public string? Remark { get; set; } - + } public class QueryFieldInfo diff --git a/API/TaskManager.EntityFramework/JobDbContext.cs b/API/TaskManager.EntityFramework/JobDbContext.cs index 3b5ff03..bd032c1 100644 --- a/API/TaskManager.EntityFramework/JobDbContext.cs +++ b/API/TaskManager.EntityFramework/JobDbContext.cs @@ -66,7 +66,20 @@ namespace TaskManager.EntityFramework // // 配置SQL Server连接 // optionsBuilder.UseSqlServer("Server=192.168.1.228;Database=TaskManager;User ID=sa;Password=ChangkeTec@2021;TrustServerCertificate=True"); //} - optionsBuilder.UseSqlServer("Server = 192.168.1.228; Database = TaskManager2; User ID = sa; Password = ChangkeTec@2021; TrustServerCertificate = True"); + //#if DEBUG + // optionsBuilder.UseSqlServer("Server = 192.168.1.228; Database = TaskManager2; User ID = sa; Password = ChangkeTec@2021; TrustServerCertificate = True"); + //#else + // optionsBuilder.UseSqlServer(GlobalContext.SystemConfig.CustomerDb); + + //#endif + + + optionsBuilder.UseSqlServer(GlobalContext.SystemConfig.CustomerDb); + + + + + } /// /// 来料检验数据 @@ -494,7 +507,7 @@ namespace TaskManager.EntityFramework //控制项代码 b.Property(e => e.VendorFieldCode).HasColumnType("VARCHAR").HasMaxLength(32).IsRequired(); //库存有效日期,格式(yyyy-MM-ddHH:mm:ss) - b.Property(e => e.DeadLine).HasColumnType("VARCHAR").HasMaxLength(10).IsRequired(); + b.Property(e => e.DeadLine).HasColumnType("VARCHAR").HasMaxLength(30).IsRequired(); b.Property(e => e.UId).HasColumnType("bigint").ValueGeneratedOnAdd().IsRequired(); b.Property(e => e.Remark).HasColumnType("NVarchar").HasMaxLength(500).IsRequired(false); b.Property(e => e.ReadState).HasDefaultValue(false); diff --git a/API/Wood.Admin.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user b/API/Wood.Admin.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user index bb5c787..01e8220 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-19T09:18:07.6086155Z||; + True|2025-06-23T09:18:30.1990173Z||;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.Admin.WebApi/Startup.cs b/API/Wood.Admin.WebApi/Startup.cs index a88fb1a..f3ba543 100644 --- a/API/Wood.Admin.WebApi/Startup.cs +++ b/API/Wood.Admin.WebApi/Startup.cs @@ -139,7 +139,7 @@ namespace Wood.Admin.WebApi //异常处理 options.Filters.Add(typeof(ApiExceptionFilter)); //性能记录，日志记录 - options.Filters.Add(typeof(ApiPerformanceLoggingFilter)); + //options.Filters.Add(typeof(ApiPerformanceLoggingFilter)); //结果包装 options.Filters.Add(typeof(ApiResponseWrapperFilter)); }) diff --git a/API/Wood.Service/Commons/CommonService.cs b/API/Wood.Service/Commons/CommonService.cs index 5b2c11b..21f8220 100644 --- a/API/Wood.Service/Commons/CommonService.cs +++ b/API/Wood.Service/Commons/CommonService.cs @@ -1,6 +1,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Configuration; using OfficeOpenXml.FormulaParsing.Excel.Functions.Text; +using SqlSugar; using System; using System.Collections.Generic; using System.Linq; @@ -43,6 +44,7 @@ namespace Wood.Service + TaskSub taskSub = new TaskSub(); taskSub.TableName = taskConfigureObj.TableName; //关联的数据表名称（如：订单表、用户表等，可为空） taskSub.TaskName = taskConfigureObj.TaskName; //任务名称（用于业务层面标识任务，如：数据同步任务、报表生成任务） diff --git a/API/Wood.Service/Controllers/CheryRecurringJobInputPageExtendController.cs b/API/Wood.Service/Controllers/CheryRecurringJobInputPageExtendController.cs index 91c10ad..09bd642 100644 --- a/API/Wood.Service/Controllers/CheryRecurringJobInputPageExtendController.cs +++ b/API/Wood.Service/Controllers/CheryRecurringJobInputPageExtendController.cs @@ -152,7 +152,6 @@ namespace TaskManager.Controllers var content = await Post(Url, Path, inputjson,taskId,version); if (!string.IsNullOrEmpty(content)) { - var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase, @@ -174,10 +173,7 @@ namespace TaskManager.Controllers await _logger.AddError($"调用接口无返回值错误{ex.Message}", TaskName,taskId,version); return null; } - } - - public static string GenerateRandomStringWith8EG() { const string chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; @@ -266,10 +262,14 @@ namespace TaskManager.Controllers { TLOGS log = new TLOGS(); log.InjectFrom(itm); + log.RequestDate = requestDate; + log.TaskId = taskId; + + log.WriteState = true; + log.ReadState = true; logs.Add(log); } await _jobDbContext.BulkInsertAsync(logs); - try { var createtask = new TaskSub(); @@ -285,6 +285,8 @@ namespace TaskManager.Controllers createtask.CreateUser = "admin"; createtask.CreationTime = DateTime.Now; createtask.SyncedPageCount = i; + createtask.ReadState = true; + createtask.WriteState = true; await _jobDbContext.AddAsync(task); // 提交事务 await transaction.CommitAsync(); diff --git a/API/Wood.Service/Controllers/CherySupplierSinvDataService.cs b/API/Wood.Service/Controllers/CherySupplierSinvDataService.cs index 9aa1271..5890169 100644 --- a/API/Wood.Service/Controllers/CherySupplierSinvDataService.cs +++ b/API/Wood.Service/Controllers/CherySupplierSinvDataService.cs @@ -6,7 +6,7 @@ using TaskManager.EntityFramework; namespace TaskManager.Controllers { - public class CherySupplierSinvDataService : CheryRecurringJobInputPageExtendController + public class CherySupplierSinvDataService : CheryRecurringJobInputPageController { public CherySupplierSinvDataService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository repository) : base(httpClient, jobDbContext, log, repository) { diff --git a/API/Wood.Service/Controllers/TaskConifgureController.cs b/API/Wood.Service/Controllers/TaskConifgureController.cs index 381100b..ccfbb29 100644 --- a/API/Wood.Service/Controllers/TaskConifgureController.cs +++ b/API/Wood.Service/Controllers/TaskConifgureController.cs @@ -217,7 +217,7 @@ namespace TaskManager.Controllers case "物料主数据": BackgroundJob.Schedule( //"maaterialdata", // 注意：这里可能存在拼写错误，原始代码中也有 - x => x.CustomInvokeAsync(taskName, client, taskId), + x => x.CustomInvokeAsync(taskName, client,taskId), TimeSpan.FromSeconds(10) ); break;