数据同步增加表,增加项目字段,修改项目配置接口,更新邮件发送包
continuous-integration/drone/push Build is failing Details

Test_IRC_Net8
hang 2026-03-09 17:35:11 +08:00
parent 4b569e8fdb
commit 6427d1f5fb
4 changed files with 100 additions and 5 deletions

View File

@ -47,11 +47,11 @@
<PackageReference Include="fo-dicom.Imaging.ImageSharp" Version="5.2.2" />
<PackageReference Include="fo-dicom.Codecs" Version="5.16.4" />
<PackageReference Include="IP2Region.Net" Version="2.0.2" />
<PackageReference Include="MailKit" Version="4.11.0" />
<PackageReference Include="MailKit" Version="4.15.1" />
<PackageReference Include="Masa.Contrib.Service.MinimalAPIs" Version="1.0.0" />
<PackageReference Include="MaxMind.GeoIP2" Version="5.3.0" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.10" />
<PackageReference Include="MimeKit" Version="4.11.0" />
<PackageReference Include="MimeKit" Version="4.15.1" />
<PackageReference Include="MiniExcel" Version="1.41.2" />
<PackageReference Include="Minio" Version="6.0.3" />
<PackageReference Include="MiniWord" Version="0.9.2" />

View File

@ -101,6 +101,7 @@ namespace IRaCIS.Core.Application.Contracts
public class TrialProcessConfig
{
public TrialDataStore TrialDataStoreType { get; set; }
public List<Guid> CriterionIds { get; set; } = new List<Guid>();
@ -1084,6 +1085,8 @@ namespace IRaCIS.Core.Application.Contracts
public class TrialConfigDTO : BasicTrialConfig
{
public TrialDataStore TrialDataStoreType { get; set; }
[Comment("阅片任务产生之前 采集影像")]
public CollectImagesType CollectImagesEnum { get; set; }

View File

@ -0,0 +1,83 @@
namespace IRaCIS.Core.Domain.Models;
[Comment("整个系统,上传记录表")]
[Table("FileUploadRecord")]
public class FileUploadRecord : BaseFullAuditEntity
{
#region 导航属性
[JsonIgnore]
public Trial Trial { get; set; }
#endregion
public Guid? TrialId { get; set; }
public Guid? SubjectId { get; set; }
public Guid? SubjectVisitId { get; set; }
public string FileName { get; set; }
public long FileSize { get; set; }
public string FileType { get; set; }
public string UploadRegion { get; set; }
[Comment("上传结束时间")]
public DateTime UploadFinishedTime { get; set; }
[StringLength(1000)]
public string Path { get; set; }
[Comment("文件标识ID")]
public string FileMarkId { get; set; }
[Comment("是否需要同步")]
public bool? IsNeedSync { get; set; }
[Comment("是否已同步-最后一个任务的状态")]
public bool? IsSync { get; set; }
[Comment("同步结束时间-最后一个任务的时间")]
public DateTime? syncFinishedTime { get; set; }
public string IP { get; set; }
}
[Comment("同步任务记录表")]
[Table("FileUploadRecord")]
public class UploadFileSyncRecord
{
#region 导航属性
[JsonIgnore]
public FileUpload FileUpload { get; set; }
#endregion
public Guid FileUploadId { get; set; }
public jobState JobState { get; set; }
public string Msg { get; set; }
}
public enum jobState
{
//待启动
PENDING= 0,
//上传中
RUNNING= 1,
SUCCESS= 2,
FAILED= 3,
CANCELLED= 4
}

View File

@ -133,7 +133,7 @@ public partial class Trial : BaseFullDeleteAuditEntity
public string AttendedReviewerTypes { get; set; } = string.Empty;
[StringLength(1000)]
[StringLength(2000)]
public string TrialExtraConfigJsonStr { get; set; } = string.Empty;
public bool VisitPlanConfirmed { get; set; }
@ -259,7 +259,7 @@ public partial class Trial : BaseFullDeleteAuditEntity
/// 图像格式
/// </summary>
[StringLength(2000)]
public List<string> ImageFormatList { get; set; } = new List<string>() {"jpg","jpeg","png","bmp","pdf","zip","mp4" };
public List<string> ImageFormatList { get; set; } = new List<string>() { "jpg", "jpeg", "png", "bmp", "pdf", "zip", "mp4" };
#endregion
#region 邮件配置
@ -316,6 +316,15 @@ public partial class Trial : BaseFullDeleteAuditEntity
/// </summary>
public bool? IsImageQualityControl { get; set; }
public TrialDataStore TrialDataStoreType { get; set; }
}
public enum TrialDataStore
{
SingleCenter = 0,
MUtiCenter = 1,
}
public enum CollectImagesType