From 98e49c0dd42840a094837f7acae532bc237a719a Mon Sep 17 00:00:00 2001
From: yangyin <1850366751@qq.com>
Date: 星期二, 20 八月 2024 15:42:37 +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 | 46 ++++++++++++++++++++--------------------------
1 files changed, 20 insertions(+), 26 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 06e530d..d77b254 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
@@ -5,12 +5,11 @@
namespace HStation.WinFrmUI
{
/// <summary>
- ///
+ ///
/// </summary>
public class ImportXhsProjectHelper
{
private const string _tempFolder = "ImportProjectTemp";//瀵煎叆椤圭洰涓存椂鏂囦欢澶�
-
/// <summary>
/// 瀵煎叆
@@ -40,7 +39,7 @@
feedBackProgress?.Invoke(100, 5);
- #endregion
+ #endregion 绗竴姝� 涓存椂鏂囦欢澶勭悊锛堣繘搴�5%锛�
#region 绗簩姝� 鍘嬬缉鏂囦欢瑙ｆ瀽 锛堣繘搴�10%锛�
@@ -65,7 +64,7 @@
feedBackProgress?.Invoke(100, 10);
- #endregion
+ #endregion 绗簩姝� 鍘嬬缉鏂囦欢瑙ｆ瀽 锛堣繘搴�10%锛�
#region 绗笁姝� 瑙ｆ瀽姘村姏缁撴瀯鏂囦欢 锛堣繘搴�15%锛�
@@ -80,7 +79,7 @@
var revitModel = HStation.Service.RevitParseHelper.FromJsonFile(jsonFileInfo.FullName, out msg);
if (revitModel == null)
{
- feedBackMsg?.Invoke("msg锛侊紒锛�");
+ feedBackMsg?.Invoke($"{msg}锛侊紒锛�");
return false;
}
@@ -105,7 +104,7 @@
vm.HydroID = hydroId;
- #endregion
+ #endregion 绗笁姝� 瑙ｆ瀽姘村姏缁撴瀯鏂囦欢 锛堣繘搴�15%锛�
#region 绗洓姝� 鍒涘缓椤圭洰锛堣繘搴� 20%锛�
@@ -113,7 +112,7 @@
var bllXhsProjectExtensions = new Lazy<BLL.XhsProjectExtensions>(() => new BLL.XhsProjectExtensions());
- var project = new AddXhsProjectExtensionsInput();
+ var project = new Vmo.Xhs.XhsProjectExtensions();
project.NO = vm.NO;
project.Name = vm.Name;
project.Address = vm.Address;
@@ -122,8 +121,8 @@
project.TagName = vm.TagName;
project.Description = vm.Description;
- project.SiteList = new List<AddXhsProjectSiteExtensionsInput>() {
- new AddXhsProjectSiteExtensionsInput(){
+ project.SiteList = new List<Vmo.Xhs.XhsProjectSite>() {
+ new Vmo.Xhs.XhsProjectSite(){
Name=vm.Name,
Description=vm.Description
}
@@ -142,7 +141,7 @@
feedBackProgress?.Invoke(100, 20);
- #endregion
+ #endregion 绗洓姝� 鍒涘缓椤圭洰锛堣繘搴� 20%锛�
#region 绗簲姝� 鍏宠仈姘村姏缁撴瀯妯″瀷锛堣繘搴� 25%锛�
@@ -181,7 +180,7 @@
feedBackProgress?.Invoke(100, 25);
- #endregion
+ #endregion 绗簲姝� 鍏宠仈姘村姏缁撴瀯妯″瀷锛堣繘搴� 25%锛�
#region 绗叚姝� 璁剧疆鍦板浘浣嶇疆锛堣繘搴� 30%锛�
@@ -189,7 +188,7 @@
if (vm.Location != null)
{
- var mapInfo = new Yw.Dto.AddMapInfoInput();
+ var mapInfo = new Yw.Vmo.Map.MapInfo();
mapInfo.ObjectType = HStation.Xhs.DataType.XhsProject;
mapInfo.ObjectID = projectId;
mapInfo.ObjectName = project.Name;
@@ -214,10 +213,9 @@
feedBackMsg?.Invoke("鏈缃湴鍥句綅缃俊鎭紒锛侊紒");
}
-
feedBackProgress?.Invoke(100, 30);
- #endregion
+ #endregion 绗叚姝� 璁剧疆鍦板浘浣嶇疆锛堣繘搴� 30%锛�
#region 绗竷姝� 涓婁紶Revit妯″瀷鏂囦欢锛堣繘搴� 45%锛�
@@ -231,7 +229,7 @@
}
//var bimfaceId = await Yw.WinFrmUI.BimfaceHelper.UploadFile(rvtFileInfo.FullName);//涓婁紶
- var bimfaceId = 10000870453147; //娴嬭瘯鐢ㄤ緥
+ var bimfaceId = 10000872887098; //娴嬭瘯鐢ㄤ緥
if (bimfaceId < 1)
{
feedBackMsg?.Invoke("Revit妯″瀷鏂囦欢涓婁紶澶辫触锛侊紒锛�");
@@ -245,7 +243,7 @@
feedBackProgress?.Invoke(100, 45);
- #endregion
+ #endregion 绗竷姝� 涓婁紶Revit妯″瀷鏂囦欢锛堣繘搴� 45%锛�
#region 绗叓姝� 淇濆瓨Bimface鏂囦欢 锛堣繘搴� 50%锛�
@@ -274,7 +272,7 @@
feedBackProgress?.Invoke(100, 50);
- #endregion
+ #endregion 绗叓姝� 淇濆瓨Bimface鏂囦欢 锛堣繘搴� 50%锛�
#region 绗節姝� 鍏宠仈Bimface鏂囦欢锛堣繘搴� 55%锛�
@@ -299,7 +297,7 @@
feedBackMsg?.Invoke("Bimface鏂囦欢鍏宠仈鎴愬姛銆傘�傘��");
feedBackProgress?.Invoke(100, 55);
- #endregion
+ #endregion 绗節姝� 鍏宠仈Bimface鏂囦欢锛堣繘搴� 55%锛�
#region 绗節姝� 鍙戣捣bimface杞崲锛堣繘搴� 80%锛�
@@ -329,7 +327,7 @@
feedBackProgress?.Invoke(100, 80);
- #endregion
+ #endregion 绗節姝� 鍙戣捣bimface杞崲锛堣繘搴� 80%锛�
#region 绗崄姝� 鏇存柊Bimface鏂囦欢鐘舵�侊紙杩涘害 90%锛�
@@ -348,7 +346,7 @@
feedBackProgress?.Invoke(100, 90);
- #endregion
+ #endregion 绗崄姝� 鏇存柊Bimface鏂囦欢鐘舵�侊紙杩涘害 90%锛�
#region 绗崄涓�姝� 椤圭洰鍙戝竷锛堣繘搴� 100%锛�
@@ -368,12 +366,8 @@
feedBackProgress?.Invoke(100, 100);
feedBackMsg?.Invoke("椤圭洰瀵煎叆缁撴潫銆傘�傘��");
return true;
- #endregion
-
-
+ #endregion 绗崄涓�姝� 椤圭洰鍙戝竷锛堣繘搴� 100%锛�
}
-
-
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3