From 0711485ecb4fe66fbe820478d92eb9f04b77c042 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期四, 24 十月 2024 13:51:38 +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 | 109 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 87 insertions(+), 22 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 fb2c782..20d4a85 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,5 +1,6 @@
锘縰sing Castle.Core.Internal;
using DevExpress.XtraEditors;
+using HStation.Model;
using HStation.Vmo;
using static DevExpress.XtraEditors.XtraInputBox;
using static System.Windows.Forms.VisualStyles.VisualStyleElement.Window;
@@ -41,7 +42,7 @@
feedBackProgress?.Invoke(100, 5);
- #endregion
+ #endregion 绗竴姝� 涓存椂鏂囦欢澶勭悊锛堣繘搴�5%锛�
#region 绗簩姝� 鍒涘缓椤圭洰锛堣繘搴� 10%锛�
@@ -77,7 +78,7 @@
feedBackProgress?.Invoke(100, 10);
- #endregion
+ #endregion 绗簩姝� 鍒涘缓椤圭洰锛堣繘搴� 10%锛�
#region 绗笁姝� 璁剧疆鍦板浘浣嶇疆锛堣繘搴� 20%锛�
@@ -112,7 +113,7 @@
feedBackProgress?.Invoke(100, 20);
- #endregion
+ #endregion 绗笁姝� 璁剧疆鍦板浘浣嶇疆锛堣繘搴� 20%锛�
#region 绗洓姝� 鍘嬬缉鏂囦欢瑙ｆ瀽 锛堣繘搴�25%锛�
@@ -139,12 +140,11 @@
return true;
}
-
feedBackMsg?.Invoke("妯″瀷鏂囦欢瑙ｆ瀽鎴愬姛銆傘�傘��", Color.Green);
feedBackProgress?.Invoke(100, 25);
- #endregion
+ #endregion 绗洓姝� 鍘嬬缉鏂囦欢瑙ｆ瀽 锛堣繘搴�25%锛�
#region 绗簲姝� 瑙ｆ瀽姘村姏缁撴瀯鏂囦欢 锛堣繘搴�30%锛�
@@ -157,15 +157,64 @@
feedBackProgress?.Invoke(100, 100);
return true;
}
-
- var structRevitModel = HStation.Service.RevitParseHelper.FromJsonFile(structFileInfo.FullName, out msg);
- if (structRevitModel == null)
+ var structOthersFileInfo = allFileInfoList.Find(x => x.Name == HStation.Revit.ConstParas.StructOthersFileName);
+ var structRevitModel = HStation.Service.RevitParseHelper.FromJsonFile
+ (structFileInfo.FullName, structOthersFileInfo?.FullName, out bool structFileResult, out List<string> structFileMsgList);
+ //瑙ｆ瀽缁撴灉鍒ゆ柇
+ if (!structFileResult)
{
- feedBackMsg?.Invoke($"{msg}锛侊紒锛�", Color.Red);
+ structFileMsgList?.ForEach(x => feedBackMsg?.Invoke(x, Color.Red));
+ }
+ //Revit灞炴�ч敊璇鐞�
+ var hasRevitPropError = false;
+ if (structRevitModel != null)
+ {
+ var allRevitParterList = structRevitModel.GetAllParters();
+ foreach (var revitParter in allRevitParterList)
+ {
+ if (revitParter.PropStatusList != null && revitParter.PropStatusList.Count > 0)
+ {
+ foreach (var revitParterPropStatus in revitParter.PropStatusList)
+ {
+ if (revitParterPropStatus.PropStatus == HStation.Revit.ePropStatus.Error)
+ {
+ hasRevitPropError = true;
+ }
+ switch (revitParterPropStatus.PropStatus)
+ {
+ case Revit.ePropStatus.Error:
+ {
+ feedBackMsg?.Invoke($"鏋勪欢绫诲瀷锛歿revitParter.Catalog}锛屾瀯浠剁紪鐮侊細{revitParter.Code}锛屾瀯浠跺睘鎬э細{revitParterPropStatus.PropName}锛岄敊璇細{revitParterPropStatus.StatusInfo} ", Color.Red);
+ }
+ break;
+
+ case Revit.ePropStatus.Lack:
+ {
+ //feedBackMsg?.Invoke($"鏋勪欢缂栫爜锛歿revitParter.Id}锛屾瀯浠跺睘鎬э細{revitParterPropStatus.PropName}锛岀己鐪侊細{revitParterPropStatus.StatusInfo} ", Color.Gray);
+ }
+ break;
+
+ case Revit.ePropStatus.Abnormal:
+ {
+ //feedBackMsg?.Invoke($"鏋勪欢缂栫爜锛歿revitParter.Id}锛屾瀯浠跺睘鎬э細{revitParterPropStatus.PropName}锛屽紓甯革細{revitParterPropStatus.StatusInfo} ", Color.Orange);
+ }
+ break;
+
+ default: break;
+ }
+ }
+ }
+ }
+ }
+ if (hasRevitPropError || !structFileResult)
+ {
+ feedBackMsg?.Invoke($"姘村姏缁撴瀯鏂囦欢瑙ｆ瀽閿欒锛侊紒锛�", Color.Red);
feedBackMsg?.Invoke("椤圭洰瀵煎叆缁撴潫銆傘�傘��", Color.Blue);
feedBackProgress?.Invoke(100, 100);
return true;
}
+
+ vm.RevitModel = structRevitModel;
var hydroInfo = HStation.Hydro.TransferHelper.FromRevit(structRevitModel, out msg);
if (hydroInfo == null)
@@ -185,11 +234,31 @@
return true;
}
+ feedBackMsg?.Invoke("姝ｅ湪杩涜浜у搧鍖归厤...", Color.Black);
+ hydroInfo = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.GetByID(hydroId);
+ var matchingParas = AssetsMatchingParasHelper.Create(hydroInfo, null);
+ if (AssetsMatchingHelper.Matching(matchingParas, out string error))
+ {
+ if (AssetsMatchingParasHelper.Apply(hydroInfo, matchingParas))
+ {
+ feedBackMsg?.Invoke("浜у搧鍖归厤瀹屾垚銆傘�傘��", Color.Green);
+ }
+ else
+ {
+ feedBackMsg?.Invoke("浜у搧鍖归厤澶辫触锛侊紒锛�", Color.Red);
+ }
+ }
+ else
+ {
+ feedBackMsg?.Invoke("浜у搧鍖归厤澶辫触锛侊紒锛�", Color.Red);
+ }
+ hydroId = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.Save(hydroInfo);
+
feedBackMsg?.Invoke("姘村姏缁撴瀯鏂囦欢瑙ｆ瀽鎴愬姛銆傘�傘��", Color.Green);
feedBackProgress?.Invoke(100, 30);
vm.HydroID = hydroId;
- #endregion
+ #endregion 绗簲姝� 瑙ｆ瀽姘村姏缁撴瀯鏂囦欢 锛堣繘搴�30%锛�
#region 绗叚姝� 鍏宠仈姘村姏缁撴瀯妯″瀷锛堣繘搴� 40%锛�
@@ -224,12 +293,11 @@
return true;
}
-
vm.HydroRelationID = hydroRelationId;
feedBackMsg?.Invoke("鍏宠仈姘村姏缁撴瀯妯″瀷鎴愬姛銆傘�傘��", Color.Green);
feedBackProgress?.Invoke(100, 40);
- #endregion
+ #endregion 绗叚姝� 鍏宠仈姘村姏缁撴瀯妯″瀷锛堣繘搴� 40%锛�
#region 绗竷姝� 涓婁紶Revit妯″瀷鏂囦欢锛堣繘搴� 45%锛�
@@ -243,8 +311,8 @@
return true;
}
- // var bimfaceId = await Yw.WinFrmUI.BimfaceHelper.UploadFile(rvtFileInfo.FullName);//涓婁紶
- var bimfaceId = 10000878332030; //娴嬭瘯鐢ㄤ緥
+ //var bimfaceId = await Yw.WinFrmUI.BimfaceHelper.UploadFile(rvtFileInfo.FullName);//涓婁紶
+ var bimfaceId = 10000884702464; //娴嬭瘯鐢ㄤ緥 10000878572231 10000882826621 10000884283372 10000884362886 10000884702464
if (bimfaceId < 1)
{
feedBackMsg?.Invoke("Revit妯″瀷鏂囦欢涓婁紶澶辫触锛侊紒锛�", Color.Red);
@@ -257,7 +325,7 @@
feedBackMsg?.Invoke("瑙ｆ瀽Revit妯″瀷鏂囦欢鎴愬姛銆傘�傘��", Color.Green);
feedBackProgress?.Invoke(100, 45);
- #endregion
+ #endregion 绗竷姝� 涓婁紶Revit妯″瀷鏂囦欢锛堣繘搴� 45%锛�
#region 绗叓姝� 淇濆瓨Bimface鏂囦欢 锛堣繘搴� 50%锛�
@@ -285,7 +353,7 @@
feedBackMsg?.Invoke("Bimface鏂囦欢淇濆瓨鎴愬姛銆傘�傘��", Color.Green);
feedBackProgress?.Invoke(100, 50);
- #endregion
+ #endregion 绗叓姝� 淇濆瓨Bimface鏂囦欢 锛堣繘搴� 50%锛�
#region 绗節姝� 鍏宠仈Bimface鏂囦欢锛堣繘搴� 55%锛�
@@ -310,7 +378,7 @@
feedBackMsg?.Invoke("Bimface鏂囦欢鍏宠仈鎴愬姛銆傘�傘��", Color.Green);
feedBackProgress?.Invoke(100, 55);
- #endregion
+ #endregion 绗節姝� 鍏宠仈Bimface鏂囦欢锛堣繘搴� 55%锛�
#region 绗崄姝� 鍙戣捣bimface杞崲锛堣繘搴� 80%锛�
@@ -343,7 +411,7 @@
feedBackProgress?.Invoke(100, 80);
- #endregion
+ #endregion 绗崄姝� 鍙戣捣bimface杞崲锛堣繘搴� 80%锛�
#region 绗崄涓�姝� 鏇存柊Bimface鏂囦欢鐘舵�侊紙杩涘害 100%锛�
@@ -364,10 +432,7 @@
feedBackMsg?.Invoke("椤圭洰瀵煎叆瀹屾垚銆傘�傘��", Color.Green);
return true;
- #endregion
-
+ #endregion 绗崄涓�姝� 鏇存柊Bimface鏂囦欢鐘舵�侊紙杩涘害 100%锛�
}
-
-
}
}
\ No newline at end of file
--
Gitblit v1.9.3