From 27f9935fd0043e86e8b6cc18db0fc300181d7230 Mon Sep 17 00:00:00 2001
From: qin <a@163.com>
Date: 星期四, 15 八月 2024 17:10:23 +0800
Subject: [PATCH] 冲突解决
---
HStation.RevitDev/RevitDataExport/Utility/ExportModelHelper.cs | 47 ++++++++++++++++++++---------------------------
1 files changed, 20 insertions(+), 27 deletions(-)
diff --git a/HStation.RevitDev/RevitDataExport/Utility/ExportModelHelper.cs b/HStation.RevitDev/RevitDataExport/Utility/ExportModelHelper.cs
index 628285b..f8f1c62 100644
--- a/HStation.RevitDev/RevitDataExport/Utility/ExportModelHelper.cs
+++ b/HStation.RevitDev/RevitDataExport/Utility/ExportModelHelper.cs
@@ -21,30 +21,17 @@
public string Export()
{
- var modelMap = GlobalResource.RevitModels;
- JObject jobj = new JObject();
- jobj["鍚嶇О"] = m_doc.PathName;
- jobj["鎻忚堪"] = m_doc.PathName;
- foreach (var modelPair in modelMap)
- {
- var revitType = modelPair.Key;
- var jArray = ExportRevitModel(revitType);
+ JArray retArray = new JArray();
+ var dict = GlobalResource.RevitModels.Find(x => x.Item1 == m_doc.Title);
+ if (dict == null) { retArray.ToString(); }
- string propName = GetRevitModelPropertyName(revitType);
- JArray array = jobj[propName] as JArray;
- if (array == null)
- {
- jobj[propName] = jArray;
- }
- else
- {
- foreach (var item in jArray)
- {
- array.Add(item);
- }
- }
+ foreach (var pair in dict.Item2)
+ {
+ var revitType = pair.Key;
+ var jArray = ExportRevitModel(revitType);
+ retArray.Merge(jArray);
}
- return jobj.ToString();
+ return retArray.ToString();
}
private string GetRevitModelPropertyName(RevitType revitType)
@@ -67,13 +54,17 @@
}
private JArray ExportRevitModel(RevitType revitType)
- {
- var revitModels = GlobalResource.RevitModels[revitType];
- var outElems = new JArray();
+ {
+ var outElems = new JArray();
+
+ var dict = GlobalResource.RevitModels.Find(x => x.Item1 == m_doc.Title)?.Item2;
+ if (dict == null) { return outElems; }
+ var revitModels = dict[revitType];
- foreach (var elemId in revitModels)
+ foreach (var modelId in revitModels)
{
ElementId id = null;
+ var elemId = modelId;
if (int.TryParse(elemId, out int elementId))
{
id = new ElementId(elementId);
@@ -81,7 +72,9 @@
Element rvtElem = m_doc.GetElement(id);
if (rvtElem == null) { continue; }
- JObject outElem = rvtElem.Export(revitType);
+ //JObject outElem = rvtElem.Export(revitType);
+ JObject outElem = rvtElem.Export2();
+ outElem["鏋勪欢绫诲瀷"] = revitType.GetDescription();
outElems.Add(outElem);
}
return outElems;
--
Gitblit v1.9.3