From ca5f300a7cef85d22b5e0f9d59d117c49f9909b3 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 19 十一月 2024 09:42:16 +0800
Subject: [PATCH] 完善资产界面
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectHelper.cs | 117 +++++++++++++++++++++++++++++++---------------------------
1 files changed, 63 insertions(+), 54 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 1f1a7d6..e83e3a2 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
@@ -42,7 +42,7 @@
feedBackProgress?.Invoke(100, 5);
- #endregion 绗竴姝� 涓存椂鏂囦欢澶勭悊锛堣繘搴�5%锛�
+ #endregion
#region 绗簩姝� 鍒涘缓椤圭洰锛堣繘搴� 10%锛�
@@ -78,7 +78,7 @@
feedBackProgress?.Invoke(100, 10);
- #endregion 绗簩姝� 鍒涘缓椤圭洰锛堣繘搴� 10%锛�
+ #endregion
#region 绗笁姝� 璁剧疆鍦板浘浣嶇疆锛堣繘搴� 20%锛�
@@ -113,15 +113,24 @@
feedBackProgress?.Invoke(100, 20);
- #endregion 绗笁姝� 璁剧疆鍦板浘浣嶇疆锛堣繘搴� 20%锛�
+ #endregion
- #region 绗洓姝� 鍘嬬缉鏂囦欢瑙ｆ瀽 锛堣繘搴�25%锛�
-
- msg = "姝ｅ湪瑙ｆ瀽妯″瀷鏂囦欢...";
- feedBackMsg?.Invoke(msg, Color.Black);
+ #region 绗洓姝� 鍘嬬缉鏂囦欢瑙ｆ瀽 锛堣繘搴�30%锛�
var zipFilePwd = HStation.Settings.XhsParasHelper.Xhs.File.Password;
- var bol = Yw.FileFolderZipHelper.UnZip(vm.ZipFile, tempFolder, zipFilePwd);
+ var localZipFile = vm.LocalZipFile;
+ if (!vm.IsLocal)
+ {
+ if (vm.TransferRevitFile != null)
+ {
+ feedBackMsg?.Invoke("姝ｅ湪涓嬭浇妯″瀷鏂囦欢...", Color.Black);
+ localZipFile = await BLLFactory<HStation.BLL.TransferRevitFile>.Instance.Download(vm.TransferRevitFile.StorageHouse, vm.TransferRevitFile.StorageCode);
+ feedBackMsg?.Invoke("妯″瀷鏂囦欢涓嬭浇瀹屾垚锛侊紒锛�", Color.Green);
+ }
+ }
+ msg = "姝ｅ湪瑙ｆ瀽妯″瀷鏂囦欢...";
+ feedBackMsg?.Invoke(msg, Color.Black);
+ var bol = Yw.FileFolderZipHelper.UnZip(localZipFile, tempFolder, zipFilePwd);
if (!bol)
{
feedBackMsg?.Invoke("妯″瀷鏂囦欢瑙ｆ瀽澶辫触锛侊紒锛�", Color.Red);
@@ -142,11 +151,11 @@
feedBackMsg?.Invoke("妯″瀷鏂囦欢瑙ｆ瀽鎴愬姛銆傘�傘��", Color.Green);
- feedBackProgress?.Invoke(100, 25);
+ feedBackProgress?.Invoke(100, 30);
- #endregion 绗洓姝� 鍘嬬缉鏂囦欢瑙ｆ瀽 锛堣繘搴�25%锛�
+ #endregion
- #region 绗簲姝� 瑙ｆ瀽姘村姏缁撴瀯鏂囦欢 锛堣繘搴�30%锛�
+ #region 绗簲姝� 瑙ｆ瀽姘村姏缁撴瀯鏂囦欢 锛堣繘搴�40%锛�
feedBackMsg?.Invoke("姝ｅ湪瑙ｆ瀽姘村姏缁撴瀯鏂囦欢...", Color.Black);
var structFileInfo = allFileInfoList.Find(x => x.Name == HStation.Revit.ConstParas.StructFileName);
@@ -158,9 +167,13 @@
return true;
}
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)
+ {
+ structFileMsgList?.ForEach(x => feedBackMsg?.Invoke(x, Color.Red));
+ }
//Revit灞炴�ч敊璇鐞�
var hasRevitPropError = false;
if (structRevitModel != null)
@@ -180,33 +193,28 @@
{
case Revit.ePropStatus.Error:
{
- feedBackMsg?.Invoke($"鏋勪欢缂栫爜锛歿revitParter.Id}锛屾瀯浠跺睘鎬э細{revitParterPropStatus.PropName}锛岄敊璇細{revitParterPropStatus.StatusInfo} ", Color.Red);
+ feedBackMsg?.Invoke($"鏋勪欢绫诲瀷锛歿revitParter.Catalog}锛屾瀯浠剁紪鐮侊細{revitParter.Id}锛屾瀯浠跺睘鎬э細{revitParterPropStatus.PropName}锛岄敊璇細{revitParterPropStatus.StatusInfo} ", Color.Red);
}
break;
case Revit.ePropStatus.Lack:
{
- feedBackMsg?.Invoke($"鏋勪欢缂栫爜锛歿revitParter.Id}锛屾瀯浠跺睘鎬э細{revitParterPropStatus.PropName}锛岀己鐪侊細{revitParterPropStatus.StatusInfo} ", Color.Gray);
+ //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);
+ //feedBackMsg?.Invoke($"鏋勪欢缂栫爜锛歿revitParter.Id}锛屾瀯浠跺睘鎬э細{revitParterPropStatus.PropName}锛屽紓甯革細{revitParterPropStatus.StatusInfo} ", Color.Orange);
}
break;
+
+ default: break;
}
}
}
}
}
-
- //瑙ｆ瀽缁撴灉鍒ゆ柇
- if (!structFileResult)
- {
- structFileMsgList?.ForEach(x => feedBackMsg?.Invoke(x, Color.Red));
- }
-
if (hasRevitPropError || !structFileResult)
{
feedBackMsg?.Invoke($"姘村姏缁撴瀯鏂囦欢瑙ｆ瀽閿欒锛侊紒锛�", Color.Red);
@@ -214,6 +222,8 @@
feedBackProgress?.Invoke(100, 100);
return true;
}
+
+ vm.RevitModel = structRevitModel;
var hydroInfo = HStation.Hydro.TransferHelper.FromRevit(structRevitModel, out msg);
if (hydroInfo == null)
@@ -224,23 +234,13 @@
return true;
}
- var hydroId = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.Save(hydroInfo);
- if (hydroId < 1)
- {
- feedBackMsg?.Invoke("姘村姏缁撴瀯淇℃伅淇濆瓨澶辫触锛侊紒锛�", Color.Red);
- feedBackMsg?.Invoke("椤圭洰瀵煎叆缁撴潫銆傘�傘��", Color.Blue);
- feedBackProgress?.Invoke(100, 100);
- return true;
- }
-
feedBackMsg?.Invoke("姝ｅ湪杩涜浜у搧鍖归厤...", Color.Black);
- hydroInfo = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.GetByID(hydroId);
- var matchingParas = AssetsMatchingParasHelper.Create(hydroInfo);
+ var matchingParas = AssetsMatchingParasHelper.Create(hydroInfo, null);
if (AssetsMatchingHelper.Matching(matchingParas, out string error))
{
if (AssetsMatchingParasHelper.Apply(hydroInfo, matchingParas))
{
- feedBackMsg?.Invoke("浜у搧鍖归厤鎴愬姛銆傘�傘��", Color.Green);
+ feedBackMsg?.Invoke("浜у搧鍖归厤瀹屾垚銆傘�傘��", Color.Green);
}
else
{
@@ -251,15 +251,24 @@
{
feedBackMsg?.Invoke("浜у搧鍖归厤澶辫触锛侊紒锛�", Color.Red);
}
- hydroId = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.Save(hydroInfo);
+ feedBackMsg?.Invoke("姝ｅ湪淇濆瓨姘村姏缁撴瀯淇℃伅...", Color.Black);
+ var hydroId = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.Save(hydroInfo);
+ if (hydroId < 1)
+ {
+ feedBackMsg?.Invoke("姘村姏缁撴瀯淇℃伅淇濆瓨澶辫触锛侊紒锛�", Color.Red);
+ feedBackMsg?.Invoke("椤圭洰瀵煎叆缁撴潫銆傘�傘��", Color.Blue);
+ feedBackProgress?.Invoke(100, 100);
+ return true;
+ }
+ feedBackMsg?.Invoke("姘村姏缁撴瀯淇℃伅淇濆瓨鎴愬姛銆傘�傘��", Color.Green);
feedBackMsg?.Invoke("姘村姏缁撴瀯鏂囦欢瑙ｆ瀽鎴愬姛銆傘�傘��", Color.Green);
- feedBackProgress?.Invoke(100, 30);
+ feedBackProgress?.Invoke(100, 40);
vm.HydroID = hydroId;
- #endregion 绗簲姝� 瑙ｆ瀽姘村姏缁撴瀯鏂囦欢 锛堣繘搴�30%锛�
+ #endregion
- #region 绗叚姝� 鍏宠仈姘村姏缁撴瀯妯″瀷锛堣繘搴� 40%锛�
+ #region 绗叚姝� 鍏宠仈姘村姏缁撴瀯妯″瀷锛堣繘搴� 50%锛�
var projectSite = await BLLFactory<HStation.BLL.XhsProjectSite>.Instance.GetDefaultByProjectID(projectId);
if (projectSite == null)
@@ -294,11 +303,11 @@
vm.HydroRelationID = hydroRelationId;
feedBackMsg?.Invoke("鍏宠仈姘村姏缁撴瀯妯″瀷鎴愬姛銆傘�傘��", Color.Green);
- feedBackProgress?.Invoke(100, 40);
+ feedBackProgress?.Invoke(100, 50);
- #endregion 绗叚姝� 鍏宠仈姘村姏缁撴瀯妯″瀷锛堣繘搴� 40%锛�
+ #endregion
- #region 绗竷姝� 涓婁紶Revit妯″瀷鏂囦欢锛堣繘搴� 45%锛�
+ #region 绗竷姝� 涓婁紶Revit妯″瀷鏂囦欢锛堣繘搴� 60%锛�
feedBackMsg?.Invoke("姝ｅ湪瑙ｆ瀽Revit妯″瀷鏂囦欢...", Color.Black);
var rvtFileInfo = allFileInfoList.Find(x => x.Name == HStation.Revit.ConstParas.RvtFileName);
@@ -311,7 +320,7 @@
}
//var bimfaceId = await Yw.WinFrmUI.BimfaceHelper.UploadFile(rvtFileInfo.FullName);//涓婁紶
- var bimfaceId = 10000882826621; //娴嬭瘯鐢ㄤ緥 10000878572231 10000882826621
+ var bimfaceId = 10000884893369; //娴嬭瘯鐢ㄤ緥 10000878572231 10000882826621 10000884283372 10000884362886 10000884702464 10000884893369
if (bimfaceId < 1)
{
feedBackMsg?.Invoke("Revit妯″瀷鏂囦欢涓婁紶澶辫触锛侊紒锛�", Color.Red);
@@ -322,11 +331,11 @@
vm.BimfaceId = bimfaceId;
feedBackMsg?.Invoke("瑙ｆ瀽Revit妯″瀷鏂囦欢鎴愬姛銆傘�傘��", Color.Green);
- feedBackProgress?.Invoke(100, 45);
+ feedBackProgress?.Invoke(100, 60);
- #endregion 绗竷姝� 涓婁紶Revit妯″瀷鏂囦欢锛堣繘搴� 45%锛�
+ #endregion
- #region 绗叓姝� 淇濆瓨Bimface鏂囦欢 锛堣繘搴� 50%锛�
+ #region 绗叓姝� 淇濆瓨Bimface鏂囦欢 锛堣繘搴� 65%锛�
feedBackMsg?.Invoke("姝ｅ湪淇濆瓨Bimface鏂囦欢...", Color.Black);
@@ -350,11 +359,11 @@
vm.BimfaceFileID = bimfaceFileId;
feedBackMsg?.Invoke("Bimface鏂囦欢淇濆瓨鎴愬姛銆傘�傘��", Color.Green);
- feedBackProgress?.Invoke(100, 50);
+ feedBackProgress?.Invoke(100, 65);
- #endregion 绗叓姝� 淇濆瓨Bimface鏂囦欢 锛堣繘搴� 50%锛�
+ #endregion
- #region 绗節姝� 鍏宠仈Bimface鏂囦欢锛堣繘搴� 55%锛�
+ #region 绗節姝� 鍏宠仈Bimface鏂囦欢锛堣繘搴� 70%锛�
feedBackMsg?.Invoke("姝ｅ湪鍏宠仈Bimface鏂囦欢...", Color.Black);
@@ -375,11 +384,11 @@
}
vm.BimfaceFileRelationID = bimfaceRelationId;
feedBackMsg?.Invoke("Bimface鏂囦欢鍏宠仈鎴愬姛銆傘�傘��", Color.Green);
- feedBackProgress?.Invoke(100, 55);
+ feedBackProgress?.Invoke(100, 70);
- #endregion 绗節姝� 鍏宠仈Bimface鏂囦欢锛堣繘搴� 55%锛�
+ #endregion
- #region 绗崄姝� 鍙戣捣bimface杞崲锛堣繘搴� 80%锛�
+ #region 绗崄姝� 鍙戣捣bimface杞崲锛堣繘搴� 90%锛�
feedBackMsg?.Invoke("姝ｅ湪杩涜Bimface妯″瀷杞婚噺鍖�...", Color.Black);
//var bimfaceTranslateStatus = await Yw.WinFrmUI.BimfaceHelper.TranslateRvtFile(bimfaceId);//鍙戣捣杞崲
@@ -408,9 +417,9 @@
feedBackMsg?.Invoke("Bimface妯″瀷杞婚噺鍖栧畬鎴愩�傘�傘��", Color.Green);
}
- feedBackProgress?.Invoke(100, 80);
+ feedBackProgress?.Invoke(100, 90);
- #endregion 绗崄姝� 鍙戣捣bimface杞崲锛堣繘搴� 80%锛�
+ #endregion
#region 绗崄涓�姝� 鏇存柊Bimface鏂囦欢鐘舵�侊紙杩涘害 100%锛�
@@ -431,7 +440,7 @@
feedBackMsg?.Invoke("椤圭洰瀵煎叆瀹屾垚銆傘�傘��", Color.Green);
return true;
- #endregion 绗崄涓�姝� 鏇存柊Bimface鏂囦欢鐘舵�侊紙杩涘害 100%锛�
+ #endregion
}
}
}
\ No newline at end of file
--
Gitblit v1.9.3