修改上传监控

2024-09-12 14:00:50 +08:00
parent 4048be622f
commit d600862fb0
13 changed files with 105 additions and 50 deletions
@@ -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<OSSFileDTO> UploadedFileList { get; set; } = new List<OSSFileDTO>();

@@ -420,6 +426,14 @@ namespace IRaCIS.Core.API.Controllers
                public string FileType { get; set; }
            }
        }
+
+        /// <summary>
+        /// 非dicom 上传预上传接口
+        /// </summary>
+        /// <param name="preArchiveStudyCommand"></param>
+        /// <param name="_studyService"></param>
+        /// <param name="_studyMonitorRepository"></param>
+        /// <returns></returns>
        [HttpPost, Route("Study/PreArchiveStudy")]
        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
        public async Task<IResponseOutput> 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();

@@ -281,6 +281,15 @@
        <member name="M:IRaCIS.Core.API.Controllers.StudyController.ArchiveStudyNew(System.Guid,System.Guid,System.String,System.Nullable{System.Guid},System.Guid,Microsoft.Extensions.Logging.ILogger{IRaCIS.Core.API.Controllers.UploadDownLoadController},IRaCIS.Core.Application.Contracts.IStudyService,Microsoft.AspNetCore.SignalR.IHubContext{IRaCIS.Core.API.UploadHub,IRaCIS.Core.API.IUploadClient},IRaCIS.Core.Application.Contracts.Dicom.IDicomArchiveService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.StudyMonitor})">
            <summary>Dicom 归档</summary>
        </member>
+        <member name="M:IRaCIS.Core.API.Controllers.StudyController.PreArchiveStudy(IRaCIS.Core.Application.Contracts.PreArchiveStudyCommand,IRaCIS.Core.Application.Contracts.IStudyService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.StudyMonitor})">
+            <summary>
+            非dicom 上传预上传接口
+            </summary>
+            <param name="preArchiveStudyCommand"></param>
+            <param name="_studyService"></param>
+            <param name="_studyMonitorRepository"></param>
+            <returns></returns>
+        </member>
        <member name="M:IRaCIS.Core.API.Controllers.StudyController.UploadNoneDicomFile(IRaCIS.Core.API.Controllers.StudyController.UploadNoneDicomFileCommand,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.NoneDicomStudy},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.StudyMonitor},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.NoneDicomStudyFile})">
            <summary>
            上传非Dicom 文件 支持压缩包 多文件上传