Merge branch 'master' of http://39.106.8.246:3003/revit/RevitExport

JBIM/RevitToJBim/Common/Converter.cs

@@ -37,10 +37,21 @@ namespace RevitToJBim.Common
         /// 将点转换成毫米单位形式
         /// </summary>
         /// <param name="xyz"></param>
+        /// <param name="ignoreZ">转换是否忽略Z</param>
         /// <returns></returns>
-        public static XYZ ConvertToXYZ(Autodesk.Revit.DB.XYZ xyz)
+        public static XYZ ConvertToXYZ(Autodesk.Revit.DB.XYZ xyz,bool ignoreZ=false)
         {
-            return new XYZ() {X = FtToUse(xyz.X), Y = FtToUse(xyz.Y), Z = FtToUse(xyz.Z), };
+            var result = new XYZ()
+            {
+                X = FtToUse(xyz.X),
+                Y = FtToUse(xyz.Y)
+            };
+            if (!ignoreZ)
+            {
+                result.Z = FtToUse(xyz.Z);
+            }
+
+            return result;
         }
         /// <summary>
         /// 转换成向量
@@ -54,11 +65,13 @@ namespace RevitToJBim.Common
         /// <summary>
         /// 将点转换成毫米单位形式
         /// </summary>
-        /// <param name="xyzes"></param>
+        /// <param name="xyzs"></param>
+        /// <param name="ignoreZ">转换是否忽略Z</param>
         /// <returns></returns>
-        public static List<XYZ> ConvertToXYZs(List<Autodesk.Revit.DB.XYZ> xyzs)
+        public static List<XYZ> ConvertToXYZs(List<Autodesk.Revit.DB.XYZ> xyzs, bool ignoreZ=false)
         {
-            return xyzs.Select(xyz=>ConvertToXYZ(xyz)).ToList();
+            return xyzs.Select(xyz=>ConvertToXYZ(xyz, ignoreZ)).ToList();
         }
+       
     }
 }

JBIM/RevitToJBim/Common/RevitUtil.cs

@@ -95,7 +95,7 @@ namespace RevitToJBim.Common
         /// <summary>
         /// 获取设备设施的参数
         /// </summary>
-        /// <param name="fi"></param>
+        /// <param name="space"></param>
         /// <returns></returns>
         public static List<Parameter> GetSpaceParameters(Space space)
         {

JBIM/RevitToJBim/Common/StandardUtil.cs

@@ -0,0 +1,38 @@
+/*-------------------------------------------------------------------------
+ * 功能描述：StandardUtil
+ * 作者：xulisong
+ * 创建时间： 2019/6/27 11:25:35
+ * 版本号：v1.0
+ *  -------------------------------------------------------------------------*/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using JBIM.Definition;
+using SAGA.DotNetUtils.Extend;
+
+namespace RevitToJBim.Common
+{
+    /// <summary>
+    /// 标准整理工具
+    /// </summary>
+    public static class StandardUtil
+    {
+        public static void ArrangeLoop(Polygon polygon)
+        {
+            if (polygon.Count>=2)
+            {
+                var firstPoint = polygon[0];
+                var lastPoint = polygon[polygon.Count - 1];
+                if (!firstPoint.X.IsEqual(lastPoint.X) || !firstPoint.Y.IsEqual(lastPoint.Y) ||
+                    !firstPoint.Z.IsEqual(lastPoint.Z))
+                {
+                    polygon.Add(firstPoint);
+                }
+               
+            }
+        }
+    }
+}

JBIM/RevitToJBim/ComponentParse/ParseColumn.cs

@@ -43,9 +43,16 @@ namespace RevitToJBim.ComponentParse
             var polygonPath = RevitUtil.GetTopPolygon(familyInstance);
             if (polygonPath != null && polygonPath.Any())
             {
-                Polygon outLine = new Polygon(BimConvert.ConvertToXYZs(polygonPath));
+                Polygon outLine = new Polygon(BimConvert.ConvertToXYZs(polygonPath,true));
+                StandardUtil.ArrangeLoop(outLine);
                 jObject.OutLine.Add(outLine);
             }
+
+            var parameter = familyInstance.GetParameter(BuiltInParameter.WALL_ATTR_ROOM_BOUNDING);
+            if (parameter != null)
+            {
+                jObject.RoomBoundary=parameter.AsInteger() == 1;
+            }
             context.AddBimObject(jObject);          
             return new List<BimId>() { jObject.Id };
         }

JBIM/RevitToJBim/ComponentParse/ParseDoor.cs

@@ -50,7 +50,7 @@ namespace RevitToJBim.ComponentParse
             var polygonPath = RevitUtil.GetWindowDoorLocation(fi);
             if (polygonPath != null && polygonPath.Any())
             {
-                Polygon outLine = new Polygon(BimConvert.ConvertToXYZs(polygonPath));
+                Polygon outLine = new Polygon(BimConvert.ConvertToXYZs(polygonPath,true));
                 jObject.OutLine.Add(outLine);
             }
             jObject.HandDirection = BimConvert.ConvertToDirection(fi.HandOrientation);

