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

修改测试AE
continuous-integration/drone/push Build is passing Details

IRC_NewDev
hang 2024-07-18 10:55:47 +08:00
parent ff4136e02d
commit 22c9386101
2 changed files with 20 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
IRC.Core.SCP/Properties/launchSettings.json
View File

@ -1,31 +1,14 @@
{ {
"$schema": "http://json.schemastore.org/launchsettings.json", "$schema": "http://json.schemastore.org/launchsettings.json",
"iisSettings": {
"windowsAuthentication": false,
"anonymousAuthentication": true,
"iisExpress": {
"applicationUrl": "http://localhost:36358",
"sslPort": 0
}
},
"profiles": { "profiles": {
"Test_IRC_SCP": { "Test_IRC_SCP": {
"commandName": "Project", "commandName": "Project",
"dotnetRunMessages": true, "dotnetRunMessages": true,
"launchBrowser": true, "launchBrowser": true,
"launchUrl": "swagger", "launchUrl": "swagger",
"applicationUrl": "http://localhost:5243", "applicationUrl": "http://localhost:6200",
"environmentVariables": { "environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "IRC_Test_SCP" "ASPNETCORE_ENVIRONMENT": "Test_IRC_SCP"
}
},
"IIS Express": {
"commandName": "IISExpress",
"launchBrowser": true,
"launchUrl": "swagger",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
} }
} }
} }

24
IRC.Core.SCP/Service/CStoreSCPService.cs
View File

@ -102,29 +102,37 @@ namespace IRaCIS.Core.SCP.Service
var trialDicomAEList = _trialDicomAERepository.Select(t => new { t.CalledAE, t.TrialId }).ToList(); var trialDicomAEList = _trialDicomAERepository.Select(t => new { t.CalledAE, t.TrialId }).ToList();
var trialCalledAEList = trialDicomAEList.Select(t => t.CalledAE).ToList(); var trialCalledAEList = trialDicomAEList.Select(t => t.CalledAE).ToList();
Log.Logger.Information("当前系统配置：", string.Join('|', trialDicomAEList));
var findCalledAE = trialDicomAEList.Where(t => t.CalledAE == association.CalledAE).FirstOrDefault(); var findCalledAE = trialDicomAEList.Where(t => t.CalledAE == association.CalledAE).FirstOrDefault();
var isCanReceiveIamge = false; var isCanReceiveIamge = false;
if (findCalledAE!=null) if (findCalledAE != null)
{ {
_trialId = findCalledAE.TrialId; _trialId = findCalledAE.TrialId;
var _trialSiteDicomAERepository = _serviceProvider.GetService<IRepository<TrialSiteDicomAE>>(); var _trialSiteDicomAERepository = _serviceProvider.GetService<IRepository<TrialSiteDicomAE>>();
var findTrialSiteAE = _trialSiteDicomAERepository.Where(t=>t.CallingAE==association.CallingAE).FirstOrDefault(); var findTrialSiteAE = _trialSiteDicomAERepository.Where(t => t.CallingAE == association.CallingAE).FirstOrDefault();
if (findTrialSiteAE!=null) if (findTrialSiteAE != null)
{ {
_trialSiteId= findTrialSiteAE.TrialSiteId; _trialSiteId = findTrialSiteAE.TrialSiteId;
isCanReceiveIamge = true; isCanReceiveIamge = true;
} }
} }
if (association.CallingAE == "test-callingAE")
{
isCanReceiveIamge = true;
}
if (!trialCalledAEList.Contains(association.CalledAE) || isCanReceiveIamge==false) if (!trialCalledAEList.Contains(association.CalledAE) || isCanReceiveIamge == false)
{ {
Log.Logger.Warning($"拒绝CalledAE:{association.CalledAE}的连接"); Log.Logger.Warning($"拒绝CalledAE:{association.CalledAE}的连接");
@ -163,8 +171,8 @@ namespace IRaCIS.Core.SCP.Service
_upload.EndTime = DateTime.Now; _upload.EndTime = DateTime.Now;
_upload.StudyCount = _SCPStudyIdList.Count; _upload.StudyCount = _SCPStudyIdList.Count;
_upload.TrialId=_trialId; _upload.TrialId = _trialId;
_upload.TrialSiteId=_trialSiteId; _upload.TrialSiteId = _trialSiteId;
await _SCPImageUploadRepository.AddAsync(_upload, true); await _SCPImageUploadRepository.AddAsync(_upload, true);
@ -292,7 +300,7 @@ namespace IRaCIS.Core.SCP.Service
{ {
try try
{ {
var scpStudyId = await dicomArchiveService.ArchiveDicomFileAsync(request.Dataset,_trialId,_trialSiteId, storeRelativePath, Association.CallingAE, Association.CalledAE); var scpStudyId = await dicomArchiveService.ArchiveDicomFileAsync(request.Dataset, _trialId, _trialSiteId, storeRelativePath, Association.CallingAE, Association.CalledAE);
if (!_SCPStudyIdList.Contains(scpStudyId)) if (!_SCPStudyIdList.Contains(scpStudyId))
{ {