From 00f80abcfbf890ab3718d960550380389c64cea3 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期三, 16 十月 2024 10:30:39 +0800
Subject: [PATCH] Revit解析修改
---
Service/HStation.Service.Revit.Core/04-service/03-parse/RevitParseHelper.cs | 36 ++++++++++++++++++++----------------
1 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/Service/HStation.Service.Revit.Core/04-service/03-parse/RevitParseHelper.cs b/Service/HStation.Service.Revit.Core/04-service/03-parse/RevitParseHelper.cs
index 65d20b3..70c622c 100644
--- a/Service/HStation.Service.Revit.Core/04-service/03-parse/RevitParseHelper.cs
+++ b/Service/HStation.Service.Revit.Core/04-service/03-parse/RevitParseHelper.cs
@@ -8,39 +8,43 @@
/// <summary>
/// 浠� Revit json瀛楃涓蹭腑瑙ｆ瀽
/// </summary>
- /// <param name="revitJsonString">Revit json 瀛楃涓�</param>
- /// <returns></returns>
- public static Model.RevitModel FromJsonString(string revitJsonString, string revitOthersJsonString, out string msg)
+ public static Model.RevitModel FromJsonString(string revitJsonString, string revitOthersJsonString, out bool result, out List<string> msgList)
{
- var rhs = RevitJsonHelper.FromJsonString(revitJsonString, revitOthersJsonString, out msg);
- if (rhs == null)
+ result = true;
+ msgList = new List<string>();
+ var revitModel = RevitJsonHelper.FromJsonString(revitJsonString, revitOthersJsonString, out string msg);
+ if (revitModel == null)
{
+ result = false;
+ msgList.Add(msg);
return default;
}
- if (!rhs.Correct(out msg))
+ if (!revitModel.Correct(ref msgList))
{
- return default;
+ result = false;
}
- return rhs;
+ return revitModel;
}
/// <summary>
/// 浠� Revit json 鏂囦欢涓В鏋�
/// </summary>
- /// <param name="revitJsonFile">Revit json 鏂囦欢</param>
- /// <returns></returns>
- public static Model.RevitModel FromJsonFile(string revitJsonFile, string revitOthersJsonFile, out string msg)
+ public static Model.RevitModel FromJsonFile(string revitJsonFile, string revitOthersJsonFile, out bool result, out List<string> msgList)
{
- var rhs = RevitJsonHelper.FromJsonFile(revitJsonFile, revitOthersJsonFile, out msg);
- if (rhs == null)
+ result = true;
+ msgList = new List<string>();
+ var revitModel = RevitJsonHelper.FromJsonFile(revitJsonFile, revitOthersJsonFile, out string msg);
+ if (revitModel == null)
{
+ result = false;
+ msgList.Add(msg);
return default;
}
- if (!rhs.Correct(out msg))
+ if (!revitModel.Correct(ref msgList))
{
- return default;
+ result = false;
}
- return rhs;
+ return revitModel;
}
--
Gitblit v1.9.3