Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

Shuxia Ning

2024-11-08 0cd48df8ccca96a8a0117a508c342a90dc2eacb8

 Service/HStation.Service.Assets.Core/05-service/00-core/03-helper/DbFirstHelper.cs

@@ -31,7 +31,7 @@
                        }
                        if (column.DataType == StaticConfig.CodeFirst_BigString)
                        {
                            if (Settings.Assets.XhsParasHelper.Xhs.DataBase.DbType == HStation.Assets.DbType.PostgreSql)
                            if (Settings.AssetsParasHelper.Assets.DataBase.DbType == HStation.Assets.DbType.PostgreSql)
                            {
                                column.DataType = "character varying";
                            }
@@ -41,40 +41,43 @@

                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(Entity.PumpType),
                   typeof(Entity.ValveMain),
                   typeof(Entity.ValveSeries),
                   typeof(Entity.ElbowMain),
                   typeof(Entity.ElbowSeries),
                   typeof(Entity.ThreeLinkMain),
                   typeof(Entity.ThreeLinkSeries),
                   typeof(Entity.FourLinkMain),
                   typeof(Entity.FourLinkSeries),
                   typeof(Entity.PipeMain),
                   typeof(Entity.PipeSeries),
                    typeof(Entity.NozzleMain),
                   typeof(Entity.NozzleSeries),
                    typeof(Entity.Manufacturer),
                      typeof(Entity.ManufacturerMapping),
                   typeof(Entity.UserDefined),
                   typeof(Entity.PipeRoughnessCoefficient),
                   typeof(Entity.PumpTypeSeriesMap),
                   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(Entity.AssetsPumpGroup),
                   typeof(Entity.AssetsPumpGroupAndMainMap),
                   typeof(Entity.AssetsPumpMain),
                   typeof(Entity.AssetsPumpMainAndPartMap),
                   typeof(Entity.AssetsPumpPartMain),
                   typeof(Entity.AssetsPumpPropContent),
                   typeof(Entity.AssetsPumpSeries),
                   typeof(Entity.AssetsPumpType),
                   typeof(Entity.AssetsValveMain),
                   typeof(Entity.AssetsValveSeries),
                   typeof(Entity.AssetsElbowMain),
                   typeof(Entity.AssetsElbowSeries),
                   typeof(Entity.AssetsThreelinkMain),
                   typeof(Entity.AssetsThreelinkSeries),
                   typeof(Entity.AssetsFourlinkMain),
                   typeof(Entity.AssetsFourlinkSeries),
                   typeof(Entity.AssetsPipeMain),
                   typeof(Entity.AssetsPipeSeries),
                   typeof(Entity.AssetsSprinklerMain),
                   typeof(Entity.AssetsSprinklerSeries),
                   typeof(Entity.AssetsManufacturer),
                   typeof(Entity.AssetsManufacturerMapping),
                   typeof(Entity.AssetsUserDefined),
                   typeof(Entity.AssetsPipeLineCoefficient),
                   typeof(Entity.AssetsPumpTypeSeriesMap),
                    typeof(Entity.AssetsExchangerMain),
                    typeof(Entity.AssetsExchangerMainAndPartMap),
                    typeof(Entity.AssetsExchangerPartMain),
                    typeof(Entity.AssetsExchangerPropContent),
                    typeof(Entity.AssetsExchangerSeries),
                    typeof(Entity.AssetsCompressorPartMain),
                    typeof(Entity.AssetsCompressorMain),
                    typeof(Entity.AssetsCompressorMainAndPartMap),
                    typeof(Entity.AssetsCompressorPropContent),
                    typeof(Entity.AssetsCompressorSeries),
                     typeof(Entity.AssetsValveCoefficient),
                       };

                using (var db = new SqlSugarClient(connectConfig))
                {