Browse Source

mxg:管段检查,忽略软管

mengxiangge 4 years ago
parent
commit
6f46c77835

+ 4 - 1
Executer/DataCheck/DataCheck.Mode/PipeCheck.cs

@@ -46,7 +46,10 @@ namespace ServiceRevitLib.DataCheck.Mode
                         continue;
                     }
                     var item = new PipeCheckResult();
-                    item.SystemName = element.GetSystemTypeName();
+                    // 如果为软管,则不导出。软管的系统名称为空
+                    var tempSystem = element.GetSystemTypeName();
+                    if (tempSystem.IsNullOrEmpty()) continue;
+                    item.SystemName = tempSystem;
                     item.Id = element.Id.ToString();
                     var code = GetErrorCode(element, item.SystemName);
                     if (IsNeedExport(code))

+ 4 - 2
Executer/DataExport/RevitToJBim/ExportDataBuilder.cs

@@ -42,8 +42,10 @@ namespace RevitToJBim
             var sourceSpaces = collector.Clone().FilterElements<SpatialElement>(BuiltInCategory.OST_MEPSpaces).OfType<Space>().Where(t=>t.IsSpace()).ToList();
             wrappers.AddRange(sourceSpaces.Select(e => new ElementWrapper(e)));
 
-            wrappers.AddRange(collector.Clone().FilterElements<Pipe>().Select(e => new ElementWrapper(e)));
-            wrappers.AddRange(collector.Clone().FilterElements<Duct>().Select(e => new ElementWrapper(e)));
+            var mepCurves = doc.FilterElements<MEPCurve>().ToList();
+            wrappers.AddRange(mepCurves.Select(e => new ElementWrapper(e)));
+            //wrappers.AddRange(collector.Clone().FilterElements<Pipe>().Select(e => new ElementWrapper(e)));
+            //wrappers.AddRange(collector.Clone().FilterElements<Duct>().Select(e => new ElementWrapper(e)));
             var familyInstances = collector.Clone().FilterElements<FamilyInstance>();
             foreach (FamilyInstance familyInstance in familyInstances)
             {

+ 2 - 2
Starter/Starter/Program.cs

@@ -38,14 +38,14 @@ namespace ExportStart
             if (string.IsNullOrWhiteSpace(command))
             {
                 command = "DataExport";
-                command = "DataCheck";
+                //command = "DataCheck";
                 path = @"E:\导出测试\testSpace.rvt";
                 path = @"E:\导出测试\系统图修改编码版\消防系统图模型第一版V1219.rvt";
                 path = @"E:\导出测试\无锡系统图1225\热源系统图模型第一版V1225.rvt";
                 path = @"D:\给排水系统图模型第一版V1225.rvt";
                 path = @"E:\1245.rvt";
 
-                path = @"C:\Users\SAGACLOUD\Desktop\海天中心项目_AM_T1_25F.rvt";
+                path = @"C:\Users\SAGACLOUD\Desktop\海天中心项目_AM_T1_21F .rvt";
                 //path = @"D:\安装包\CAD\测试模型\F4测试.rvt";
                 JObject jObject = new JObject();
                 jObject.Add("ResultFileName", @"C:\Users\SAGACLOUD\AppData\Local\RevitService\Result_e26be2fd-2097-462b-bdd0-a2a86b616928.txt");