From 907a1579fecf2c160852cf99b3ea77c08eb481cc Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期二, 17 十二月 2024 09:44:04 +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_Method.cs | 140 +++++++++++++++++++++++++---------------------
1 files changed, 76 insertions(+), 64 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 f78aa65..c689c26 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,18 @@
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.Coolings != null && this.Coolings.Count > 0)
+ {//鍐峰嵈濉�
+ list.AddRange(this.Coolings);
}
if (this.Meters != null && this.Meters.Count > 0)
{//姘磋〃
@@ -72,14 +76,6 @@
{//杩囨浮浠�
list.AddRange(this.Translations);
}
- if (this.Exchangers != null && this.Exchangers.Count > 0)
- {//鎹㈢儹鍣�
- list.AddRange(this.Exchangers);
- }
- if (this.Compressors != null && this.Compressors.Count > 0)
- {//绌哄帇鏈�
- list.AddRange(this.Compressors);
- }
if (this.Pumps != null && this.Pumps.Count > 0)
{//姘存车
list.AddRange(this.Pumps);
@@ -87,6 +83,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;
@@ -114,14 +118,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);
@@ -137,6 +133,18 @@
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.Coolings != null && this.Coolings.Count > 0)
+ {//鍐峰嵈濉�
+ list.AddRange(this.Coolings);
}
if (this.Meters != null && this.Meters.Count > 0)
{//姘磋〃
@@ -159,14 +167,6 @@
{//杩囨浮浠�
list.AddRange(this.Translations);
}
- if (this.Exchangers != null && this.Exchangers.Count > 0)
- {//鎹㈢儹鍣�
- list.AddRange(this.Exchangers);
- }
- if (this.Compressors != null && this.Compressors.Count > 0)
- {//绌哄帇鏈�
- list.AddRange(this.Compressors);
- }
if (this.Pumps != null && this.Pumps.Count > 0)
{//姘存车
list.AddRange(this.Pumps);
@@ -174,6 +174,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;
@@ -201,14 +209,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);
@@ -224,6 +224,18 @@
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.Coolings != null && this.Coolings.Count > 0)
+ {//鍐峰嵈濉�
+ list.AddRange(this.Coolings);
}
if (this.Meters != null && this.Meters.Count > 0)
{//姘磋〃
@@ -271,14 +283,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);
@@ -294,6 +298,18 @@
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.Coolings != null && this.Coolings.Count > 0)
+ {//鍐峰嵈濉�
+ list.AddRange(this.Coolings);
}
if (this.Meters != null && this.Meters.Count > 0)
{//姘磋〃
@@ -324,6 +340,10 @@
if (this.Hydrants != null && this.Hydrants.Count > 0)
{//娑堢伀鏍�
list.AddRange(this.Hydrants);
+ }
+ if (this.Coolings != null && this.Coolings.Count > 0)
+ {//鍐峰嵈濉�
+ list.AddRange(this.Coolings);
}
return list;
@@ -369,14 +389,6 @@
{//杩囨浮浠�
list.AddRange(this.Translations);
}
- if (this.Exchangers != null && this.Exchangers.Count > 0)
- {//鎹㈢儹鍣�
- list.AddRange(this.Exchangers);
- }
- if (this.Compressors != null && this.Compressors.Count > 0)
- {//绌哄帇鏈�
- list.AddRange(this.Compressors);
- }
if (this.Pumps != null && this.Pumps.Count > 0)
{//姘存车
list.AddRange(this.Pumps);
@@ -384,6 +396,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;
@@ -404,14 +424,6 @@
if (this.Translations != null && this.Translations.Count > 0)
{//杩囨浮浠�
list.AddRange(this.Translations);
- }
- if (this.Compressors != null && this.Compressors.Count > 0)
- {//绌哄帇鏈�
- list.AddRange(this.Compressors);
- }
- if (this.Exchangers != null && this.Exchangers.Count > 0)
- {//鎹㈢儹鍣�
- list.AddRange(this.Exchangers);
}
return list;
--
Gitblit v1.9.3