From d600862fb026905bbef8dff0c2a332c83d252ad0 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 12 Sep 2024 14:00:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=BC=A0=E7=9B=91?= =?UTF-8?q?=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/UploadDownLoadController.cs | 20 +++++++++++-- IRaCIS.Core.API/IRaCIS.Core.API.xml | 9 ++++++ .../ImageAndDoc/DTO/UnionStudyViewDodel.cs | 3 -- .../Service/ImageAndDoc/StudyService.cs | 2 +- .../Service/Visit/DTO/VisitPointViewModel.cs | 2 ++ IRaCIS.Core.Application/TestService.cs | 14 ++++----- ...MigrationRemoveForeignKeysSqlGenerator .cs | 30 ------------------- .../Convention/NoForeignKeyConvention.cs | 26 ++++++++++++++++ .../NoForeignKeyMigrationsSqlGenerator.cs | 30 +++++++++++++++++++ .../CodeFirstTest/MSSQL/IRCContext.cs | 10 ++++--- ...240912054434_RemoveForeignKey.Designer.cs} | 2 +- ....cs => 20240912054434_RemoveForeignKey.cs} | 0 .../CodeFirstTest/MSSQL/TrialImageDownload.cs | 7 ++++- 13 files changed, 105 insertions(+), 50 deletions(-) delete mode 100644 IRaCIS.Core.Test/CodeFirstTest/MSSQL/Convention/MigrationRemoveForeignKeysSqlGenerator .cs create mode 100644 IRaCIS.Core.Test/CodeFirstTest/MSSQL/Convention/NoForeignKeyConvention.cs create mode 100644 IRaCIS.Core.Test/CodeFirstTest/MSSQL/Convention/NoForeignKeyMigrationsSqlGenerator.cs rename IRaCIS.Core.Test/CodeFirstTest/MSSQL/Migrations/{20240912012757_RemoveForeignKey.Designer.cs => 20240912054434_RemoveForeignKey.Designer.cs} (99%) rename IRaCIS.Core.Test/CodeFirstTest/MSSQL/Migrations/{20240912012757_RemoveForeignKey.cs => 20240912054434_RemoveForeignKey.cs} (100%) diff --git a/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs b/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs index 70e4e83cb..9e394116b 100644 --- a/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs +++ b/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs @@ -407,6 +407,12 @@ namespace IRaCIS.Core.API.Controllers //IR 上传的时候跟任务绑定 public Guid? VisitTaskId { get; set; } + public string RecordPath { get; set; } + + public int FailedFileCount { get; set; } + + public long FileSize { get; set; } + public List UploadedFileList { get; set; } = new List(); @@ -420,6 +426,14 @@ namespace IRaCIS.Core.API.Controllers public string FileType { get; set; } } } + + /// + /// 非dicom 上传预上传接口 + /// + /// + /// + /// + /// [HttpPost, Route("Study/PreArchiveStudy")] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] public async Task PreArchiveStudy(PreArchiveStudyCommand preArchiveStudyCommand, @@ -437,6 +451,7 @@ namespace IRaCIS.Core.API.Controllers IsSuccess = false, UploadStartTime = DateTime.Now, + FileCount=preArchiveStudyCommand.FileCount, IsDicom = preArchiveStudyCommand.IsDicom, IP = _userInfo.IP }; @@ -500,7 +515,9 @@ namespace IRaCIS.Core.API.Controllers noneDicomStudy.FileCount = noneDicomStudy.FileCount + (incommand.VisitTaskId != null ? 0 : incommand.UploadedFileList.Count); - studyMonitor.FileCount = incommand.UploadedFileList.Count; + studyMonitor.RecordPath = incommand.RecordPath; + studyMonitor.FailedFileCount = incommand.FailedFileCount; + studyMonitor.IsSuccess = incommand.FailedFileCount == 0; studyMonitor.FileSize = incommand.UploadedFileList.Sum(t => t.FileFize); studyMonitor.IsDicom = false; studyMonitor.IsDicomReUpload = false; @@ -508,7 +525,6 @@ namespace IRaCIS.Core.API.Controllers studyMonitor.StudyCode = noneDicomStudy.StudyCode; studyMonitor.ArchiveFinishedTime = DateTime.Now; studyMonitor.IP = _userInfo.IP; - studyMonitor.IsSuccess = true; await _noneDicomStudyRepository.SaveChangesAsync(); diff --git a/IRaCIS.Core.API/IRaCIS.Core.API.xml b/IRaCIS.Core.API/IRaCIS.Core.API.xml index 78ee17b23..6573bf84a 100644 --- a/IRaCIS.Core.API/IRaCIS.Core.API.xml +++ b/IRaCIS.Core.API/IRaCIS.Core.API.xml @@ -281,6 +281,15 @@ Dicom 归档 + + + 非dicom 上传预上传接口 + + + + + + 上传非Dicom 文件 支持压缩包 多文件上传 diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs index cc810ca34..ef8f3fdf4 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs @@ -207,9 +207,6 @@ namespace IRaCIS.Core.Application.Contracts [NotDefault] public Guid SubjectVisitId { get; set; } - - public long FileSize { get; set; } - public bool IsDicomReUpload { get; set; } diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs index 412809334..ea22cafaf 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs @@ -90,7 +90,6 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc IP = _userInfo.IP, IsDicomReUpload = preArchiveStudyCommand.IsDicomReUpload, - FileSize = preArchiveStudyCommand.FileSize, FileCount = preArchiveStudyCommand.FileCount, }; @@ -165,6 +164,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc studyMonitor.FailedFileCount = incommand.FailedFileCount; studyMonitor.IsSuccess = incommand.FailedFileCount == 0; studyMonitor.RecordPath = incommand.RecordPath; + studyMonitor.FileSize = incommand.Study.SeriesList.SelectMany(t=>t.InstanceList).Sum(t => t.FileSize); var studyId = IdentifierHelper.CreateGuid(incommand.Study.StudyInstanceUid, incommand.TrialId.ToString()); var findStudy = await _dicomstudyRepository.FirstOrDefaultAsync(t => t.Id == studyId); diff --git a/IRaCIS.Core.Application/Service/Visit/DTO/VisitPointViewModel.cs b/IRaCIS.Core.Application/Service/Visit/DTO/VisitPointViewModel.cs index af0413301..5655cf27c 100644 --- a/IRaCIS.Core.Application/Service/Visit/DTO/VisitPointViewModel.cs +++ b/IRaCIS.Core.Application/Service/Visit/DTO/VisitPointViewModel.cs @@ -281,6 +281,8 @@ namespace IRaCIS.Core.Application.Contracts public bool IsDicom { get; set; } + public int FileCount { get; set; } + } diff --git a/IRaCIS.Core.Application/TestService.cs b/IRaCIS.Core.Application/TestService.cs index 3123ebec9..07b667ab0 100644 --- a/IRaCIS.Core.Application/TestService.cs +++ b/IRaCIS.Core.Application/TestService.cs @@ -110,27 +110,25 @@ namespace IRaCIS.Application.Services { public Guid TestId { get; set; } - public string TestName { get; set; } + public string TestName { get; set; } } - public IResponseOutput TestJson() + public async Task TestJson() { - var trial=new Trial(); - trial.ExperimentName = null; - - _trialRepository.AddAsync(trial,true); + await _trialBodyPartRepository.FirstOrDefaultAsync(); + await _trialBodyPartRepository.Where(t=>t.Trial.Id==Guid.Empty).FirstOrDefaultAsync(); return ResponseOutput.Ok(new TestModel(), IRCEmailPasswordHelper.GenerateRandomPassword(10)); } - public string TestHoliday(DateTime startdate,DateTime endDate) + public string TestHoliday(DateTime startdate, DateTime endDate) { - var timeSpan= HolidayHelper.GetChinaWorkTimeSpan(startdate, endDate); + var timeSpan = HolidayHelper.GetChinaWorkTimeSpan(startdate, endDate); _userRepository.Where(t => t.Id == _userInfo.Id).Select(t => t.FullName).FirstOrDefault(); diff --git a/IRaCIS.Core.Test/CodeFirstTest/MSSQL/Convention/MigrationRemoveForeignKeysSqlGenerator .cs b/IRaCIS.Core.Test/CodeFirstTest/MSSQL/Convention/MigrationRemoveForeignKeysSqlGenerator .cs deleted file mode 100644 index dae427d53..000000000 --- a/IRaCIS.Core.Test/CodeFirstTest/MSSQL/Convention/MigrationRemoveForeignKeysSqlGenerator .cs +++ /dev/null @@ -1,30 +0,0 @@ -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Migrations.Operations; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace IRaCIS.Core.Test.CodeFirstTest.MSSQL.Convention -{ - public class MigrationRemoveForeignKeysSqlGenerator : MigrationsSqlGenerator - { - public MigrationRemoveForeignKeysSqlGenerator(MigrationsSqlGeneratorDependencies dependencies, IMigrationsAnnotationProvider migrationsAnnotations) : base(dependencies) - { - } - - protected override void Generate(Microsoft.EntityFrameworkCore.Migrations.Operations.CreateTableOperation operation, IModel? model, MigrationCommandListBuilder builder, bool terminate = true) - { - operation.ForeignKeys.Clear(); - base.Generate(operation, model, builder, terminate); - } - - protected override void Generate(AddForeignKeyOperation operation, IModel? model, MigrationCommandListBuilder builder, - bool terminate = true) - { - return; - } - } -} diff --git a/IRaCIS.Core.Test/CodeFirstTest/MSSQL/Convention/NoForeignKeyConvention.cs b/IRaCIS.Core.Test/CodeFirstTest/MSSQL/Convention/NoForeignKeyConvention.cs new file mode 100644 index 000000000..6fc9727d6 --- /dev/null +++ b/IRaCIS.Core.Test/CodeFirstTest/MSSQL/Convention/NoForeignKeyConvention.cs @@ -0,0 +1,26 @@ +using Microsoft.EntityFrameworkCore.Metadata.Conventions; +using Microsoft.EntityFrameworkCore.Metadata.Builders; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore; +namespace IRaCIS.Core.Test +{ + /// + /// 这种方式不行 + /// + public class NoForeignKeyConvention : IModelFinalizingConvention + { + public void ProcessModelFinalizing(IConventionModelBuilder modelBuilder, IConventionContext context) + { + foreach (var entityType in modelBuilder.Metadata.GetEntityTypes()) + { + foreach (var foreignKey in entityType.GetForeignKeys()) + { + // 设置删除行为为 NoAction，避免生成外键约束 + foreignKey.Builder.OnDelete(DeleteBehavior.NoAction); + } + } + } + } +} + + diff --git a/IRaCIS.Core.Test/CodeFirstTest/MSSQL/Convention/NoForeignKeyMigrationsSqlGenerator.cs b/IRaCIS.Core.Test/CodeFirstTest/MSSQL/Convention/NoForeignKeyMigrationsSqlGenerator.cs new file mode 100644 index 000000000..0b42a15d9 --- /dev/null +++ b/IRaCIS.Core.Test/CodeFirstTest/MSSQL/Convention/NoForeignKeyMigrationsSqlGenerator.cs @@ -0,0 +1,30 @@ +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Migrations.Operations; +using Microsoft.EntityFrameworkCore.Metadata; +using System.Collections.Generic; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations.Internal; +using Microsoft.EntityFrameworkCore.Storage; + +namespace IRaCIS.Core.Test +{ + public class NoForeignKeyMigrationsSqlGenerator : MigrationsSqlGenerator + { + public NoForeignKeyMigrationsSqlGenerator( + MigrationsSqlGeneratorDependencies dependencies) : base(dependencies) + { + } + + protected override void Generate(MigrationOperation operation, IModel model, MigrationCommandListBuilder builder) + { + if (operation is AddForeignKeyOperation || operation is DropForeignKeyOperation) + { + // 跳过外键的生成 + return; + } + + base.Generate(operation, model, builder); + } + } + +} diff --git a/IRaCIS.Core.Test/CodeFirstTest/MSSQL/IRCContext.cs b/IRaCIS.Core.Test/CodeFirstTest/MSSQL/IRCContext.cs index 64f2c1298..6f7889277 100644 --- a/IRaCIS.Core.Test/CodeFirstTest/MSSQL/IRCContext.cs +++ b/IRaCIS.Core.Test/CodeFirstTest/MSSQL/IRCContext.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; using IRaCIS.Core.Test.CodeFirstTest.MSSQL; -using IRaCIS.Core.Test.CodeFirstTest.MSSQL.Convention; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.Extensions.Options; @@ -42,8 +41,9 @@ public partial class IRCContext : DbContext protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) { - //移除外键约束 - optionsBuilder.ReplaceService(); + + // 替换默认的 MigrationsSqlGenerator + optionsBuilder.ReplaceService(); optionsBuilder.UseSqlServer("Server=106.14.89.110,1433;Database=IRC_Code;User ID=sa;Password=mssql_KnTs2a;TrustServerCertificate=true"); @@ -59,12 +59,14 @@ public partial class IRCContext : DbContext modelBuilder.ApplyConfiguration(configurationInstance); } - + OnModelCreatingPartial(modelBuilder); } protected override void ConfigureConventions(ModelConfigurationBuilder configurationBuilder) { + + //针对字符串使用默认的长度配置 configurationBuilder.Conventions.Add(_ => new MaxStringLengthConvention()); } diff --git a/IRaCIS.Core.Test/CodeFirstTest/MSSQL/Migrations/20240912012757_RemoveForeignKey.Designer.cs b/IRaCIS.Core.Test/CodeFirstTest/MSSQL/Migrations/20240912054434_RemoveForeignKey.Designer.cs similarity index 99% rename from IRaCIS.Core.Test/CodeFirstTest/MSSQL/Migrations/20240912012757_RemoveForeignKey.Designer.cs rename to IRaCIS.Core.Test/CodeFirstTest/MSSQL/Migrations/20240912054434_RemoveForeignKey.Designer.cs index 5604139f2..7cbf95b93 100644 --- a/IRaCIS.Core.Test/CodeFirstTest/MSSQL/Migrations/20240912012757_RemoveForeignKey.Designer.cs +++ b/IRaCIS.Core.Test/CodeFirstTest/MSSQL/Migrations/20240912054434_RemoveForeignKey.Designer.cs @@ -12,7 +12,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; namespace IRaCIS.Core.Test.CodeFirstTest.MSSQL.Migrations { [DbContext(typeof(IRCContext))] - [Migration("20240912012757_RemoveForeignKey")] + [Migration("20240912054434_RemoveForeignKey")] partial class RemoveForeignKey { /// diff --git a/IRaCIS.Core.Test/CodeFirstTest/MSSQL/Migrations/20240912012757_RemoveForeignKey.cs b/IRaCIS.Core.Test/CodeFirstTest/MSSQL/Migrations/20240912054434_RemoveForeignKey.cs similarity index 100% rename from IRaCIS.Core.Test/CodeFirstTest/MSSQL/Migrations/20240912012757_RemoveForeignKey.cs rename to IRaCIS.Core.Test/CodeFirstTest/MSSQL/Migrations/20240912054434_RemoveForeignKey.cs diff --git a/IRaCIS.Core.Test/CodeFirstTest/MSSQL/TrialImageDownload.cs b/IRaCIS.Core.Test/CodeFirstTest/MSSQL/TrialImageDownload.cs index 6410bc381..6451992e6 100644 --- a/IRaCIS.Core.Test/CodeFirstTest/MSSQL/TrialImageDownload.cs +++ b/IRaCIS.Core.Test/CodeFirstTest/MSSQL/TrialImageDownload.cs @@ -151,16 +151,21 @@ namespace IRaCIS.Core.Test.CodeFirstTest.MSSQL #region 测试生成迁移移除外键约束 #endregion + + #region 测试迁移不生成外键约束，ef知道外键关系，但是数据库不保存外键 public class Project : BaseFullAuditEntity { } - public class ProjectUser: BaseFullAuditEntity + public class ProjectUser : BaseFullAuditEntity { //外键 public Guid ProjectId { get; set; } public Project Project { get; set; } } + #endregion + + }