From 4c32366350018806978182f05352ef75698f995f Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期五, 17 一月 2025 11:33:19 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
Service/HStation.Service.Revit.Core/04-service/03-parse/RevitParseHelper.cs | 42 ++++++++++++++++++++++++++++++------------
1 files changed, 30 insertions(+), 12 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 befaa12..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,25 +8,43 @@
/// <summary>
/// 浠� Revit json瀛楃涓蹭腑瑙ｆ瀽
/// </summary>
- /// <param name="revitJsonString">Revit json 瀛楃涓�</param>
- /// <returns></returns>
- public static Model.RevitModel FromJsonString(string revitJsonString)
+ public static Model.RevitModel FromJsonString(string revitJsonString, string revitOthersJsonString, out bool result, out List<string> msgList)
{
- var rhs = RevitJsonHelper.FromJsonString(revitJsonString);
- rhs.Correct();
- return rhs;
+ 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 (!revitModel.Correct(ref msgList))
+ {
+ result = false;
+ }
+ return revitModel;
}
/// <summary>
/// 浠� Revit json 鏂囦欢涓В鏋�
/// </summary>
- /// <param name="revitJsonFile">Revit json 鏂囦欢</param>
- /// <returns></returns>
- public static Model.RevitModel FromJsonFile(string revitJsonFile)
+ public static Model.RevitModel FromJsonFile(string revitJsonFile, string revitOthersJsonFile, out bool result, out List<string> msgList)
{
- var rhs = RevitJsonHelper.FromJsonFile(revitJsonFile);
- rhs.Correct();
- return rhs;
+ 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 (!revitModel.Correct(ref msgList))
+ {
+ result = false;
+ }
+ return revitModel;
}
--
Gitblit v1.9.3