From b94da76188b834922d2f13365b22208a4bc4049a Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期六, 12 十月 2024 11:33:40 +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 | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 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 df73392..892dfaa 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 (XhsParasHelper.Xhs.DataBase.DbType == Xhs.DbType.PostgreSql)
+ if (Settings.Assets.XhsParasHelper.Xhs.DataBase.DbType == HStation.Assets.DbType.PostgreSql)
{
column.DataType = "character varying";
}
@@ -48,6 +48,24 @@
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),
@@ -56,8 +74,7 @@
typeof(Yw.Entity.SysPropMapping),
typeof(Yw.Entity.SysPropChoice),
typeof(Yw.Entity.SysPropValue),
- typeof(Yw.Entity.SysPropValuePure),
- };
+ };
using (var db = new SqlSugarClient(connectConfig))
{
--
Gitblit v1.9.3