From 2cb855ba2e7c4cb9002cf0a4a7f6b11d4a587acd Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期五, 27 九月 2024 16:05:29 +0800
Subject: [PATCH] 删除冗余

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/04-dlg/00-core/ImportXhsProjectFileHelper.cs |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 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 ff6cf1d..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);
@@ -105,8 +105,7 @@
 
             #region 绗叚姝� 鍏宠仈姘村姏缁撴瀯妯″瀷锛堣繘搴� 40%锛�
 
-            var bllXhsProjectSite = new BLL.XhsProjectSiteStd();
-            var projectSite = await bllXhsProjectSite.GetDefaultByProjectID((long)vm.ProjectID);
+            var projectSite = await BLLFactory<HStation.BLL.XhsProjectSite>.Instance.GetDefaultByProjectID((long)vm.ProjectID);
             if (projectSite == null)
             {
                 feedBackMsg?.Invoke("椤圭洰绔欎俊鎭敊璇�...", Color.Red);
@@ -118,7 +117,7 @@
 
             feedBackMsg?.Invoke("姝e湪鍏宠仈姘村姏缁撴瀯妯″瀷...", 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;
@@ -126,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);
@@ -174,7 +174,7 @@
 
             feedBackMsg?.Invoke("姝e湪淇濆瓨Bimface鏂囦欢...", Color.Black);
 
-            var bimfaceFile = new Yw.Dto.AddBimfaceFileInput();
+            var bimfaceFile = new Yw.Vmo.BimfaceFileVmo();
             bimfaceFile.BimfaceId = bimfaceId.ToString();
             bimfaceFile.Name = vm.Name;
             bimfaceFile.ModelType = (int)Yw.Bimface.eModelType.File;
@@ -203,7 +203,7 @@
 
             feedBackMsg?.Invoke("姝e湪鍏宠仈Bimface鏂囦欢...", Color.Black);
 
-            var bimfaceRelation = new Yw.Dto.AddBimfaceFileRelationInput();
+            var bimfaceRelation = new Yw.Vmo.BimfaceFileRelationVmo();
             bimfaceRelation.ObjectType = HStation.Xhs.DataType.XhsProjectSite;
             bimfaceRelation.ObjectID = projectSiteId;
             bimfaceRelation.BimfaceFileID = bimfaceFileId;

--
Gitblit v1.9.3