From 5c14c9686d2bd7c99fdd6cc6fc19404e6e4b8e4d Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期五, 29 十一月 2024 15:02:20 +0800
Subject: [PATCH] 增加用水当量和用水器具界面

---
 Service/HStation.Service.Revit.Core/01-model/RevitModel.cs |   79 ++++++++++++++++++++-------------------
 1 files changed, 41 insertions(+), 38 deletions(-)

diff --git a/Service/HStation.Service.Revit.Core/01-model/RevitModel.cs b/Service/HStation.Service.Revit.Core/01-model/RevitModel.cs
index e3beba0..eae87a9 100644
--- a/Service/HStation.Service.Revit.Core/01-model/RevitModel.cs
+++ b/Service/HStation.Service.Revit.Core/01-model/RevitModel.cs
@@ -14,21 +14,22 @@
             this.Tanks = new List<RevitTank>();
             this.Waterboxs = new List<RevitWaterbox>();
             this.Junctions = new List<RevitJunction>();
+            this.Bluntheads = new List<RevitBlunthead>();
+            this.Elbows = new List<RevitElbow>();
+            this.Threelinks = new List<RevitThreelink>();
+            this.Fourlinks = new List<RevitFourlink>();
             this.Nozzles = new List<RevitNozzle>();
             this.Hydrants = new List<RevitHydrant>();
             this.Meters = new List<RevitMeter>();
             this.Flowmeters = new List<RevitFlowmeter>();
             this.Pressmeters = new List<RevitPressmeter>();
-            this.Elbows = new List<RevitElbow>();
-            this.Threelinks = new List<RevitThreelink>();
-            this.Fourlinks = new List<RevitFourlink>();
-            this.Bluntheads = new List<RevitBlunthead>();
 
-            this.Pumps = new List<RevitPump>();
-            this.Valves = new List<RevitValve>();
             this.Pipes = new List<RevitPipe>();
             this.Translations = new List<RevitTranslation>();
+            this.Pumps = new List<RevitPump>();
+            this.Valves = new List<RevitValve>();
             this.Exchangers = new List<RevitExchanger>();
+            this.Compressors = new List<RevitCompressor>();
 
             this.Decorators = new List<RevitDecorator>();
         }
@@ -40,32 +41,29 @@
         {
             this.Name = rhs.Name;
             this.Description = rhs.Description;
-
             this.Reservoirs = rhs.Reservoirs;
             this.Tanks = rhs.Tanks;
             this.Waterboxs = rhs.Waterboxs;
             this.Junctions = rhs.Junctions;
+            this.Bluntheads = rhs.Bluntheads;
+            this.Elbows = rhs.Elbows;
+            this.Threelinks = rhs.Threelinks;
+            this.Fourlinks = rhs.Fourlinks;
             this.Nozzles = rhs.Nozzles;
             this.Hydrants = rhs.Hydrants;
             this.Meters = rhs.Meters;
             this.Flowmeters = rhs.Flowmeters;
             this.Pressmeters = rhs.Pressmeters;
-            this.Elbows = rhs.Elbows;
-            this.Threelinks = rhs.Threelinks;
-            this.Fourlinks = rhs.Fourlinks;
-            this.Bluntheads = rhs.Bluntheads;
-
-            this.Pumps = rhs.Pumps;
-            this.Valves = rhs.Valves;
             this.Pipes = rhs.Pipes;
             this.Translations = rhs.Translations;
+            this.Pumps = rhs.Pumps;
+            this.Valves = rhs.Valves;
             this.Exchangers = rhs.Exchangers;
-
+            this.Compressors = rhs.Compressors;
             this.Decorators = rhs.Decorators;
         }
 
-
-        #region 鍩虹淇℃伅
+        #region 鍩虹
 
         /// <summary>
         /// 鍚嶇О
@@ -79,7 +77,7 @@
 
         #endregion
 
-        #region Node
+        #region 鑺傜偣
 
         /// <summary>
         /// 姘村簱鍒楄〃
@@ -102,14 +100,9 @@
         public List<RevitJunction> Junctions { get; set; }
 
         /// <summary>
-        /// 鍠峰槾鍒楄〃
+        /// 闂峰ご鍒楄〃
         /// </summary>
-        public List<RevitNozzle> Nozzles { get; set; }
-
-        /// <summary>
-        /// 娑堢伀鏍撳垪琛�
-        /// </summary>
-        public List<RevitHydrant> Hydrants { get; set; }
+        public List<RevitBlunthead> Bluntheads { get; set; }
 
         /// <summary>
         /// 寮ご鍒楄〃
@@ -127,9 +120,14 @@
         public List<RevitFourlink> Fourlinks { get; set; }
 
         /// <summary>
-        /// 闂峰ご鍒楄〃
+        /// 鍠峰槾鍒楄〃
         /// </summary>
-        public List<RevitBlunthead> Bluntheads { get; set; }
+        public List<RevitNozzle> Nozzles { get; set; }
+
+        /// <summary>
+        /// 娑堢伀鏍撳垪琛�
+        /// </summary>
+        public List<RevitHydrant> Hydrants { get; set; }
 
         /// <summary>
         /// 姘磋〃
@@ -149,17 +147,7 @@
 
         #endregion
 
-        #region Link
-
-        /// <summary>
-        /// 姘存车鍒楄〃
-        /// </summary>
-        public List<RevitPump> Pumps { get; set; }
-
-        /// <summary>
-        /// 闃�闂ㄥ垪琛�
-        /// </summary>
-        public List<RevitValve> Valves { get; set; }
+        #region 绠℃
 
         /// <summary>
         /// 绠¢亾鍒楄〃
@@ -172,10 +160,25 @@
         public List<RevitTranslation> Translations { get; set; }
 
         /// <summary>
+        /// 姘存车鍒楄〃
+        /// </summary>
+        public List<RevitPump> Pumps { get; set; }
+
+        /// <summary>
+        /// 闃�闂ㄥ垪琛�
+        /// </summary>
+        public List<RevitValve> Valves { get; set; }
+
+        /// <summary>
         /// 鎹㈢儹鍣ㄥ垪琛�
         /// </summary>
         public List<RevitExchanger> Exchangers { get; set; }
 
+        /// <summary>
+        /// 绌哄帇鏈哄垪琛�
+        /// </summary>
+        public List<RevitCompressor> Compressors { get; set; }
+
         #endregion
 
         #region 瑁呴グ浠�

--
Gitblit v1.9.3