From 9eb94e9eec2e2e164698e34d0481d66093c8655b Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 15 一月 2025 17:40:55 +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/01-import/00-core/ImportXhsProjectHelper.cs | 68 ++++++++++++++++++++-------------
1 files changed, 41 insertions(+), 27 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectHelper.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectHelper.cs
index 14bb91a..68d7fc9 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectHelper.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectHelper.cs
@@ -1,10 +1,4 @@
锘縰sing Castle.Core.Internal;
-using DevExpress.XtraEditors;
-using HStation.Model;
-using HStation.Vmo;
-using Microsoft.Extensions.DependencyInjection;
-using static DevExpress.XtraEditors.XtraInputBox;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement.Window;
namespace HStation.WinFrmUI
{
@@ -43,7 +37,7 @@
feedBackProgress?.Invoke(100, 5);
- #endregion
+ #endregion 绗竴姝� 涓存椂鏂囦欢澶勭悊锛堣繘搴�5%锛�
#region 绗簩姝� 鍒涘缓椤圭洰锛堣繘搴� 10%锛�
@@ -80,7 +74,7 @@
feedBackProgress?.Invoke(100, 10);
- #endregion
+ #endregion 绗簩姝� 鍒涘缓椤圭洰锛堣繘搴� 10%锛�
#region 绗笁姝� 璁剧疆鍦板浘浣嶇疆锛堣繘搴� 20%锛�
@@ -121,7 +115,7 @@
feedBackProgress?.Invoke(100, 20);
- #endregion
+ #endregion 绗笁姝� 璁剧疆鍦板浘浣嶇疆锛堣繘搴� 20%锛�
#region 绗洓姝� 鍘嬬缉鏂囦欢瑙ｆ瀽 锛堣繘搴�30%锛�
@@ -160,7 +154,7 @@
feedBackProgress?.Invoke(100, 30);
- #endregion
+ #endregion 绗洓姝� 鍘嬬缉鏂囦欢瑙ｆ瀽 锛堣繘搴�30%锛�
#region 绗簲姝� 瑙ｆ瀽姘村姏缁撴瀯鏂囦欢 锛堣繘搴�40%锛�
@@ -203,6 +197,7 @@
feedBackMsg?.Invoke($"鏋勪欢绫诲瀷锛歿revitParter.Catalog}锛屾瀯浠剁紪鐮侊細{revitParter.Id}锛屾瀯浠跺睘鎬э細{revitParterPropStatus.PropName}锛岄敊璇細{revitParterPropStatus.StatusInfo} ", Color.Red);
}
break;
+
default: break;
}
}
@@ -218,7 +213,13 @@
}
vm.HydroInfo = HStation.Hydro.TransferHelper.FromRevit
- (vm.RevitModel, out List<Yw.Model.HydroParterScenePropValueInfo> allScenePropValueInfo, out List<Yw.Model.HydroDecoratorInfo> allDecoratorList, out msg);
+ (
+ vm.RevitModel,
+ out List<Yw.Model.HydroParterPropStatusInfo> allPropStatusDbList,
+ out List<Yw.Model.HydroParterScenePropValueInfo> allScenePropValueList,
+ out List<Yw.Model.HydroDecoratorInfo> allDecoratorList,
+ out msg
+ );
if (vm.HydroInfo == null)
{
feedBackMsg?.Invoke($"姘村姏缁撴瀯鏂囦欢瑙ｆ瀽澶辫触锛寋msg}锛侊紒锛�", Color.Red);
@@ -226,6 +227,8 @@
feedBackProgress?.Invoke(100, 100);
return true;
}
+
+ var propStatusHelper = new HydroPropStatusHelper(vm.HydroInfo, allPropStatusDbList);
feedBackMsg?.Invoke("姝ｅ湪杩涜浜у搧鍖归厤...", Color.Black);
var matchingParas = Yw.WinFrmUI.HydroMatchingHelper.Create(vm.HydroInfo);
@@ -246,7 +249,7 @@
}
feedBackMsg?.Invoke("姝ｅ湪杩涜绠＄綉鍙傛暟淇...", Color.Black);
- vm.HydroInfo.RepairParas(out msg);
+ vm.HydroInfo.RepairParas(propStatusHelper, out msg);
if (string.IsNullOrEmpty(msg))
{
feedBackMsg?.Invoke("绠＄綉鍙傛暟淇瀹屾垚銆傘�傘��", Color.Green);
@@ -269,14 +272,27 @@
feedBackMsg?.Invoke("姘村姏缁撴瀯鏂囦欢瑙ｆ瀽鎴愬姛銆傘�傘��", Color.Green);
feedBackProgress?.Invoke(100, 40);
- //vm.HydroInfo = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.GetByID(vm.HydroInfo.ID);
- vm.HydroInfo = await HStation.BLL.XhsHydroInfo.GetByID(vm.HydroInfo.ID);
+ vm.HydroInfo = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.GetByID(vm.HydroInfo.ID);
+ //灞炴�х姸鎬�
+ if (allPropStatusDbList != null && allPropStatusDbList.Count > 0)
+ {
+ await BLLFactory<Yw.BLL.HydroParterPropStatusInfo>.Instance.Save(vm.HydroInfo.ID, allPropStatusDbList);
+ }
+
+ //鍦烘櫙灞炴��
+ if (allScenePropValueList != null && allScenePropValueList.Count > 0)
+ {
+ await BLLFactory<Yw.BLL.HydroParterScenePropValueInfo>.Instance.Save(vm.HydroInfo.ID, HStation.Revit.ConstParas.Scene, allScenePropValueList);
+ }
+
+ //瑁呴グ浠�
if (allDecoratorList != null && allDecoratorList.Count > 0)
{
await BLLFactory<Yw.BLL.HydroDecoratorInfo>.Instance.Save(vm.HydroInfo.ID, HStation.Revit.ConstParas.Scene, allDecoratorList);
}
- #endregion
+
+ #endregion 绗簲姝� 瑙ｆ瀽姘村姏缁撴瀯鏂囦欢 锛堣繘搴�40%锛�
#region 绗叚姝� 鍏宠仈姘村姏缁撴瀯妯″瀷锛堣繘搴� 50%锛�
@@ -303,7 +319,7 @@
feedBackMsg?.Invoke("鍏宠仈姘村姏缁撴瀯妯″瀷鎴愬姛銆傘�傘��", Color.Green);
feedBackProgress?.Invoke(100, 50);
- #endregion
+ #endregion 绗叚姝� 鍏宠仈姘村姏缁撴瀯妯″瀷锛堣繘搴� 50%锛�
#region 绗竷姝� 涓婁紶Revit妯″瀷鏂囦欢锛堣繘搴� 60%锛�
@@ -317,8 +333,8 @@
return true;
}
- var bimfaceId = await Yw.WinFrmUI.BimfaceHelper.UploadFile(rvtFileInfo.FullName);//姝ｅ紡浠ｇ爜
- //var bimfaceId = 10000884893369;//娴嬭瘯鐢ㄤ緥 10000884893369 10000894297457 10000895957527 10000896316958 10000896755736
+ //var bimfaceId = await Yw.WinFrmUI.BimfaceHelper.UploadFile(rvtFileInfo.FullName);//姝ｅ紡浠ｇ爜
+ var bimfaceId = 10000899666805;//娴嬭瘯鐢ㄤ緥 10000884893369 10000894297457 10000895957527 10000896316958 10000896755736
if (bimfaceId < 1)
{
feedBackMsg?.Invoke("Revit妯″瀷鏂囦欢涓婁紶澶辫触锛侊紒锛�", Color.Red);
@@ -330,7 +346,7 @@
feedBackMsg?.Invoke("瑙ｆ瀽Revit妯″瀷鏂囦欢鎴愬姛銆傘�傘��", Color.Green);
feedBackProgress?.Invoke(100, 60);
- #endregion
+ #endregion 绗竷姝� 涓婁紶Revit妯″瀷鏂囦欢锛堣繘搴� 60%锛�
#region 绗叓姝� 淇濆瓨Bimface鏂囦欢 锛堣繘搴� 65%锛�
@@ -357,7 +373,7 @@
feedBackMsg?.Invoke("Bimface鏂囦欢淇濆瓨鎴愬姛銆傘�傘��", Color.Green);
feedBackProgress?.Invoke(100, 65);
- #endregion
+ #endregion 绗叓姝� 淇濆瓨Bimface鏂囦欢 锛堣繘搴� 65%锛�
#region 绗節姝� 鍏宠仈Bimface鏂囦欢锛堣繘搴� 70%锛�
@@ -382,14 +398,14 @@
feedBackMsg?.Invoke("Bimface鏂囦欢鍏宠仈鎴愬姛銆傘�傘��", Color.Green);
feedBackProgress?.Invoke(100, 70);
- #endregion
+ #endregion 绗節姝� 鍏宠仈Bimface鏂囦欢锛堣繘搴� 70%锛�
#region 绗崄姝� 鍙戣捣妯″瀷杞崲锛堣繘搴� 90%锛�
feedBackProgress?.Invoke(100, 60);
feedBackMsg?.Invoke("姝ｅ湪杩涜妯″瀷杞婚噺鍖�...", Color.Black);
- var bimfaceTranslateStatus = await Yw.WinFrmUI.BimfaceHelper.TranslateRvtFile(bimfaceId);//鍙戣捣杞崲
- //var bimfaceTranslateStatus = Yw.BIMFace.eTranslateStatus.Processing;//娴嬭瘯浠ｇ爜
+ //var bimfaceTranslateStatus = await Yw.WinFrmUI.BimfaceHelper.TranslateRvtFile(bimfaceId);//鍙戣捣杞崲
+ var bimfaceTranslateStatus = Yw.BIMFace.eTranslateStatus.Processing;//娴嬭瘯浠ｇ爜
if (bimfaceTranslateStatus != Yw.BIMFace.eTranslateStatus.Success)
{
@@ -423,7 +439,7 @@
feedBackProgress?.Invoke(100, 90);
- #endregion
+ #endregion 绗崄姝� 鍙戣捣妯″瀷杞崲锛堣繘搴� 90%锛�
#region 绗崄涓�姝� 鏇存柊妯″瀷鏂囦欢鐘舵�侊紙杩涘害 100%锛�
@@ -445,9 +461,7 @@
feedBackMsg?.Invoke("椤圭洰瀵煎叆瀹屾垚銆傘�傘��", Color.Green);
return true;
- #endregion
+ #endregion 绗崄涓�姝� 鏇存柊妯″瀷鏂囦欢鐘舵�侊紙杩涘害 100%锛�
}
-
-
}
}
\ No newline at end of file
--
Gitblit v1.9.3