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_Method.cs |  104 ++++++++++++++++++++++++++++------------------------
 1 files changed, 56 insertions(+), 48 deletions(-)

diff --git a/Service/HStation.Service.Revit.Core/01-model/RevitModel_Method.cs b/Service/HStation.Service.Revit.Core/01-model/RevitModel_Method.cs
index f92894b..fdbf379 100644
--- a/Service/HStation.Service.Revit.Core/01-model/RevitModel_Method.cs
+++ b/Service/HStation.Service.Revit.Core/01-model/RevitModel_Method.cs
@@ -27,14 +27,6 @@
             {//杩炴帴鑺傜偣
                 list.AddRange(this.Junctions);
             }
-            if (this.Nozzles != null && this.Nozzles.Count > 0)
-            {//鍠峰槾
-                list.AddRange(this.Nozzles);
-            }
-            if (this.Hydrants != null && this.Hydrants.Count > 0)
-            {//娑堢伀鏍�
-                list.AddRange(this.Hydrants);
-            }
             if (this.Bluntheads != null && this.Bluntheads.Count > 0)
             {//闂峰ご
                 list.AddRange(this.Bluntheads);
@@ -50,6 +42,14 @@
             if (this.Fourlinks != null && this.Fourlinks.Count > 0)
             {//鍥涢��
                 list.AddRange(this.Fourlinks);
+            }
+            if (this.Nozzles != null && this.Nozzles.Count > 0)
+            {//鍠峰槾
+                list.AddRange(this.Nozzles);
+            }
+            if (this.Hydrants != null && this.Hydrants.Count > 0)
+            {//娑堢伀鏍�
+                list.AddRange(this.Hydrants);
             }
             if (this.Meters != null && this.Meters.Count > 0)
             {//姘磋〃
@@ -72,10 +72,6 @@
             {//杩囨浮浠�
                 list.AddRange(this.Translations);
             }
-            if (this.Exchangers != null && this.Exchangers.Count > 0)
-            {//鎹㈢儹鍣�
-                list.AddRange(this.Exchangers);
-            }
             if (this.Pumps != null && this.Pumps.Count > 0)
             {//姘存车
                 list.AddRange(this.Pumps);
@@ -83,6 +79,14 @@
             if (this.Valves != null && this.Valves.Count > 0)
             {//闃�闂�
                 list.AddRange(this.Valves);
+            }
+            if (this.Exchangers != null && this.Exchangers.Count > 0)
+            {//鎹㈢儹鍣�
+                list.AddRange(this.Exchangers);
+            }
+            if (this.Compressors != null && this.Compressors.Count > 0)
+            {//绌哄帇鏈�
+                list.AddRange(this.Compressors);
             }
 
             return list;
@@ -110,14 +114,6 @@
             {//杩炴帴鑺傜偣
                 list.AddRange(this.Junctions);
             }
-            if (this.Nozzles != null && this.Nozzles.Count > 0)
-            {//鍠峰槾
-                list.AddRange(this.Nozzles);
-            }
-            if (this.Hydrants != null && this.Hydrants.Count > 0)
-            {//娑堢伀鏍�
-                list.AddRange(this.Hydrants);
-            }
             if (this.Bluntheads != null && this.Bluntheads.Count > 0)
             {//闂峰ご
                 list.AddRange(this.Bluntheads);
@@ -133,6 +129,14 @@
             if (this.Fourlinks != null && this.Fourlinks.Count > 0)
             {//鍥涢��
                 list.AddRange(this.Fourlinks);
+            }
+            if (this.Nozzles != null && this.Nozzles.Count > 0)
+            {//鍠峰槾
+                list.AddRange(this.Nozzles);
+            }
+            if (this.Hydrants != null && this.Hydrants.Count > 0)
+            {//娑堢伀鏍�
+                list.AddRange(this.Hydrants);
             }
             if (this.Meters != null && this.Meters.Count > 0)
             {//姘磋〃
@@ -155,10 +159,6 @@
             {//杩囨浮浠�
                 list.AddRange(this.Translations);
             }
-            if (this.Exchangers != null && this.Exchangers.Count > 0)
-            {//鎹㈢儹鍣�
-                list.AddRange(this.Exchangers);
-            }
             if (this.Pumps != null && this.Pumps.Count > 0)
             {//姘存车
                 list.AddRange(this.Pumps);
@@ -166,6 +166,14 @@
             if (this.Valves != null && this.Valves.Count > 0)
             {//闃�闂�
                 list.AddRange(this.Valves);
+            }
+            if (this.Exchangers != null && this.Exchangers.Count > 0)
+            {//鎹㈢儹鍣�
+                list.AddRange(this.Exchangers);
+            }
+            if (this.Compressors != null && this.Compressors.Count > 0)
+            {//绌哄帇鏈�
+                list.AddRange(this.Compressors);
             }
 
             return list;
@@ -193,14 +201,6 @@
             {//杩炴帴鑺傜偣
                 list.AddRange(this.Junctions);
             }
-            if (this.Nozzles != null && this.Nozzles.Count > 0)
-            {//鍠峰槾
-                list.AddRange(this.Nozzles);
-            }
-            if (this.Hydrants != null && this.Hydrants.Count > 0)
-            {//娑堢伀鏍�
-                list.AddRange(this.Hydrants);
-            }
             if (this.Bluntheads != null && this.Bluntheads.Count > 0)
             {//闂峰ご
                 list.AddRange(this.Bluntheads);
@@ -216,6 +216,14 @@
             if (this.Fourlinks != null && this.Fourlinks.Count > 0)
             {//鍥涢��
                 list.AddRange(this.Fourlinks);
+            }
+            if (this.Nozzles != null && this.Nozzles.Count > 0)
+            {//鍠峰槾
+                list.AddRange(this.Nozzles);
+            }
+            if (this.Hydrants != null && this.Hydrants.Count > 0)
+            {//娑堢伀鏍�
+                list.AddRange(this.Hydrants);
             }
             if (this.Meters != null && this.Meters.Count > 0)
             {//姘磋〃
@@ -263,14 +271,6 @@
             {//杩炴帴鑺傜偣
                 list.AddRange(this.Junctions);
             }
-            if (this.Nozzles != null && this.Nozzles.Count > 0)
-            {//鍠峰槾
-                list.AddRange(this.Nozzles);
-            }
-            if (this.Hydrants != null && this.Hydrants.Count > 0)
-            {//娑堢伀鏍�
-                list.AddRange(this.Hydrants);
-            }
             if (this.Bluntheads != null && this.Bluntheads.Count > 0)
             {//闂峰ご
                 list.AddRange(this.Bluntheads);
@@ -286,6 +286,14 @@
             if (this.Fourlinks != null && this.Fourlinks.Count > 0)
             {//鍥涢��
                 list.AddRange(this.Fourlinks);
+            }
+            if (this.Nozzles != null && this.Nozzles.Count > 0)
+            {//鍠峰槾
+                list.AddRange(this.Nozzles);
+            }
+            if (this.Hydrants != null && this.Hydrants.Count > 0)
+            {//娑堢伀鏍�
+                list.AddRange(this.Hydrants);
             }
             if (this.Meters != null && this.Meters.Count > 0)
             {//姘磋〃
@@ -361,10 +369,6 @@
             {//杩囨浮浠�
                 list.AddRange(this.Translations);
             }
-            if (this.Exchangers != null && this.Exchangers.Count > 0)
-            {//鎹㈢儹鍣�
-                list.AddRange(this.Exchangers);
-            }
             if (this.Pumps != null && this.Pumps.Count > 0)
             {//姘存车
                 list.AddRange(this.Pumps);
@@ -372,6 +376,14 @@
             if (this.Valves != null && this.Valves.Count > 0)
             {//闃�闂�
                 list.AddRange(this.Valves);
+            }
+            if (this.Exchangers != null && this.Exchangers.Count > 0)
+            {//鎹㈢儹鍣�
+                list.AddRange(this.Exchangers);
+            }
+            if (this.Compressors != null && this.Compressors.Count > 0)
+            {//绌哄帇鏈�
+                list.AddRange(this.Compressors);
             }
 
             return list;
@@ -392,10 +404,6 @@
             if (this.Translations != null && this.Translations.Count > 0)
             {//杩囨浮浠�
                 list.AddRange(this.Translations);
-            }
-            if (this.Exchangers != null && this.Exchangers.Count > 0)
-            {//鎹㈢儹鍣�
-                list.AddRange(this.Exchangers);
             }
 
             return list;

--
Gitblit v1.9.3