From 6fcff08e4f76bce6076319b5b3a2456c2d94c5fe Mon Sep 17 00:00:00 2001 From: duheng <2784771470@qq.com> Date: 星期二, 26 十一月 2024 09:19:00 +0800 Subject: [PATCH] 提交成套设备界面修改 --- Service/HStation.Service.Assets.Core/05-service/00-core/03-helper/DbFirstHelper.cs | 94 +++++++++++++++++++++++++++++++++++++--------- 1 files changed, 75 insertions(+), 19 deletions(-) diff --git a/Service/HStation.Service.Assets.Core/05-service/00-core/03-helper/DbFirstHelper.cs b/Service/HStation.Service.Assets.Core/05-service/00-core/03-helper/DbFirstHelper.cs index 17a4e1a..24c47eb 100644 --- a/Service/HStation.Service.Assets.Core/05-service/00-core/03-helper/DbFirstHelper.cs +++ b/Service/HStation.Service.Assets.Core/05-service/00-core/03-helper/DbFirstHelper.cs @@ -13,7 +13,7 @@ msg = string.Empty; try { - var connectConfig = HStation.Xhs.ConfigHelper.PostgreSqlConnectionConfig; + var connectConfig = HStation.Assets.ConfigHelper.DefaultConnectionConfig; if (connectConfig == null) { msg = "杩炴帴閰嶇疆鍒濆鍖栧け璐�"; @@ -31,7 +31,7 @@ } if (column.DataType == StaticConfig.CodeFirst_BigString) { - if (Settings.Assets.XhsParasHelper.Xhs.DataBase.DbType == Xhs.DbType.PostgreSql) + if (Settings.AssetsParasHelper.Assets.DataBase.DbType == HStation.Assets.DbType.PostgreSql) { column.DataType = "character varying"; } @@ -41,23 +41,79 @@ var typeList = new List<Type>() { - typeof(Entity.PumpGroup), - typeof(Entity.PumpGroupAndMainMap), - typeof(Entity.PumpMain), - typeof(Entity.PumpMainAndPartMap), - typeof(Entity.PumpPartMain), - typeof(Entity.PumpPropContent), - typeof(Entity.PumpSeries), - typeof(Yw.Entity.SysModule), - typeof(Yw.Entity.SysType), - typeof(Yw.Entity.SysCatalog), - typeof(Yw.Entity.SysPropGroup), - typeof(Yw.Entity.SysProp), - typeof(Yw.Entity.SysPropMapping), - typeof(Yw.Entity.SysPropChoice), - typeof(Yw.Entity.SysPropValue), - typeof(Yw.Entity.SysPropValuePure), - }; + typeof(Entity.AssetsPumpGroup), + typeof(Entity.AssetsPumpGroupAndMainMapping), + typeof(Entity.AssetsPumpMain), + typeof(Entity.AssetsPumpMainAndPartMapping), + typeof(Entity.AssetsPumpPartMain), + typeof(Entity.AssetsPumpPropContent), + typeof(Entity.AssetsPumpSeries), + typeof(Entity.AssetsPumpType), + typeof(Entity.AssetsPumpSeriesTypeMapping), + typeof(Entity.AssetsPumpSeriesManufacturerMapping), + + //闃�闂� + typeof(Entity.AssetsValveMain), + typeof(Entity.AssetsValveSeries), + typeof(Entity.AssetsValveCoefficient), + + //寮ご + typeof(Entity.AssetsElbowMain), + typeof(Entity.AssetsElbowSeries), + typeof(Entity.AssetsElbowCoefficient), + + //涓夐�� + typeof(Entity.AssetsThreelinkMain), + typeof(Entity.AssetsThreelinkSeries), + typeof(Entity.AssetsThreelinkCoefficient), + + //鍥涢�� + typeof(Entity.AssetsFourlinkMain), + typeof(Entity.AssetsFourlinkSeries), + typeof(Entity.AssetsFourlinkCoefficient), + + //绠¢亾 + typeof(Entity.AssetsPipeMain), + typeof(Entity.AssetsPipeSeries), + typeof(Entity.AssetsPipeCoefficient), + + //鍠峰ご + typeof(Entity.AssetsSprinklerMain), + typeof(Entity.AssetsSprinklerSeries), + typeof(Entity.AssetsSprinklerCoefficient), + + //鍘傚晢 + typeof(Entity.AssetsManufacturer), + typeof(Entity.AssetsManufacturerSeries), + + //鑷畾涔� + typeof(Entity.AssetsUserDefined), + + //绌哄帇鏈� + typeof(Entity.AssetsExchangerMain), + typeof(Entity.AssetsExchangerMainAndPartMapping), + typeof(Entity.AssetsExchangerPartMain), + typeof(Entity.AssetsExchangerPropContent), + typeof(Entity.AssetsExchangerSeries), + typeof(Entity.AssetsExchangerCoefficient), + + //鎹㈢儹鍣� + typeof(Entity.AssetsCompressorPartMain), + typeof(Entity.AssetsCompressorMain), + typeof(Entity.AssetsCompressorMainAndPartMapping), + typeof(Entity.AssetsCompressorPropContent), + typeof(Entity.AssetsCompressorSeries), + typeof(Entity.AssetsCompressorCoefficient), + + //鎴愬璁惧 + typeof(Entity.AssetsPackageMain), + typeof(Entity.AssetsPackagePumpMapping), + typeof(Entity.AssetsPackageSeries), + typeof(Entity.AssetsPackageSeriesManufacturerMapping), + typeof(Entity.AssetsPackagePartMain), + typeof(Entity.AssetsPackageMainAndPartMapping), + typeof(Entity.AssetsPackagePropContent), + }; using (var db = new SqlSugarClient(connectConfig)) { -- Gitblit v1.9.3