From 14cccf079662c052b2e04d30b9d9082ada1272ff Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期五, 23 八月 2024 10:01:16 +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 | 122 +++++++++++++---------------------------
1 files changed, 40 insertions(+), 82 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 a497cb2..29724a1 100644
--- a/Service/HStation.Service.Revit.Core/01-model/RevitModel_Method.cs
+++ b/Service/HStation.Service.Revit.Core/01-model/RevitModel_Method.cs
@@ -8,9 +8,9 @@
/// <summary>
/// 鑾峰彇鎵�鏈夌粍浠�
/// </summary>
- public List<IRevitParter> GetAllParters()
+ public List<RevitParter> GetAllParters()
{
- var list = new List<IRevitParter>();
+ var list = new List<RevitParter>();
if (this.Reservoirs != null && this.Reservoirs.Count > 0)
{
list.AddRange(this.Reservoirs);
@@ -94,9 +94,9 @@
/// <summary>
/// 鑾峰彇鎵�鏈夎妭鐐�
/// </summary>
- public List<IRevitNode> GetAllNodes()
+ public List<RevitNode> GetAllNodes()
{
- var list = new List<IRevitNode>();
+ var list = new List<RevitNode>();
if (this.Reservoirs != null && this.Reservoirs.Count > 0)
{
list.AddRange(this.Reservoirs);
@@ -150,37 +150,15 @@
list.AddRange(this.Bluntheads);
}
- return list;
- }
-
- /// <summary>
- /// 鑾峰彇鎵�鏈夋按婧�
- /// </summary>
- /// <returns></returns>
- public List<IRevitSource> GetAllWaterSources()
- {
- var list = new List<IRevitSource>();
- if (this.Reservoirs != null && this.Reservoirs.Count > 0)
- {
- list.AddRange(this.Reservoirs);
- }
- if (this.Tanks != null && this.Tanks.Count > 0)
- {
- list.AddRange(this.Tanks);
- }
- if (this.Waterboxs != null && this.Waterboxs.Count > 0)
- {
- list.AddRange(this.Waterboxs);
- }
return list;
}
/// <summary>
/// 鑾峰彇鎵�鏈夌娈�
/// </summary>
- public List<IRevitLink> GetAllLinks()
+ public List<RevitLink> GetAllLinks()
{
- var list = new List<IRevitLink>();
+ var list = new List<RevitLink>();
if (this.Pipes != null && this.Pipes.Count > 0)
@@ -210,11 +188,33 @@
}
/// <summary>
+ /// 鑾峰彇鎵�鏈夋按婧�
+ /// </summary>
+ /// <returns></returns>
+ public List<RevitSource> GetAllWaterSources()
+ {
+ var list = new List<RevitSource>();
+ if (this.Reservoirs != null && this.Reservoirs.Count > 0)
+ {
+ list.AddRange(this.Reservoirs);
+ }
+ if (this.Tanks != null && this.Tanks.Count > 0)
+ {
+ list.AddRange(this.Tanks);
+ }
+ if (this.Waterboxs != null && this.Waterboxs.Count > 0)
+ {
+ list.AddRange(this.Waterboxs);
+ }
+ return list;
+ }
+
+ /// <summary>
/// 鑾峰彇鎵�鏈夎繛鎺ヨ妭鐐�
/// </summary>
- public List<IRevitJunction> GetAllJunctions()
+ public List<RevitJunction> GetAllJunctions()
{
- var list = new List<IRevitJunction>();
+ var list = new List<RevitJunction>();
if (this.Junctions != null && this.Junctions.Count > 0)
{
list.AddRange(this.Junctions);
@@ -260,43 +260,30 @@
}
/// <summary>
- /// 鑾峰彇鎵�鏈夋按姹�
+ /// 鑾峰彇鎵�鏈夋墿鏁ｅ櫒
/// </summary>
- /// <returns></returns>
- public List<IRevitTank> GetAllTanks()
+ public List<RevitEmitter> GetAllEmitters()
{
- var list = new List<IRevitTank>();
- if (this.Tanks != null && this.Tanks.Count > 0)
+ var list = new List<RevitEmitter>();
+
+ if (this.Nozzles != null && this.Nozzles.Count > 0)
{
- list.AddRange(this.Tanks);
+ list.AddRange(this.Nozzles);
}
- if (this.Waterboxs != null && this.Waterboxs.Count > 0)
+ if (this.Hydrants != null && this.Hydrants.Count > 0)
{
- list.AddRange(this.Waterboxs);
+ list.AddRange(this.Hydrants);
}
- return list;
- }
-
- /// <summary>
- /// 鑾峰彇鎵�鏈夋按搴�
- /// </summary>
- public List<IRevitReservoir> GetAllReservoirs()
- {
- var list = new List<IRevitReservoir>();
- if (this.Reservoirs != null && this.Reservoirs.Count > 0)
- {
- list.AddRange(this.Reservoirs);
- }
return list;
}
/// <summary>
/// 鑾峰彇鎵�鏈夌閬�
/// </summary>
- public List<IRevitPipe> GetAllPipes()
+ public List<RevitPipe> GetAllPipes()
{
- var list = new List<IRevitPipe>();
+ var list = new List<RevitPipe>();
if (this.Pipes != null && this.Pipes.Count > 0)
{
@@ -314,35 +301,6 @@
return list;
}
- /// <summary>
- /// 鑾峰彇鎵�鏈夋按娉�
- /// </summary>
- public List<IRevitPump> GetAllPumps()
- {
- var list = new List<IRevitPump>();
-
- if (this.Pumps != null && this.Pumps.Count > 0)
- {
- list.AddRange(this.Pumps);
- }
-
- return list;
- }
-
- /// <summary>
- /// 鑾峰彇鎵�鏈夐榾闂�
- /// </summary>
- public List<IRevitValve> GetAllValves()
- {
- var list = new List<IRevitValve>();
-
- if (this.Valves != null && this.Valves.Count > 0)
- {
- list.AddRange(this.Valves);
- }
-
- return list;
- }
}
--
Gitblit v1.9.3