发布日志 增加lili 版本

IRaCIS.Core.API.sln

@@ -17,7 +17,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IRaCIS.Core.Infra.EFCore",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IRaCIS.Core.Infrastructure", "IRaCIS.Core.Infrastructure\IRaCIS.Core.Infrastructure.csproj", "{07EED0F8-08E6-46F3-ACBE-17BC1391BD4C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IRC.Core.SCP", "IRC.Core.SCP\IRC.Core.SCP.csproj", "{ECD08F47-DC1A-484E-BB91-6CDDC8823CC5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IRC.Core.SCP", "IRC.Core.SCP\IRC.Core.SCP.csproj", "{ECD08F47-DC1A-484E-BB91-6CDDC8823CC5}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

IRaCIS.Core.API/appsettings.Event_IRC.json

@@ -64,7 +64,8 @@
     "CompanyName": "Extensive Imaging",
     "CompanyNameCN": "上海展影医疗科技有限公司",
     "CompanyShortName": "Extensive Imaging",
-    "CompanyShortNameCN": "展影医疗"
+    "CompanyShortNameCN": "展影医疗",
+    "IsEnv_US": false
   }
 
 

IRaCIS.Core.API/appsettings.Prod_IRC.json

@@ -68,7 +68,8 @@
     "CompanyName": "Extensive Imaging",
     "CompanyNameCN": "上海展影医疗科技有限公司",
     "CompanyShortName": "Extensive Imaging",
-    "CompanyShortNameCN": "展影医疗"
+    "CompanyShortNameCN": "展影医疗",
+    "IsEnv_US": false
   },
   "SystemPacsConfig": {
     "Port": "11113",

IRaCIS.Core.API/appsettings.Test_IRC.json

@@ -88,7 +88,8 @@
     "CompanyName": "Extensive Imaging",
     "CompanyNameCN": "上海展影医疗科技有限公司",
     "CompanyShortName": "Extensive Imaging",
-    "CompanyShortNameCN": "展影医疗"
+    "CompanyShortNameCN": "展影医疗",
+    "IsEnv_US": false
   },
 
   "SystemPacsConfig": {

IRaCIS.Core.API/appsettings.US_Prod_IRC.json

@@ -73,7 +73,8 @@
     "CompanyNameCN": "上海展影医疗科技有限公司",
     "CompanyShortName": "Elevate Imaging",
     "CompanyShortNameCN": "展影医疗",
-    "SiteUrl": "https://lili.elevateimaging.ai/login"
+    "SiteUrl": "https://lili.elevateimaging.ai/login",
+    "IsEnv_US": true
   },
 
   "SystemPacsConfig": {

IRaCIS.Core.API/appsettings.US_Test_IRC.json

@@ -81,7 +81,8 @@
     "CompanyNameCN": "上海展影医疗科技有限公司",
     "CompanyShortName": "Elevate Imaging",
     "CompanyShortNameCN": "展影医疗",
-    "SiteUrl": "https://lili.test.elevateimaging.ai/login"
+    "SiteUrl": "https://lili.test.elevateimaging.ai/login",
+    "IsEnv_US": true
   },
 
   "SystemPacsConfig": {

IRaCIS.Core.API/appsettings.US_Uat_IRC.json

@@ -85,7 +85,8 @@
     "CompanyNameCN": "上海展影医疗科技有限公司",
     "CompanyShortName": "Elevate Imaging",
     "CompanyShortNameCN": "展影医疗",
-    "SiteUrl": "https://lili.test.elevateimaging.ai/login"
+    "SiteUrl": "https://lili.test.elevateimaging.ai/login",
+    "IsEnv_US": true
   },
 
   "SystemPacsConfig": {

IRaCIS.Core.API/appsettings.Uat_IRC.json

@@ -86,7 +86,8 @@
     "CompanyName": "Extensive Imaging",
     "CompanyNameCN": "上海展影医疗科技有限公司",
     "CompanyShortName": "Extensive Imaging",
-    "CompanyShortNameCN": "展影医疗"
+    "CompanyShortNameCN": "展影医疗",
+    "IsEnv_US": false
   },
 
   "SystemPacsConfig": {

IRaCIS.Core.Application/BusinessFilter/_Config/_AppSettings.cs

@@ -59,6 +59,8 @@ public class SystemEmailSendConfig
     public string CompanyShortName { get; set; } = string.Empty;
 
     public string CompanyShortNameCN { get; set; } = string.Empty;
+
+    public string IsEnv_US { get; set; }
 }
 
 public class SystemEmailSendConfigView

