From 9a276e3d3cabcb48cf056083aac2ebce1306b8fd Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 2 Apr 2026 14:05:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=A7=E8=A1=8C=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IRaCIS.Core.Application.xml | 14 ++++++++ .../Common/DTO/FileUploadRecordViewModel.cs | 27 ++++++++++++++++ .../Service/Common/FileUploadRecordService.cs | 32 ++++++++++++++++++- .../Service/Common/_MapConfig.cs | 4 +++ 4 files changed, 76 insertions(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index ea606cc07..1a5fcbe6a 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -1556,6 +1556,20 @@ + + + 上传记录表--里面包含待同步任务 + + + + + + + 任务具体执行记录表 （需要同步的才可以点击） + + + + 同步队列 信号量 diff --git a/IRaCIS.Core.Application/Service/Common/DTO/FileUploadRecordViewModel.cs b/IRaCIS.Core.Application/Service/Common/DTO/FileUploadRecordViewModel.cs index 961cd08b3..34853c3db 100644 --- a/IRaCIS.Core.Application/Service/Common/DTO/FileUploadRecordViewModel.cs +++ b/IRaCIS.Core.Application/Service/Common/DTO/FileUploadRecordViewModel.cs @@ -19,6 +19,8 @@ public class FileUploadRecordView : FileUploadRecordAddOrEdit public bool? IsSync { get; set; } + [Comment("同步结束时间-最后一个任务的时间")] + public DateTime? SyncFinishedTime { get; set; } } @@ -66,6 +68,10 @@ public class FileUploadRecordQuery : PageInput { public BatchDataType? BatchDataType { get; set; } + public Guid? TrialId { get; set; } + + public bool? IsSystermFile { get; set; } + public string? FileMarkId { get; set; } @@ -104,4 +110,25 @@ public class FileUploadRecordQuery : PageInput +public class UploadFileSyncRecordView +{ + + public DateTime? StartTime { get; set; } + + public DateTime? EndTime { get; set; } + + public jobState JobState { get; set; } + + + public string Msg { get; set; } +} + +public class UploadFileSyncRecordQuery:PageInput +{ + + public Guid? FileUploadRecordId { get; set; } + + + public jobState? JobState { get; set; } +} \ No newline at end of file diff --git a/IRaCIS.Core.Application/Service/Common/FileUploadRecordService.cs b/IRaCIS.Core.Application/Service/Common/FileUploadRecordService.cs index 4af893166..c70d5d1a2 100644 --- a/IRaCIS.Core.Application/Service/Common/FileUploadRecordService.cs +++ b/IRaCIS.Core.Application/Service/Common/FileUploadRecordService.cs @@ -4,6 +4,7 @@ // 生成时间 2026-03-10 06:15:17Z // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 //-------------------------------------------------------------------- +using DocumentFormat.OpenXml.Office2010.ExcelAc; using IRaCIS.Core.Application.Helper; using IRaCIS.Core.Application.Interfaces; using IRaCIS.Core.Application.ViewModel; @@ -21,13 +22,18 @@ using System.Threading.Tasks; namespace IRaCIS.Core.Application.Service; [ApiExplorerSettings(GroupName = "Common")] -public class FileUploadRecordService(IRepository _fileUploadRecordRepository, +public class FileUploadRecordService(IRepository _fileUploadRecordRepository, IRepository _uploadFileSyncRecordRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer, IOptionsMonitor options, IFusionCache _fusionCache, IRepository _trialRepository, FileSyncQueue _fileSyncQueue) : BaseService, IFileUploadRecordService { ObjectStoreServiceOptions ObjectStoreServiceConfig = options.CurrentValue; + /// + /// 上传记录表--里面包含待同步任务 + /// + /// + /// [HttpPost] public async Task> GetFileUploadRecordList(FileUploadRecordQuery inQuery) { @@ -36,6 +42,8 @@ public class FileUploadRecordService(IRepository _fileUploadRe .WhereIf(inQuery.BatchDataType != null, t => t.BatchDataType == inQuery.BatchDataType) .WhereIf(!string.IsNullOrEmpty(inQuery.FileName), t => t.FileName.Contains(inQuery.FileName)) .WhereIf(!string.IsNullOrEmpty(inQuery.FileType), t => t.FileType.Contains(inQuery.FileType)) + .WhereIf(inQuery.TrialId != null, t => t.TrialId == inQuery.TrialId) + .WhereIf(inQuery.IsSystermFile == true, t => t.TrialId == null) .WhereIf(inQuery.IsSync != null, t => t.IsSync == inQuery.IsSync) .WhereIf(inQuery.Priority != null, t => t.Priority == inQuery.Priority) .WhereIf(inQuery.BatchDataType != null, t => t.BatchDataType == inQuery.BatchDataType) @@ -55,6 +63,28 @@ public class FileUploadRecordService(IRepository _fileUploadRe return pageList; } + /// + /// 任务具体执行记录表 （需要同步的才可以点击） + /// + /// + /// + [HttpPost] + public async Task> GetUploadFileSyncRecordList(UploadFileSyncRecordQuery inQuery) + { + + var fileUploadRecordQueryable = _uploadFileSyncRecordRepository + + .WhereIf(inQuery.FileUploadRecordId != null, t => t.FileUploadRecordId >= inQuery.FileUploadRecordId) + + + .ProjectTo(_mapper.ConfigurationProvider); + + var pageList = await fileUploadRecordQueryable.ToPagedListAsync(inQuery); + + return pageList; + } + + diff --git a/IRaCIS.Core.Application/Service/Common/_MapConfig.cs b/IRaCIS.Core.Application/Service/Common/_MapConfig.cs index 83c869aa7..e27ac47e0 100644 --- a/IRaCIS.Core.Application/Service/Common/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/Common/_MapConfig.cs @@ -127,6 +127,10 @@ namespace IRaCIS.Core.Application.Service CreateMap(); CreateMap().ReverseMap(); + + + CreateMap(); + } }