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

没有生成dir 继续下载
continuous-integration/drone/push Build is passing Details

Test_HIR_Net8
hang 2026-03-12 11:22:30 +08:00
parent e488ba5edd
commit 0fdbb5dde0
2 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
IRaCIS.Core.API/Controllers/UploadDownLoadController.cs
View File

@ -1054,18 +1054,22 @@ namespace IRaCIS.Core.API.Controllers
Log.Logger.Warning($"DIRPath: {study.StudyDIRPath}");
try
if (study.StudyDIRPath.IsNotNullOrEmpty())
{
await using (var entryStream = dicomDirEntry.Open())
await using (var dirStream = await _oSSService.GetStreamFromOSSAsync(study.StudyDIRPath))
try
{
await dirStream.CopyToAsync(entryStream, 32 * 1024, abortToken);
await using (var entryStream = dicomDirEntry.Open())
await using (var dirStream = await _oSSService.GetStreamFromOSSAsync(study.StudyDIRPath))
{
await dirStream.CopyToAsync(entryStream, 32 * 1024, abortToken);
}
}
catch (Exception ex)
{
Log.Logger.Warning($"处理文件{study.StudyCode}DIR失败: {ex.Message}");
}
}
catch (Exception ex)
{
Log.Logger.Warning($"处理文件{study.StudyCode}DIR失败: {ex.Message}");
continue;
}
@ -2076,12 +2080,27 @@ namespace IRaCIS.Core.API.Controllers
var dicomDirPath = $"{visit.SubjectCode}_{visit.VisitName}/{studyTime}_{modalitysStr}/DICOMDIR";
var dicomDirEntry = zip.CreateEntry(dicomDirPath, CompressionLevel.Fastest);
await using (var entryStream = dicomDirEntry.Open())
await using (var dirStream = await _oSSService.GetStreamFromOSSAsync(study.StudyDIRPath))
Log.Logger.Warning($"DIRPath: {study.StudyDIRPath}");
if (study.StudyDIRPath.IsNotNullOrEmpty())
{
await dirStream.CopyToAsync(entryStream, 32 * 1024, abortToken);
try
{
await using (var entryStream = dicomDirEntry.Open())
await using (var dirStream = await _oSSService.GetStreamFromOSSAsync(study.StudyDIRPath))
{
await dirStream.CopyToAsync(entryStream, 32 * 1024, abortToken);
}
}
catch (Exception ex)
{
Log.Logger.Warning($"处理文件{study.StudyCode}DIR失败: {ex.Message}");
}
}
// ---------- IMAGE FILES ----------
foreach (var series in study.SeriesList)
{

2
IRaCIS.Core.Application/TestService.cs
View File

@ -647,7 +647,7 @@ namespace IRaCIS.Core.Application.Service
[UnitOfWork]
public async Task<string> Get([FromServices] IOptionsMonitor<IRCEncreptOption> _encreptResponseMonitor)
{
{
var _IRCEncreptOption = _encreptResponseMonitor.CurrentValue;
var publicKey = Encoding.UTF8.GetString(Convert.FromBase64String(_IRCEncreptOption.Base64RSAPublicKey));