From 979fa511e23ad4cb8d7e25b813aade4aaec45535 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 23 十一月 2024 00:12:34 +0800
Subject: [PATCH] 核心界面整理
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/04-dlg/00-core/ImportXhsProjectFileHelper.cs | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 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..efe6a3b 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
@@ -1,8 +1,4 @@
-锘縰sing DevExpress.XtraEditors;
-using static DevExpress.XtraEditors.XtraInputBox;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement.Window;
-
-namespace HStation.WinFrmUI
+锘縩amespace HStation.WinFrmUI
{
/// <summary>
///
@@ -73,7 +69,7 @@
return false;
}
- var revitModel = HStation.Service.RevitParseHelper.FromJsonFile(jsonFileInfo.FullName, out msg);
+ var revitModel = HStation.Service.RevitParseHelper.FromJsonFile(jsonFileInfo.FullName, null, out bool result, out List<string> msgList);
if (revitModel == null)
{
feedBackMsg?.Invoke($"{msg}锛侊紒锛�", Color.Red);
@@ -105,8 +101,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 +113,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;
@@ -126,8 +121,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 +170,7 @@
feedBackMsg?.Invoke("姝ｅ湪淇濆瓨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 +199,7 @@
feedBackMsg?.Invoke("姝ｅ湪鍏宠仈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