From 083c4e47c7a59025f3348bd093693c6b3febb014 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 16 十月 2024 10:03:31 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

---
 Service/HStation.Service.Revit.Core/01-model/RevitModel.cs |  158 +++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 113 insertions(+), 45 deletions(-)

diff --git a/Service/HStation.Service.Revit.Core/01-model/RevitModel.cs b/Service/HStation.Service.Revit.Core/01-model/RevitModel.cs
index d71de28..70a1dcb 100644
--- a/Service/HStation.Service.Revit.Core/01-model/RevitModel.cs
+++ b/Service/HStation.Service.Revit.Core/01-model/RevitModel.cs
@@ -3,12 +3,35 @@
     /// <summary>
     /// 妯″瀷淇℃伅
     /// </summary>
-    public class RevitModel
+    public partial class RevitModel
     {
         /// <summary>
         /// 
         /// </summary>
-        public RevitModel() { }
+        public RevitModel()
+        {
+            this.Reservoirs = new List<RevitReservoir>();
+            this.Tanks = new List<RevitTank>();
+            this.Waterboxs = new List<RevitWaterbox>();
+            this.Junctions = new List<RevitJunction>();
+            this.Nozzles = new List<RevitNozzle>();
+            this.Hydrants = new List<RevitHydrant>();
+            this.Bluntheads = new List<RevitBlunthead>();
+            this.Elbows = new List<RevitElbow>();
+            this.Threelinks = new List<RevitThreelink>();
+            this.Fourlinks = new List<RevitFourlink>();
+            this.Meters = new List<RevitMeter>();
+            this.Flowmeters = new List<RevitFlowmeter>();
+            this.Pressmeters = new List<RevitPressmeter>();
+
+            this.Pipes = new List<RevitPipe>();
+            this.Translations = new List<RevitTranslation>();
+            this.Exchangers = new List<RevitExchanger>();
+            this.Pumps = new List<RevitPump>();
+            this.Valves = new List<RevitValve>();
+
+            this.Decorators = new List<RevitDecorator>();
+        }
 
         /// <summary>
         /// 
@@ -17,24 +40,28 @@
         {
             this.Name = rhs.Name;
             this.Description = rhs.Description;
-
-            this.Reservoirs = new List<RevitReservoir>();
-            this.Tanks = new List<RevitTank>();
-            this.Junctions = new List<RevitJunction>();
-
-            this.Pumps = new List<RevitPump>();
-            this.Valves = new List<RevitValve>();
-            this.Pipes = new List<RevitPipe>();
-
-            this.Curves = new List<RevitCurve>();
-            this.Patterns = new List<RevitPattern>();
-            this.Rules = new List<RevitRule>();
-
-            this.Decorators = new List<RevitDecorator>();
+            this.Reservoirs = rhs.Reservoirs;
+            this.Tanks = rhs.Tanks;
+            this.Waterboxs = rhs.Waterboxs;
+            this.Junctions = rhs.Junctions;
+            this.Nozzles = rhs.Nozzles;
+            this.Hydrants = rhs.Hydrants;
+            this.Bluntheads = rhs.Bluntheads;
+            this.Elbows = rhs.Elbows;
+            this.Threelinks = rhs.Threelinks;
+            this.Fourlinks = rhs.Fourlinks;
+            this.Meters = rhs.Meters;
+            this.Flowmeters = rhs.Flowmeters;
+            this.Pressmeters = rhs.Pressmeters;
+            this.Pipes = rhs.Pipes;
+            this.Translations = rhs.Translations;
+            this.Exchangers = rhs.Exchangers;
+            this.Pumps = rhs.Pumps;
+            this.Valves = rhs.Valves;
+            this.Decorators = rhs.Decorators;
         }
 
-
-        #region 鍩虹淇℃伅
+        #region 鍩虹
 
         /// <summary>
         /// 鍚嶇О
@@ -48,7 +75,7 @@
 
         #endregion
 
-        #region Node
+        #region 鑺傜偣
 
         /// <summary>
         /// 姘村簱鍒楄〃
@@ -61,13 +88,79 @@
         public List<RevitTank> Tanks { get; set; }
 
         /// <summary>
+        /// 姘寸鍒楄〃
+        /// </summary>
+        public List<RevitWaterbox> Waterboxs { get; set; }
+
+        /// <summary>
         /// 鑺傜偣鍒楄〃
         /// </summary>
         public List<RevitJunction> Junctions { get; set; }
 
+        /// <summary>
+        /// 鍠峰槾鍒楄〃
+        /// </summary>
+        public List<RevitNozzle> Nozzles { get; set; }
+
+        /// <summary>
+        /// 娑堢伀鏍撳垪琛�
+        /// </summary>
+        public List<RevitHydrant> Hydrants { get; set; }
+
+        /// <summary>
+        /// 闂峰ご鍒楄〃
+        /// </summary>
+        public List<RevitBlunthead> Bluntheads { get; set; }
+
+        /// <summary>
+        /// 寮ご鍒楄〃
+        /// </summary>
+        public List<RevitElbow> Elbows { get; set; }
+
+        /// <summary>
+        /// 涓夐�氬垪琛�
+        /// </summary>
+        public List<RevitThreelink> Threelinks { get; set; }
+
+        /// <summary>
+        /// 鍥涢�氬垪琛�
+        /// </summary>
+        public List<RevitFourlink> Fourlinks { get; set; }
+
+        /// <summary>
+        /// 姘磋〃
+        /// </summary>
+        public List<RevitMeter> Meters { get; set; }
+
+        /// <summary>
+        /// 娴侀噺璁″垪琛�
+        /// </summary>
+        public List<RevitFlowmeter> Flowmeters { get; set; }
+
+        /// <summary>
+        /// 鍘嬪姏琛ㄥ垪琛�
+        /// </summary>
+        public List<RevitPressmeter> Pressmeters { get; set; }
+
+
         #endregion
 
-        #region Link
+        #region 绠℃
+
+        /// <summary>
+        /// 绠¢亾鍒楄〃
+        /// </summary>
+        public List<RevitPipe> Pipes { get; set; }
+
+        /// <summary>
+        /// 杩囨浮浠跺垪琛�
+        /// </summary>
+        public List<RevitTranslation> Translations { get; set; }
+
+        /// <summary>
+        /// 鎹㈢儹鍣ㄥ垪琛�
+        /// </summary>
+        public List<RevitExchanger> Exchangers { get; set; }
 
         /// <summary>
         /// 姘存车鍒楄〃
@@ -78,31 +171,6 @@
         /// 闃�闂ㄥ垪琛�
         /// </summary>
         public List<RevitValve> Valves { get; set; }
-
-        /// <summary>
-        /// 绠¢亾鍒楄〃
-        /// </summary>
-        public List<RevitPipe> Pipes { get; set; }
-
-        #endregion
-
-        #region 鎿嶄綔
-
-        /// <summary>
-        /// 鏇茬嚎鍒楄〃
-        /// </summary>
-        public List<RevitCurve> Curves { get; set; }
-
-        /// <summary>
-        /// 妯″紡鍒楄〃
-        /// </summary>
-        public List<RevitPattern> Patterns { get; set; }
-
-        /// <summary>
-        /// 瑙勫垯鍒楄〃
-        /// </summary>
-        public List<RevitRule> Rules { get; set; }
-
 
         #endregion
 

--
Gitblit v1.9.3