diff --git a/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs b/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs index c10e0bfae..3bb2f502a 100644 --- a/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs +++ b/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs @@ -205,16 +205,20 @@ namespace IRaCIS.Core.API.Controllers { public IMapper _mapper { get; set; } public IUserInfo _userInfo { get; set; } + private readonly IMediator _mediator; private readonly IWebHostEnvironment _hostEnvironment; + private readonly IRepository _repository; - public StudyController(IMapper mapper, IUserInfo userInfo, IWebHostEnvironment hostEnvironment) + public StudyController(IMapper mapper, IUserInfo userInfo, IWebHostEnvironment hostEnvironment, IMediator mediator,IRepository repository) { _hostEnvironment = hostEnvironment; + _mediator = mediator; _mapper = mapper; _userInfo = userInfo; + _repository = repository; } @@ -368,7 +372,7 @@ namespace IRaCIS.Core.API.Controllers [HttpPost("ClinicalData/UploadVisitClinicalData/{trialId:guid}/{subjectVisitId:guid}")] [DisableRequestSizeLimit] [Authorize(Policy = IRaCISPolicy.CRC)] - public async Task UploadVisitClinicalData(Guid subjectVisitId, [FromServices] IRepository _repository) + public async Task UploadVisitClinicalData(Guid subjectVisitId) { await QCCommon.VerifyIsCRCSubmmitAsync(_repository, _userInfo, subjectVisitId); @@ -405,7 +409,7 @@ namespace IRaCIS.Core.API.Controllers [HttpPost("NoneDicomStudy/UploadNoneDicomFile/{trialId:guid}/{subjectVisitId:guid}/{noneDicomStudyId:guid}")] [TypeFilter(typeof(TrialResourceFilter))] [Authorize(Policy = IRaCISPolicy.CRC)] - public async Task UploadNoneDicomFile(IFormCollection formCollection, Guid subjectVisitId, Guid noneDicomStudyId, [FromServices] IRepository _repository) + public async Task UploadNoneDicomFile(IFormCollection formCollection, Guid subjectVisitId, Guid noneDicomStudyId) { var startTime = DateTime.Now; @@ -464,10 +468,7 @@ namespace IRaCIS.Core.API.Controllers [HttpPost("QCOperation/UploadVisitCheckExcel/{trialId:guid}")] [TypeFilter(typeof(TrialResourceFilter))] [Authorize(Policy = IRaCISPolicy.PM_APM)] - public async Task UploadVisitCheckExcel(Guid trialId, - [FromServices] IMediator _mediator, - [FromServices] IRepository _repository - ) + public async Task UploadVisitCheckExcel(Guid trialId ) { @@ -664,16 +665,19 @@ namespace IRaCIS.Core.API.Controllers { public IMapper _mapper { get; set; } public IUserInfo _userInfo { get; set; } - private readonly IMediator _mediator; + private readonly IWebHostEnvironment _hostEnvironment; + private readonly IFileService _fileService; - public FileController(IMapper mapper, IUserInfo userInfo, IMediator mediator, IWebHostEnvironment hostEnvironment) + + public FileController(IMapper mapper, IUserInfo userInfo, IWebHostEnvironment hostEnvironment,IFileService fileService) { + _fileService = fileService; _hostEnvironment = hostEnvironment; - _mediator = mediator; + _mapper = mapper; _userInfo = userInfo; } @@ -718,7 +722,7 @@ namespace IRaCIS.Core.API.Controllers /// [HttpPost, Route("downloadDoctorAttachments")] - public async Task> DownloadAttachment(Guid[] doctorIds, [FromServices] IFileService _fileService) + public async Task> DownloadAttachment(Guid[] doctorIds) { var path = await _fileService.CreateDoctorsAllAttachmentZip(doctorIds); @@ -738,7 +742,7 @@ namespace IRaCIS.Core.API.Controllers /// /// [HttpPost, Route("downloadOfficialCV/{language}")] - public async Task> DownloadOfficialResume(int language, Guid[] doctorIds, [FromServices] IFileService _fileService) + public async Task> DownloadOfficialResume(int language, Guid[] doctorIds) { var path = _fileService.CreateDoctorsAllAttachmentZip(doctorIds); @@ -756,7 +760,7 @@ namespace IRaCIS.Core.API.Controllers /// 要下载的附件Id /// [HttpPost, Route("downloadByAttachmentId/{doctorId}")] - public async Task> DownloadAttachmentById(Guid doctorId, Guid[] attachmentIds, [FromServices] IFileService _fileService) + public async Task> DownloadAttachmentById(Guid doctorId, Guid[] attachmentIds) { var path = await _fileService.CreateZipPackageByAttachment(doctorId, attachmentIds); return ResponseOutput.Ok(new UploadFileInfoDTO @@ -772,7 +776,7 @@ namespace IRaCIS.Core.API.Controllers [HttpPost, Route("enroll/downloadResume/{trialId:guid}/{language}")] [TypeFilter(typeof(TrialResourceFilter))] [AllowAnonymous] - public async Task> DownloadResume([FromServices] IFileService _fileService, int language, Guid trialId, Guid[] doctorIdArray) + public async Task> DownloadResume( int language, Guid trialId, Guid[] doctorIdArray) { var userId = Guid.Parse(User.FindFirst("id").Value); var zipPath = await _fileService.CreateOfficialResumeZip(language, doctorIdArray); diff --git a/IRaCIS.Core.API/IRaCIS.Core.API.xml b/IRaCIS.Core.API/IRaCIS.Core.API.xml index a4dec7590..34fc66815 100644 --- a/IRaCIS.Core.API/IRaCIS.Core.API.xml +++ b/IRaCIS.Core.API/IRaCIS.Core.API.xml @@ -164,14 +164,14 @@ Dicom 归档 - + 上传临床数据 多文件 - + 上传非Dicom 文件 支持压缩包 多文件上传 @@ -180,7 +180,7 @@ - + 一致性核查 excel上传 支持三种格式 @@ -206,14 +206,14 @@ 文件类型 - + 下载多个医生的所有附件 - + 下载医生官方简历 @@ -221,7 +221,7 @@ - + 下载指定医生的指定附件 diff --git a/IRaCIS.Core.Application/Helper/FileStoreHelper.cs b/IRaCIS.Core.Application/Helper/FileStoreHelper.cs index c1d336fd3..6f3e59834 100644 --- a/IRaCIS.Core.Application/Helper/FileStoreHelper.cs +++ b/IRaCIS.Core.Application/Helper/FileStoreHelper.cs @@ -268,7 +268,7 @@ public static class FileStoreHelper - var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.UploadFile}/{doctorId}/{attachmentType}/{trustedFileNameForFileStorage}"; + var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.UploadFileFolder}/{doctorId}/{attachmentType}/{trustedFileNameForFileStorage}"; var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage); @@ -281,7 +281,7 @@ public static class FileStoreHelper var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment); //文件类型路径处理 - var uploadFolderPath = Path.Combine(rootPath, StaticData.Folder.UploadFile , attachmentType); + var uploadFolderPath = Path.Combine(rootPath, StaticData.Folder.UploadFileFolder, attachmentType); if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath); @@ -289,7 +289,7 @@ public static class FileStoreHelper - var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.UploadFile}/{attachmentType}/{trustedFileNameForFileStorage}"; + var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.UploadFileFolder}/{attachmentType}/{trustedFileNameForFileStorage}"; var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);