From 204cdd38472db2b344cece58d9fc59a3839a36d8 Mon Sep 17 00:00:00 2001 From: "DESKTOP-G961P6V\\Zhh" <839860190@qq.com> Date: Sat, 27 Apr 2024 18:37:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=AF=B9=E7=85=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ChargeRequestPlugInsBase.cs | 2 +- .../ColumnReferencePlugIns.cs | 6 +++--- .../ColumnReferencePlugInsBase.cs | 4 ++-- .../ColumnReferencePlugInsDbBase.cs | 2 +- src/Shentun.ColumnReferencePlugIns/LisRequestPlugInsBase.cs | 2 +- .../PatientRegisterPluginsBase.cs | 2 +- src/Shentun.ColumnReferencePlugIns/ThirdPlugInsBase.cs | 2 +- .../ColumnReferenceInterfaceCodeValuesInputDto.cs | 2 +- .../ColumnReferences/ColumnReferenceAppService.cs | 4 ++-- .../ColumnReferenceAppServiceTest.cs | 2 +- .../ColumnReferencePlugInsTest.cs | 4 ++-- .../PeisEntityFrameworkCoreTestModule.cs | 4 ++-- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/Shentun.ColumnReferencePlugIns/ChargeRequestPlugInsBase.cs b/src/Shentun.ColumnReferencePlugIns/ChargeRequestPlugInsBase.cs index 3e5b05d..f00ff2f 100644 --- a/src/Shentun.ColumnReferencePlugIns/ChargeRequestPlugInsBase.cs +++ b/src/Shentun.ColumnReferencePlugIns/ChargeRequestPlugInsBase.cs @@ -8,7 +8,7 @@ namespace Shentun.Peis.PlugIns { public class ChargeRequestPlugInsBase : ThirdPlugInsBase { - public ChargeRequestPlugInsBase(string configParm) : base(configParm) + public ChargeRequestPlugInsBase(string parmValue) : base(parmValue) { } diff --git a/src/Shentun.ColumnReferencePlugIns/ColumnReferencePlugIns.cs b/src/Shentun.ColumnReferencePlugIns/ColumnReferencePlugIns.cs index 00fae32..41d0940 100644 --- a/src/Shentun.ColumnReferencePlugIns/ColumnReferencePlugIns.cs +++ b/src/Shentun.ColumnReferencePlugIns/ColumnReferencePlugIns.cs @@ -18,7 +18,7 @@ namespace Shentun.Peis.PlugIns public class ColumnReferenceCodeValue { - public string Code { get; set; } + public string CodeValue { get; set; } public string DisplayName { get; set; } public string Exter1 { get; set; } public string Exter2 { get; set; } @@ -26,13 +26,13 @@ namespace Shentun.Peis.PlugIns public string Exter4 { get; set; } public string Exter5 { get; set; } public string SimpleCode { get; set; } - public string FilterCode { get; set; } + public string FilterCodeValue { get; set; } public int DisplayOrder { get; set; } } public class ColumnReferenceFilterCodeValue { - public string Code { get; set; } + public string CodeValue { get; set; } public string DiaplayName { get; set; } public int DisplayOrder { get; set; } } diff --git a/src/Shentun.ColumnReferencePlugIns/ColumnReferencePlugInsBase.cs b/src/Shentun.ColumnReferencePlugIns/ColumnReferencePlugInsBase.cs index 857cf1a..d011078 100644 --- a/src/Shentun.ColumnReferencePlugIns/ColumnReferencePlugInsBase.cs +++ b/src/Shentun.ColumnReferencePlugIns/ColumnReferencePlugInsBase.cs @@ -22,7 +22,7 @@ namespace Shentun.Peis.PlugIns private List _columns; private List _interfaceColumns; - public ColumnReferencePlugInsBase(string configParm) + public ColumnReferencePlugInsBase(string parmValue) { AppConfig = new ConfigurationBuilder() .SetBasePath(DirectoryHelper.GetAppDirectory()) // 设置基础路径为当前目录 @@ -32,7 +32,7 @@ namespace Shentun.Peis.PlugIns .GetSection("Default").Value; var configurationBuilder = new ConfigurationBuilder() - .AddJsonStream(new MemoryStream(System.Text.Encoding.UTF8.GetBytes(configParm))); + .AddJsonStream(new MemoryStream(System.Text.Encoding.UTF8.GetBytes(parmValue))); InterfaceConfig = configurationBuilder.Build(); AppSql = InterfaceConfig.GetSection("App").GetSection("Sql").Value; var columns = InterfaceConfig.GetSection("App").GetSection("Columns").Value; diff --git a/src/Shentun.ColumnReferencePlugIns/ColumnReferencePlugInsDbBase.cs b/src/Shentun.ColumnReferencePlugIns/ColumnReferencePlugInsDbBase.cs index 6eac861..33fafb5 100644 --- a/src/Shentun.ColumnReferencePlugIns/ColumnReferencePlugInsDbBase.cs +++ b/src/Shentun.ColumnReferencePlugIns/ColumnReferencePlugInsDbBase.cs @@ -17,7 +17,7 @@ namespace Shentun.Peis.PlugIns protected string InterfaceSql; protected string InterfaceDbType; protected string? InterfaceConnctionStr; - public ColumnReferencePlugInsDbBase(string configParm):base(configParm) + public ColumnReferencePlugInsDbBase(string parmValue):base(parmValue) { InterfaceSql = InterfaceConfig.GetSection("Interface").GetSection("Sql").Value; InterfaceDbType = InterfaceConfig.GetSection("Interface").GetSection("DbType").Value; diff --git a/src/Shentun.ColumnReferencePlugIns/LisRequestPlugInsBase.cs b/src/Shentun.ColumnReferencePlugIns/LisRequestPlugInsBase.cs index 6ee649d..97c4287 100644 --- a/src/Shentun.ColumnReferencePlugIns/LisRequestPlugInsBase.cs +++ b/src/Shentun.ColumnReferencePlugIns/LisRequestPlugInsBase.cs @@ -8,7 +8,7 @@ namespace Shentun.Peis.PlugIns { public class LisRequestPlugInsBase : ThirdPlugInsBase { - public LisRequestPlugInsBase(string configParm) : base(configParm) + public LisRequestPlugInsBase(string parmValue) : base(parmValue) { } diff --git a/src/Shentun.ColumnReferencePlugIns/PatientRegisterPluginsBase.cs b/src/Shentun.ColumnReferencePlugIns/PatientRegisterPluginsBase.cs index 1200d9a..3b10460 100644 --- a/src/Shentun.ColumnReferencePlugIns/PatientRegisterPluginsBase.cs +++ b/src/Shentun.ColumnReferencePlugIns/PatientRegisterPluginsBase.cs @@ -8,7 +8,7 @@ namespace Shentun.Peis.PlugIns { public class PatientRegisterPluginsBase : ThirdPlugInsBase { - public PatientRegisterPluginsBase(string configParm) : base(configParm) + public PatientRegisterPluginsBase(string parmValue) : base(parmValue) { } diff --git a/src/Shentun.ColumnReferencePlugIns/ThirdPlugInsBase.cs b/src/Shentun.ColumnReferencePlugIns/ThirdPlugInsBase.cs index e5875ed..ea3217a 100644 --- a/src/Shentun.ColumnReferencePlugIns/ThirdPlugInsBase.cs +++ b/src/Shentun.ColumnReferencePlugIns/ThirdPlugInsBase.cs @@ -8,7 +8,7 @@ namespace Shentun.Peis.PlugIns { public class ThirdPlugInsBase { - public ThirdPlugInsBase(string configParm) + public ThirdPlugInsBase(string parmValue) { } } diff --git a/src/Shentun.Peis.Application.Contracts/ColumnReferences/ColumnReferenceInterfaceCodeValuesInputDto.cs b/src/Shentun.Peis.Application.Contracts/ColumnReferences/ColumnReferenceInterfaceCodeValuesInputDto.cs index 3f04aeb..bea4f29 100644 --- a/src/Shentun.Peis.Application.Contracts/ColumnReferences/ColumnReferenceInterfaceCodeValuesInputDto.cs +++ b/src/Shentun.Peis.Application.Contracts/ColumnReferences/ColumnReferenceInterfaceCodeValuesInputDto.cs @@ -7,6 +7,6 @@ namespace Shentun.Peis.ColumnReferences public class ColumnReferenceInterfaceCodeValuesInputDto { public Guid ColumnReferenceId { get; set; } - public string Code { get; set;} + public string CodeValue { get; set;} } } diff --git a/src/Shentun.Peis.Application/ColumnReferences/ColumnReferenceAppService.cs b/src/Shentun.Peis.Application/ColumnReferences/ColumnReferenceAppService.cs index 7c981fa..cbc61a1 100644 --- a/src/Shentun.Peis.Application/ColumnReferences/ColumnReferenceAppService.cs +++ b/src/Shentun.Peis.Application/ColumnReferences/ColumnReferenceAppService.cs @@ -329,7 +329,7 @@ namespace Shentun.Peis.ColumnReferences [HttpPost("api/app/ColumnReference/GetInterfaceCodeValuesByAppCode")] public async Task> GetInterfaceCodeValuesByAppCode(ColumnReferenceInterfaceCodeValuesInputDto input) { - var columnReferenceCode = await _columnReferenceCodeRepository.FirstOrDefaultAsync(o => o.CodeValue == input.Code); + var columnReferenceCode = await _columnReferenceCodeRepository.FirstOrDefaultAsync(o => o.CodeValue == input.CodeValue); if(columnReferenceCode == null) { return null; @@ -351,7 +351,7 @@ namespace Shentun.Peis.ColumnReferences { CodeValue = item.InterfaceCodeValue, }; - var interfaceItem = list.Where(o => o.Code == item.InterfaceCodeValue).FirstOrDefault(); + var interfaceItem = list.Where(o => o.CodeValue == item.InterfaceCodeValue).FirstOrDefault(); if(interfaceItem != null) { columnReferenceInterfaceCodeValueDto.DisplayName = interfaceItem.DisplayName; diff --git a/test/Shentun.Peis.Application.Tests/ColumnReferenceAppServiceTest.cs b/test/Shentun.Peis.Application.Tests/ColumnReferenceAppServiceTest.cs index ce74d7c..9f8ddd4 100644 --- a/test/Shentun.Peis.Application.Tests/ColumnReferenceAppServiceTest.cs +++ b/test/Shentun.Peis.Application.Tests/ColumnReferenceAppServiceTest.cs @@ -104,7 +104,7 @@ namespace Shentun.Peis var entity = new ColumnReferenceIdInputDto() { - Id = new Guid("3a1222e4-3249-34a2-85f0-f72e974de543"), + Id = new Guid("035e9caa-3ac8-484a-98be-6c603676228e"), }; diff --git a/test/Shentun.Peis.ColumnReference.Tests/ColumnReferencePlugInsTest.cs b/test/Shentun.Peis.ColumnReference.Tests/ColumnReferencePlugInsTest.cs index 0a1b4be..2725deb 100644 --- a/test/Shentun.Peis.ColumnReference.Tests/ColumnReferencePlugInsTest.cs +++ b/test/Shentun.Peis.ColumnReference.Tests/ColumnReferencePlugInsTest.cs @@ -30,7 +30,7 @@ namespace Shentun.Peis.PlugIns.Tests var items = await columnReferencePlugInsBase.GetAppCodeValuesAsync(); foreach ( var item in items ) { - _output.WriteLine(item.Code + item.DisplayName); + _output.WriteLine(item.CodeValue + item.DisplayName); } } @@ -46,7 +46,7 @@ namespace Shentun.Peis.PlugIns.Tests var items = await columnReferencePlugInsBase.GetInterfaceCodeValuesAsync(); foreach (var item in items) { - _output.WriteLine(item.Code + item.DisplayName); + _output.WriteLine(item.CodeValue + item.DisplayName); } } diff --git a/test/Shentun.Peis.EntityFrameworkCore.Tests/EntityFrameworkCore/PeisEntityFrameworkCoreTestModule.cs b/test/Shentun.Peis.EntityFrameworkCore.Tests/EntityFrameworkCore/PeisEntityFrameworkCoreTestModule.cs index c4c6915..199c37d 100644 --- a/test/Shentun.Peis.EntityFrameworkCore.Tests/EntityFrameworkCore/PeisEntityFrameworkCoreTestModule.cs +++ b/test/Shentun.Peis.EntityFrameworkCore.Tests/EntityFrameworkCore/PeisEntityFrameworkCoreTestModule.cs @@ -40,8 +40,8 @@ public class PeisEntityFrameworkCoreTestModule : AbpModule } private void ConfigurePostGress(IServiceCollection services) { - string connectStr = "Host=140.143.162.39;Port=5432;Database=ShentunPeis070703;User ID=postgres;Password=shentun123"; - //string connectStr = "Host=10.1.12.140;Port=5432;Database=ShentunPeis;User ID=postgres;Password=st123;"; + //string connectStr = "Host=140.143.162.39;Port=5432;Database=ShentunPeis070703;User ID=postgres;Password=shentun123"; + string connectStr = "Host=10.1.12.140;Port=5432;Database=ShentunPeis;User ID=postgres;Password=st123;"; services.Configure(options => {