JBIM/RevitToJBim/ComponentParse/ParseSpace.cs

@@ -85,10 +85,10 @@ namespace RevitToJBim.ComponentParse
                         }                 
                         #endregion
 
-                    }
-
+                    }                 
                     if (outLine.Any())
                     {
+                        StandardUtil.ArrangeLoop(outLine);
                         bimObject.OutLine.Add(outLine);
                     }
 

JBIM/RevitToJBim/ComponentParse/ParseWall.cs

@@ -42,9 +42,11 @@ namespace RevitToJBim.ComponentParse
             context.AddBimObject(jObject);
             jObject.Location = ParseCore.GetLocation(wall.Location);
             var polygons = RevitUtil.GetWallPolygon(wall);
+            //是否保持z为0的转换；
             foreach (var polygon in polygons)
             {               
-                var outLine = new Polygon(BimConvert.ConvertToXYZs(polygon));
+                var outLine = new Polygon(BimConvert.ConvertToXYZs(polygon,true));
+                StandardUtil.ArrangeLoop(outLine);
                 jObject.OutLine.Add(outLine);
             }
 

JBIM/RevitToJBim/ComponentParse/ParseWindow.cs

@@ -50,7 +50,7 @@ namespace RevitToJBim.ComponentParse
             var polygonPath = RevitUtil.GetWindowDoorLocation(fi);
             if (polygonPath != null && polygonPath.Any())
             {
-                Polygon outLine = new Polygon(BimConvert.ConvertToXYZs(polygonPath));
+                Polygon outLine = new Polygon(BimConvert.ConvertToXYZs(polygonPath,true));
                 jObject.OutLine.Add(outLine);
             }
            

JBIM/RevitToJBim/JsonConverter/BimJsonUtil.cs

@@ -21,23 +21,57 @@ namespace RevitToJBim.JsonConverter
     {
         public static string Serializer(BimDocument document)
         {
+            JsonSerializerSettings jsetting = CreateDefaultSettings();
+            var bimObjects = document.BimObjects;
+            var group = bimObjects.GroupBy(bim => bim.ElementType);
+            Dictionary<string, List<BimObject>> dic = new Dictionary<string, List<BimObject>>();
+            foreach (var collection in group)
+            {
+                dic[collection.Key + "s"] = collection.ToList();
+            }
+
+            var documentObject = new {MBIName = "PjXXX_001", PlanName = "F1-saga", Elements = dic};
+            //var serializer = JsonSerializer.Create(jsetting);
+            //var jobject=JObject.FromObject(dic, serializer);
+            //jobject.ToString();
+            string dataStr =JsonConvert.SerializeObject(documentObject, jsetting);
+            return dataStr;
+        }
+
+        private static JsonSerializerSettings CreateDefaultSettings()
+        {
             JsonSerializerSettings jsetting = new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore };
             jsetting.Converters.Add(new BimIdConverter());
             //mxg 显示x:,y:,z:格式的
             //jsetting.Converters.Add(new XYZConverter());
             jsetting.Converters.Add(new StringEnumConverter());
             jsetting.Converters.Add(new ParameterConverter());
+            return jsetting;
+        }
+        private static DocumentDto ConverToDto(BimDocument document)
+        {
+            DocumentDto dto = new DocumentDto();
             var bimObjects = document.BimObjects;
             var group = bimObjects.GroupBy(bim => bim.ElementType);
             Dictionary<string, List<BimObject>> dic = new Dictionary<string, List<BimObject>>();
             foreach (var collection in group)
             {
                 dic[collection.Key + "s"] = collection.ToList();
-                //jobject.Add(collection.Key, JArray.FromObject(collection.Value, serializer));
             }
-            //var settings = new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore };
-            string dataStr = JsonConvert.SerializeObject(dic, jsetting);
-            return dataStr;
+
+            dto.MBIName = "PjXXX_001";//待读取
+            dto.PlanName = "F1-saga";
+            dto.Elements = dic;
+            return dto;
         }
     }
+    /// <summary>
+    /// 项目传输数据结构
+    /// </summary>
+    public class DocumentDto
+    {
+        public string MBIName { get; set; }
+        public string PlanName { get; set; }
+        public Dictionary<string, List<BimObject>> Elements { get; set; }
+    }
 }

JBIM/RevitToJBim/RevitToJBim.csproj

@@ -61,6 +61,7 @@
   <ItemGroup>
     <Compile Include="Common\CategoryGenerator.cs" />
     <Compile Include="Common\Converter.cs" />
+    <Compile Include="Common\StandardUtil.cs" />
     <Compile Include="Extension\CurveExtension.cs" />
     <Compile Include="Common\ElementWrapperFactory.cs" />
     <Compile Include="Common\ExceptionUtil.cs" />