From 502ed6f01f605098d46a1fe9f55f416d5c5c3e13 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期四, 26 九月 2024 17:33:12 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/04-dlg/00-core/ImportXhsProjectFileHelper.cs | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/04-dlg/00-core/ImportXhsProjectFileHelper.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/04-dlg/00-core/ImportXhsProjectFileHelper.cs
index b35d302..63dbfac 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/04-dlg/00-core/ImportXhsProjectFileHelper.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/04-dlg/00-core/ImportXhsProjectFileHelper.cs
@@ -73,7 +73,7 @@
return false;
}
- var revitModel = HStation.Service.RevitParseHelper.FromJsonFile(jsonFileInfo.FullName, out msg);
+ var revitModel = HStation.Service.RevitParseHelper.FromJsonFile(jsonFileInfo.FullName, null, out msg);
if (revitModel == null)
{
feedBackMsg?.Invoke($"{msg}锛侊紒锛�", Color.Red);
@@ -117,7 +117,7 @@
feedBackMsg?.Invoke("姝ｅ湪鍏宠仈姘村姏缁撴瀯妯″瀷...", Color.Black);
- var hydroRelation = new Yw.Dto.AddHydroModelRelationInput();
+ var hydroRelation = new Yw.Vmo.HydroModelRelationVmo();
hydroRelation.ObjectType = HStation.Xhs.DataType.XhsProjectSite;
hydroRelation.ObjectID = projectSiteId;
hydroRelation.ModelID = hydroId;
@@ -125,8 +125,9 @@
hydroRelation.Content = null;
hydroRelation.Description = null;
+
var bllHydroRelation = new Yw.BLL.HydroModelRelation();
- var hydroRelationId = await bllHydroRelation.Insert(hydroRelation);
+ var hydroRelationId = await BLLFactory<Yw.BLL.HydroModelRelation>.Instance.Insert(hydroRelation);
if (hydroRelationId < 1)
{
feedBackMsg?.Invoke("鍏宠仈姘村姏缁撴瀯妯″瀷澶辫触锛侊紒锛�", Color.Red);
--
Gitblit v1.9.3