From 208ca42e1c20afafbe48d66259d553ee81eb48ed Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 13 十一月 2024 11:02:43 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
Service/HStation.Service.Assets.Core/05-service/00-core/03-helper/DbFirstHelper.cs | 75 ++++++++++++++++++++++---------------
1 files changed, 45 insertions(+), 30 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 338cbe9..aa87b1c 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
@@ -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,35 +41,50 @@
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.ElbowManage),
- typeof(Entity.ThreeLinkManage),
- typeof(Entity.FourLinkManage),
- typeof(Entity.PipeLineManage),
- typeof(Entity.ValveGroupAndMainMap),
- typeof(Entity.ValveGroup),
- typeof(Entity.AdaptingManage),
- typeof(Entity.PipeLineRoughnessCoefficient),
- 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(Yw.Entity.SysPropValuePure),
- };
+ 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.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.AssetsSprinklerMain),
+ typeof(Entity.AssetsSprinklerSeries),
+ typeof(Entity.AssetsSprinklerCoefficient),
+ typeof(Entity.AssetsManufacturer),
+ typeof(Entity.AssetsManufacturerMapping),
+ typeof(Entity.AssetsUserDefined),
+ typeof(Entity.AssetsPipeCoefficient),
+ typeof(Entity.AssetsPumpTypeSeriesMap),
+ typeof(Entity.AssetsExchangerMain),
+ typeof(Entity.AssetsExchangerMainAndPartMap),
+ typeof(Entity.AssetsExchangerPartMain),
+ typeof(Entity.AssetsExchangerPropContent),
+ typeof(Entity.AssetsExchangerSeries),
+ typeof(Entity.AssetsExchangerCoefficient),
+
+ typeof(Entity.AssetsCompressorPartMain),
+ typeof(Entity.AssetsCompressorMain),
+ typeof(Entity.AssetsCompressorMainAndPartMap),
+ typeof(Entity.AssetsCompressorPropContent),
+ typeof(Entity.AssetsCompressorSeries),
+ typeof(Entity.AssetsCompressorCoefficient),
+ };
using (var db = new SqlSugarClient(connectConfig))
{
--
Gitblit v1.9.3