IRaCIS.Core.Application/Service/Common/DTO/PublishLogViewModel.cs

@@ -13,6 +13,8 @@ namespace IRaCIS.Core.Application.ViewModel
         public Guid CreateUserId { get; set; }
         public Guid UpdateUserId { get; set; }
         public DateTime UpdateTime { get; set; }
+
+        public string IsEnv_US { get; set; }
     }
 
     ///<summary>PublishLogQuery  列表查询参数模型</summary>
@@ -32,6 +34,8 @@ namespace IRaCIS.Core.Application.ViewModel
     {
         public Guid? Id { get; set; }
         public string Version { get; set; }
+
+        public string Version_US { get; set; }
         public DateTime? PublishTime { get; set; }
         public string UpdateContent { get; set; }
 
@@ -47,6 +51,7 @@ namespace IRaCIS.Core.Application.ViewModel
     {
         public Guid Id { get; set; }
         public string Version { get; set; }
+        public string Version_US { get; set; }
         public int State { get; set; }
         public DateTime? PublishTime { get; set; }
         public bool IsCurrentVersion { get; set; }

IRaCIS.Core.Application/Service/Common/PublishLogService.cs

@@ -6,8 +6,10 @@
 
 using IRaCIS.Core.Application.Interfaces;
 using IRaCIS.Core.Application.ViewModel;
+using IRaCIS.Core.Domain.Share;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Options;
 
 namespace IRaCIS.Core.Application.Service
 {
@@ -40,7 +42,7 @@ namespace IRaCIS.Core.Application.Service
         {
             Version version;
 
-            if (!Version.TryParse(addOrEditPublishLog.Version, out version))
+            if (!Version.TryParse(addOrEditPublishLog.Version, out version)|| !Version.TryParse(addOrEditPublishLog.Version_US, out version))
             {
                 //"版本号不符合要求"
                 return ResponseOutput.NotOk(_localizer["PublishLog_NotValidVersion"]);
@@ -48,7 +50,7 @@ namespace IRaCIS.Core.Application.Service
 
             var verifyExp1 = new EntityVerifyExp<PublishLog>()
             {
-                VerifyExp = u => u.Version == addOrEditPublishLog.Version,
+                VerifyExp = u => u.Version == addOrEditPublishLog.Version || u.Version_US == addOrEditPublishLog.Version_US,
 
                 //"发布编号不能重复"
                 VerifyMsg = _localizer["PublishLog_RepeatVersion"]
@@ -79,7 +81,7 @@ namespace IRaCIS.Core.Application.Service
         }
 
         [AllowAnonymous]
-        public async Task<PublishLogView> GetCurrentPublishInfo()
+        public async Task<PublishLogView> GetCurrentPublishInfo([FromServices] IOptionsMonitor<SystemEmailSendConfig> _sysEmialConfigOPtion)
         {
             var result = await _publishLogRepository.Where(t => t.IsCurrentVersion == true).ProjectTo<PublishLogView>(_mapper.ConfigurationProvider).FirstOrDefaultAsync();
 
@@ -89,6 +91,7 @@ namespace IRaCIS.Core.Application.Service
                 throw new QueryBusinessObjectNotExistException(_localizer["PublishLog_NoCurrentVersion"]);
             }
 
+            result.IsEnv_US = _sysEmialConfigOPtion.CurrentValue.IsEnv_US;
             return result;
         }
 

IRaCIS.Core.Domain/Common/PublishLog.cs

@@ -6,6 +6,8 @@ public class PublishLog : BaseFullAuditEntity
 {
     public string Version { get; set; } = string.Empty;
 
+    public string Version_US { get; set; }
+
     public DateTime? PublishTime { get; set; }
 
     public string UpdateContent { get; set; } = string.Empty;