XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing Details

Test_IRC_Net8
he 2025-05-27 13:30:14 +08:00
parent e5592c5bfa 1b2bca9f1e
commit ae431df9b5
1 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
IRaCIS.Core.Application/Service/Common/BackDownloadService.cs
View File

@ -2,12 +2,14 @@
using FellowOakDicom; using FellowOakDicom;
using IRaCIS.Core.Application.Helper; using IRaCIS.Core.Application.Helper;
using MassTransit; using MassTransit;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Web; using System.Web;
using static IRaCIS.Core.Domain.Share.StaticData; using static IRaCIS.Core.Domain.Share.StaticData;
@ -20,6 +22,7 @@ namespace IRaCIS.Core.Application.Service
/// </summary> /// </summary>
/// <param name="_trialRepository"></param> /// <param name="_trialRepository"></param>
/// <param name="_oSSService"></param> /// <param name="_oSSService"></param>
[AllowAnonymous]
[ApiExplorerSettings(GroupName = "Common")] [ApiExplorerSettings(GroupName = "Common")]
public class BackDownloadService(IRepository<Trial> _trialRepository, IOSSService _oSSService, IWebHostEnvironment _hostEnvironment) : BaseService public class BackDownloadService(IRepository<Trial> _trialRepository, IOSSService _oSSService, IWebHostEnvironment _hostEnvironment) : BaseService
{ {
@ -73,13 +76,23 @@ namespace IRaCIS.Core.Application.Service
}).FirstOrDefault(); }).FirstOrDefault();
var count = downloadInfo.VisitList.SelectMany(t => t.NoneDicomStudyList).SelectMany(t => t.FileList).Count();
if (downloadInfo != null) if (downloadInfo != null)
{ {
var rootFolder = FileStoreHelper.GetDonwnloadImageFolder(_hostEnvironment); var rootFolder = FileStoreHelper.GetDonwnloadImageFolder(_hostEnvironment);
// 获取无效字符（系统定义的）
string invalidChars = new string(Path.GetInvalidFileNameChars()) + new string(Path.GetInvalidPathChars());
// 用正则表达式替换所有非法字符为下划线或空字符
string pattern = $"[{Regex.Escape(invalidChars)}]";
var regexNo = Regex.Replace(downloadInfo.ResearchProgramNo, pattern, "_");
// 创建一个临时文件夹来存放文件 // 创建一个临时文件夹来存放文件
string trialFolderPath = Path.Combine(rootFolder, $"{downloadInfo.ResearchProgramNo}_{NewId.NextGuid()}"); string trialFolderPath = Path.Combine(rootFolder, $"{regexNo}_{NewId.NextGuid()}");
Directory.CreateDirectory(trialFolderPath); Directory.CreateDirectory(trialFolderPath);
foreach (var visitItem in downloadInfo.VisitList) foreach (var visitItem in downloadInfo.VisitList)
@ -97,18 +110,6 @@ namespace IRaCIS.Core.Application.Service
Directory.CreateDirectory(siteFolderPath); Directory.CreateDirectory(siteFolderPath);
} }
//var subjectDicomFolderPath = Path.Combine(siteFolderPath, $"{visitItem.SubjectCode}_{visitItem.VisitName}_DICOM");
//var subjectNoneDicomFolderPath = Path.Combine(siteFolderPath, $"{visitItem.SubjectCode}_{visitItem.VisitName}_Non-DICOM");
//if (visitItem.NoneDicomStudyList.Count() > 0)
//{
// Directory.CreateDirectory(subjectNoneDicomFolderPath);
//}
//if (visitItem.StudyList.Count() > 0)
//{
// Directory.CreateDirectory(subjectDicomFolderPath);
//}
#endregion #endregion
@ -133,19 +134,21 @@ namespace IRaCIS.Core.Application.Service
} }
} }
foreach (var noneDicomStudy in visitItem.NoneDicomStudyList)
}
foreach (var noneDicomStudy in visitItem.NoneDicomStudyList)
{
string studyNoneDicomFolderPath = Path.Combine(siteFolderPath, $"{visitItem.SubjectCode}_{visitItem.VisitName}_Non-DICOM", $"{noneDicomStudy.StudyCode}_{noneDicomStudy.ImageDate.ToString("yyyy-MM-dd")}_{noneDicomStudy.Modality}");
Directory.CreateDirectory(studyNoneDicomFolderPath);
foreach (var file in noneDicomStudy.FileList)
{ {
string studyNoneDicomFolderPath = Path.Combine(siteFolderPath, $"{visitItem.SubjectCode}_{visitItem.VisitName}_Non-DICOM", $"{noneDicomStudy.StudyCode}_{noneDicomStudy.ImageDate.ToString("yyyy-MM-dd")}_{noneDicomStudy.Modality}"); string destinationPath = Path.Combine(studyNoneDicomFolderPath, Path.GetFileName(file.FileName));
Directory.CreateDirectory(studyNoneDicomFolderPath); //下载到当前目录
await _oSSService.DownLoadFromOSSAsync(HttpUtility.UrlDecode(file.Path), destinationPath);
foreach (var file in noneDicomStudy.FileList)
{
string destinationPath = Path.Combine(studyNoneDicomFolderPath, Path.GetFileName(file.FileName));
//下载到当前目录
await _oSSService.DownLoadFromOSSAsync(HttpUtility.UrlDecode(file.Path), destinationPath);
}
} }
} }