增加执行记录查询接口
continuous-integration/drone/push Build is running
Details
continuous-integration/drone/push Build is running
Details
parent
75cceee734
commit
9a276e3d3c
|
|
@ -1556,6 +1556,20 @@
|
|||
<param name="_attachmentrepository"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:IRaCIS.Core.Application.Service.FileUploadRecordService.GetFileUploadRecordList(IRaCIS.Core.Application.ViewModel.FileUploadRecordQuery)">
|
||||
<summary>
|
||||
上传记录表--里面包含待同步任务
|
||||
</summary>
|
||||
<param name="inQuery"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:IRaCIS.Core.Application.Service.FileUploadRecordService.GetUploadFileSyncRecordList(IRaCIS.Core.Application.ViewModel.UploadFileSyncRecordQuery)">
|
||||
<summary>
|
||||
任务具体执行记录表 (需要同步的才可以点击)
|
||||
</summary>
|
||||
<param name="inQuery"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="T:IRaCIS.Core.Application.Service.FileSyncQueue">
|
||||
<summary>
|
||||
同步队列 信号量
|
||||
|
|
|
|||
|
|
@ -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; }
|
||||
}
|
||||
|
|
@ -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<FileUploadRecord> _fileUploadRecordRepository,
|
||||
public class FileUploadRecordService(IRepository<FileUploadRecord> _fileUploadRecordRepository, IRepository<UploadFileSyncRecord> _uploadFileSyncRecordRepository,
|
||||
IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer, IOptionsMonitor<ObjectStoreServiceOptions> options,
|
||||
IFusionCache _fusionCache, IRepository<Trial> _trialRepository, FileSyncQueue _fileSyncQueue) : BaseService, IFileUploadRecordService
|
||||
{
|
||||
|
||||
ObjectStoreServiceOptions ObjectStoreServiceConfig = options.CurrentValue;
|
||||
|
||||
/// <summary>
|
||||
/// 上传记录表--里面包含待同步任务
|
||||
/// </summary>
|
||||
/// <param name="inQuery"></param>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
public async Task<PageOutput<FileUploadRecordView>> GetFileUploadRecordList(FileUploadRecordQuery inQuery)
|
||||
{
|
||||
|
|
@ -36,6 +42,8 @@ public class FileUploadRecordService(IRepository<FileUploadRecord> _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<FileUploadRecord> _fileUploadRe
|
|||
return pageList;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 任务具体执行记录表 (需要同步的才可以点击)
|
||||
/// </summary>
|
||||
/// <param name="inQuery"></param>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
public async Task<PageOutput<UploadFileSyncRecordView>> GetUploadFileSyncRecordList(UploadFileSyncRecordQuery inQuery)
|
||||
{
|
||||
|
||||
var fileUploadRecordQueryable = _uploadFileSyncRecordRepository
|
||||
|
||||
.WhereIf(inQuery.FileUploadRecordId != null, t => t.FileUploadRecordId >= inQuery.FileUploadRecordId)
|
||||
|
||||
|
||||
.ProjectTo<UploadFileSyncRecordView>(_mapper.ConfigurationProvider);
|
||||
|
||||
var pageList = await fileUploadRecordQueryable.ToPagedListAsync(inQuery);
|
||||
|
||||
return pageList;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -127,6 +127,10 @@ namespace IRaCIS.Core.Application.Service
|
|||
|
||||
CreateMap<FileUploadRecord, FileUploadRecordView>();
|
||||
CreateMap<FileUploadRecord, FileUploadRecordAddOrEdit>().ReverseMap();
|
||||
|
||||
|
||||
CreateMap<UploadFileSyncRecord, UploadFileSyncRecordView>();
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue