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

IRC_NewDev
he 2024-07-09 17:21:17 +08:00
parent 7636c82b11 d1e4863e01
commit 461976f6d3
8 changed files with 40 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -163,6 +163,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.TrialSiteId=_trialSiteId;
await _SCPImageUploadRepository.AddAsync(_upload, true); await _SCPImageUploadRepository.AddAsync(_upload, true);

15
IRaCIS.Core.API/appsettings.US_Prod_IRC.json
View File

@ -62,15 +62,16 @@
}, },
"SystemEmailSendConfig": { "SystemEmailSendConfig": {
"Port": 465, "Port": 587,
"Host": "smtp.qiye.aliyun.com", "Host": "smtp-mail.outlook.com",
"FromEmail": "test@extimaging.com", "FromEmail": "donotreply@elevateimaging.ai",
"FromName": "Test_IRC", "FromName": "LiLi",
"AuthorizationCode": "SHzyyl2021", "AuthorizationCode": "Q#669869497420ul",
"CompanyName": "Elevate Imaging", "CompanyName": "Elevate Imaging Inc.",
"CompanyNameCN": "上海展影医疗科技有限公司", "CompanyNameCN": "上海展影医疗科技有限公司",
"CompanyShortName": "Elevate Imaging", "CompanyShortName": "Elevate Imaging",
"CompanyShortNameCN": "展影医疗" "CompanyShortNameCN": "展影医疗",
"SiteUrl": "https://lili.elevateimaging.ai/login"
} }
} }

19
IRaCIS.Core.API/appsettings.US_Uat_IRC.json
View File

@ -7,8 +7,8 @@
} }
}, },
"ConnectionStrings": { "ConnectionStrings": {
"RemoteNew": "Server=us-mssql-service,1433;Database=Prod_US_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true", "RemoteNew": "Server=us-mssql-service,1433;Database=US_Uat_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
"Hangfire": "Server=us-mssql-service,1433;Database=Prod_US_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true" "Hangfire": "Server=us-mssql-service,1433;Database=US_Uat_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
//"RemoteNew": "Server=44.218.11.19,1435;Database=Prod_US_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true", //"RemoteNew": "Server=44.218.11.19,1435;Database=Prod_US_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
//"Hangfire": "Server=44.218.11.19,1435;Database=Prod_US_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true" //"Hangfire": "Server=44.218.11.19,1435;Database=Prod_US_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
@ -72,15 +72,16 @@
}, },
"SystemEmailSendConfig": { "SystemEmailSendConfig": {
"Port": 465, "Port": 587,
"Host": "smtp.qiye.aliyun.com", "Host": "smtp-mail.outlook.com",
"FromEmail": "test@extimaging.com", "FromEmail": "donotreply@elevateimaging.ai",
"FromName": "Test_IRC", "FromName": "LiLi",
"AuthorizationCode": "SHzyyl2021", "AuthorizationCode": "Q#669869497420ul",
"CompanyName": "Elevate Imaging", "CompanyName": "Elevate Imaging Inc.",
"CompanyNameCN": "上海展影医疗科技有限公司", "CompanyNameCN": "上海展影医疗科技有限公司",
"CompanyShortName": "Elevate Imaging", "CompanyShortName": "Elevate Imaging",
"CompanyShortNameCN": "展影医疗" "CompanyShortNameCN": "展影医疗",
"SiteUrl": "https://lili.test.elevateimaging.ai/login"
} }
} }

6
IRaCIS.Core.Application/Helper/SendEmailHelper.cs
View File

@ -29,7 +29,7 @@ public static class SendEmailHelper
//await smtp.AuthenticateAsync("zhou941003@qq.com", "sqfhlpfdvnexbcab"); //await smtp.AuthenticateAsync("zhou941003@qq.com", "sqfhlpfdvnexbcab");
await smtp.ConnectAsync(_systemEmailConfig.Host, _systemEmailConfig.Port, SecureSocketOptions.SslOnConnect); await smtp.ConnectAsync(_systemEmailConfig.Host, _systemEmailConfig.Port, SecureSocketOptions.Auto);
await smtp.AuthenticateAsync(_systemEmailConfig.FromEmail, _systemEmailConfig.AuthorizationCode); await smtp.AuthenticateAsync(_systemEmailConfig.FromEmail, _systemEmailConfig.AuthorizationCode);
@ -55,7 +55,7 @@ public static class SendEmailHelper
using (var client = new MailKit.Net.Smtp.SmtpClient()) using (var client = new MailKit.Net.Smtp.SmtpClient())
{ {
await client.ConnectAsync(_systemEmailConfig.Host, _systemEmailConfig.Port, SecureSocketOptions.SslOnConnect); await client.ConnectAsync(_systemEmailConfig.Host, _systemEmailConfig.Port, SecureSocketOptions.Auto);
await client.AuthenticateAsync(_systemEmailConfig.FromEmail, _systemEmailConfig.AuthorizationCode); await client.AuthenticateAsync(_systemEmailConfig.FromEmail, _systemEmailConfig.AuthorizationCode);
@ -133,7 +133,7 @@ public static class SendEmailHelper
smtp.ServerCertificateValidationCallback = (s, c, h, e) => true; smtp.ServerCertificateValidationCallback = (s, c, h, e) => true;
await smtp.ConnectAsync(sMTPEmailConfig.Host, sMTPEmailConfig.Port, SecureSocketOptions.SslOnConnect); await smtp.ConnectAsync(sMTPEmailConfig.Host, sMTPEmailConfig.Port, SecureSocketOptions.Auto);
await smtp.AuthenticateAsync(sMTPEmailConfig.UserName, sMTPEmailConfig.AuthorizationCode); await smtp.AuthenticateAsync(sMTPEmailConfig.UserName, sMTPEmailConfig.AuthorizationCode);

7
IRaCIS.Core.Application/Service/TrialSiteUser/DTO/DicomAEViewModel.cs
View File

@ -21,9 +21,9 @@ namespace IRaCIS.Core.Application.ViewModel
public bool IsTestOK { get; set; } public bool IsTestOK { get; set; }
public bool IsPACSConnect { get; set; } //public bool IsPACSConnect { get; set; }
public bool IsTrialPACSConfirmed { get; set; } //public bool IsTrialPACSConfirmed { get; set; }
} }
@ -58,6 +58,9 @@ namespace IRaCIS.Core.Application.ViewModel
public int Port { get; set; } public int Port { get; set; }
public string Modality { get; set; } = string.Empty; public string Modality { get; set; } = string.Empty;
public string Description { get; set; } = string.Empty; public string Description { get; set; } = string.Empty;
public bool IsPACSConnect { get; set; }
} }

4
IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
View File

@ -1162,11 +1162,11 @@ namespace IRaCIS.Core.Application
{ {
var trialInfo = (await _trialRepository.FirstOrDefaultAsync(t => t.Id == trialConfig.TrialId)).IfNullThrowException(); var trialInfo = (await _trialRepository.FirstOrDefaultAsync(t => t.Id == trialConfig.TrialId)).IfNullThrowException();
trialInfo.IsPACSConnect = trialConfig.IsPACSConnect; trialInfo.IsPACSConnect = trialConfig.IsPACSConnect;
trialConfig.IsTrialPACSConfirmed = trialConfig.IsTrialPACSConfirmed; trialInfo.IsTrialPACSConfirmed = trialConfig.IsTrialPACSConfirmed;
trialInfo.UpdateTime = DateTime.Now; trialInfo.UpdateTime = DateTime.Now;
await _trialRepository.SaveChangesAsync(); await _trialRepository.SaveChangesAsync();
return ResponseOutput.Ok(await _repository.SaveChangesAsync()); return ResponseOutput.Ok();
} }

4
IRaCIS.Core.Application/Service/TrialSiteUser/TrialDicomAEService.cs
View File

@ -60,7 +60,7 @@ namespace IRaCIS.Core.Application.Service
public async Task<IResponseOutput<DicomAEView>> GetTrialDicomAE(Guid trialId) public async Task<IResponseOutput<DicomAEView>> GetTrialDicomAE(Guid trialId)
{ {
var dicomAE = _dicomAERepository.Where(t => t.TrialId == trialId).ProjectTo<DicomAEView>(_mapper.ConfigurationProvider).FirstOrDefault(); var dicomAE = _dicomAERepository.Where(t => t.TrialId == trialId).ProjectTo<DicomAEView>(_mapper.ConfigurationProvider).FirstOrDefault();
var trialConfig = _trialRepository.Where(t => t.Id == trialId).Select(t => new { t.IsPACSConnect, t.IsTrialPACSConfirmed }); var trialConfig = await _trialRepository.Where(t => t.Id == trialId).Select(t => new { t.IsPACSConnect, t.IsTrialPACSConfirmed }).FirstOrDefaultAsync();
return ResponseOutput.Ok(dicomAE, trialConfig); return ResponseOutput.Ok(dicomAE, trialConfig);
} }
@ -86,6 +86,8 @@ namespace IRaCIS.Core.Application.Service
// 在此处拷贝automapper 映射 // 在此处拷贝automapper 映射
var entity = await _dicomAERepository.InsertOrUpdateAsync(addOrEditDicomAE, true, verifyExp1); var entity = await _dicomAERepository.InsertOrUpdateAsync(addOrEditDicomAE, true, verifyExp1);
await _trialRepository.UpdatePartialFromQueryAsync(t => t.Id == addOrEditDicomAE.TrialId, u => new Trial() { IsPACSConnect = addOrEditDicomAE.IsPACSConnect }, true);
return ResponseOutput.Ok(entity.Id.ToString()); return ResponseOutput.Ok(entity.Id.ToString());
} }

7
IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig2.cs
View File

@ -49,6 +49,13 @@ namespace IRaCIS.Core.Application.Service
CreateMap<TrialSiteDicomAE, TrialSiteDicomAEView>(); CreateMap<TrialSiteDicomAE, TrialSiteDicomAEView>();
CreateMap<TrialSiteDicomAE, TrialSiteDicomAEAddOrEdit>().ReverseMap(); CreateMap<TrialSiteDicomAE, TrialSiteDicomAEAddOrEdit>().ReverseMap();
CreateMap<TrialDicomAE, DicomAEView>();
CreateMap<DicomAEAddOrEdit, TrialDicomAE>();
} }
} }