From eb4679bfe7f2c945f3e03f6927c8fde893f7d33c Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期三, 14 八月 2024 22:56:10 +0800
Subject: [PATCH] Revit解析bug修复
---
Service/HStation.Service.Revit.Core/04-service/02-correct/RevitCorrectHelper.cs | 141 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 135 insertions(+), 6 deletions(-)
diff --git a/Service/HStation.Service.Revit.Core/04-service/02-correct/RevitCorrectHelper.cs b/Service/HStation.Service.Revit.Core/04-service/02-correct/RevitCorrectHelper.cs
index bdd9b2f..dab1a35 100644
--- a/Service/HStation.Service.Revit.Core/04-service/02-correct/RevitCorrectHelper.cs
+++ b/Service/HStation.Service.Revit.Core/04-service/02-correct/RevitCorrectHelper.cs
@@ -1,5 +1,6 @@
锘縰sing HStation.Model;
using Microsoft.VisualBasic;
+using System;
namespace HStation.Service
{
@@ -24,6 +25,10 @@
return false;
}
if (!First(rhs, out msg))
+ {
+ return false;
+ }
+ if (!Exchanger(rhs, out msg))
{
return false;
}
@@ -89,6 +94,10 @@
{
rhs.Fourlinks = new List<Model.RevitFourlink>();
}
+ if (rhs.Meters == null)
+ {
+ rhs.Meters = new List<RevitMeter>();
+ }
if (rhs.Flowmeters == null)
{
rhs.Flowmeters = new List<Model.RevitFlowmeter>();
@@ -117,6 +126,10 @@
{
rhs.Translations = new List<Model.RevitTranslation>();
}
+ if (rhs.Exchangers == null)
+ {
+ rhs.Exchangers = new List<RevitExchanger>();
+ }
if (rhs.Pumps == null)
{
rhs.Pumps = new List<Model.RevitPump>();
@@ -124,6 +137,106 @@
if (rhs.Valves == null)
{
rhs.Valves = new List<Model.RevitValve>();
+ }
+ return true;
+ }
+
+ //鍗曠嫭淇鎹㈢儹鍣�
+ private static bool Exchanger(Model.RevitModel rhs, out string msg)
+ {
+ msg = string.Empty;
+ if (rhs.Exchangers != null && rhs.Exchangers.Count > 0)
+ {
+ var allParterList = rhs.GetAllParters();
+ foreach (var exchanger in rhs.Exchangers)
+ {
+ if (exchanger.ConnectList != null && exchanger.ConnectList.Count > 0)
+ {
+ foreach (var connect in exchanger.ConnectList)
+ {
+ var connectParter = allParterList.Find(x => x.Id == connect.Id);
+ if (connectParter == null)
+ {
+ msg = $"鎹㈢儹鍣細{exchanger.Id} 杩炴帴缁勪欢 {connect.Id} 涓嶅瓨鍦�";
+ return false;
+ }
+ }
+
+ var startConnectList = exchanger.ConnectList.GetStartConnects();
+ if (startConnectList == null || startConnectList.Count < 1)
+ {
+ msg = $"鎹㈢儹鍣細{exchanger.Id} 涓婃父杩炴帴缁勪欢涓嶅瓨鍦�";
+ return false;
+ }
+ var startJunction = new Model.RevitJunction();
+ startJunction.Id = Yw.Untity.UniqueHelper.CreateFromFirst("junction", allParterList.Select(x => x.Code).ToList());
+ startJunction.Code = startJunction.Id;
+ startJunction.Name = UniqueHelper.CreateFromFirst("杩炴帴鑺傜偣", allParterList.Select(x => x.Name).Distinct().ToList());
+ startJunction.Flags = null;
+ startJunction.ModelType = null;
+ startJunction.Description = "鎹㈢儹鍣ㄤ慨姝ｆ椂锛岃嚜鍔ㄦ坊鍔�";
+ startJunction.Quality = exchanger.StartQuality;
+ startJunction.Position = startConnectList.GetCenterPosition();
+ startJunction.Elev = exchanger.StartElev;
+ startJunction.Demand = null;
+ startJunction.DemandPattern = null;
+ rhs.Junctions.Add(startJunction);
+ exchanger.StartCode = startJunction.Code;
+ foreach (var startConnect in startConnectList)
+ {
+ var startConnectParter = allParterList.Find(x => x.Id == startConnect.Id);
+ if (startConnectParter is IRevitLink revitLink)
+ {
+ if (revitLink.StartCode == exchanger.Id)
+ {
+ revitLink.StartCode = startJunction.Id;
+ }
+ else if (revitLink.EndCode == exchanger.Id)
+ {
+ revitLink.EndCode = startJunction.Id;
+ }
+ }
+ }
+ allParterList.Add(startJunction);
+
+ var endConnectList = exchanger.ConnectList.GetEndConnects();
+ if (endConnectList == null || endConnectList.Count < 1)
+ {
+ msg = $"鎹㈢儹鍣細{exchanger.Id} 涓嬫父杩炴帴缁勪欢涓嶅瓨鍦�";
+ return false;
+ }
+ var endJunction = new Model.RevitJunction();
+ endJunction.Id = Yw.Untity.UniqueHelper.CreateFromFirst("junction", allParterList.Select(x => x.Code).ToList());
+ endJunction.Code = endJunction.Id;
+ endJunction.Name = UniqueHelper.CreateFromFirst("杩炴帴鑺傜偣", allParterList.Select(x => x.Name).Distinct().ToList());
+ endJunction.Flags = null;
+ endJunction.ModelType = null;
+ endJunction.Description = "鎹㈢儹鍣ㄤ慨姝ｆ椂锛岃嚜鍔ㄦ坊鍔�";
+ endJunction.Quality = exchanger.EndQuality;
+ endJunction.Position = endConnectList.GetCenterPosition();
+ endJunction.Elev = exchanger.EndElev;
+ endJunction.Demand = null;
+ endJunction.DemandPattern = null;
+ rhs.Junctions.Add(endJunction);
+ exchanger.EndCode = endJunction.Code;
+ foreach (var endConnect in endConnectList)
+ {
+ var endConnectParter = allParterList.Find(x => x.Id == endConnect.Id);
+ if (endConnectParter is IRevitLink revitLink)
+ {
+ if (revitLink.StartCode == exchanger.Id)
+ {
+ revitLink.StartCode = endJunction.Id;
+ }
+ else if (revitLink.EndCode == exchanger.Id)
+ {
+ revitLink.EndCode = endJunction.Id;
+ }
+ }
+ }
+ allParterList.Add(endJunction);
+ }
+ }
}
return true;
}
@@ -158,12 +271,12 @@
private static bool Three(Model.RevitModel rhs, out string msg)
{
msg = string.Empty;
+ var allParterList = rhs.GetAllParters();
var allLinks = rhs.GetAllLinks();
foreach (var link in allLinks)
{
- var allParterList = rhs.GetAllParters();
var startLinkParter = allParterList.Find(x => x.Code == link.StartCode);
- if (startLinkParter is IRevitLink)
+ if (startLinkParter is IRevitLink startLink)
{
var junction = new Model.RevitJunction();
junction.Id = Yw.Untity.UniqueHelper.CreateFromFirst("junction", allParterList.Select(x => x.Code).ToList());
@@ -179,12 +292,20 @@
junction.DemandPattern = null;
rhs.Junctions.Add(junction);
link.StartCode = junction.Code;
- (startLinkParter as IRevitLink).EndCode = junction.Code;
+
+ if (startLink.StartCode == link.StartCode)
+ {
+ startLink.StartCode = junction.Code;
+ }
+ else if (startLink.EndCode == link.StartCode)
+ {
+ startLink.EndCode = junction.Code;
+ }
+ allParterList.Add(junction);
}
- allParterList = rhs.GetAllParters();
var endLinkParter = allParterList.Find(x => x.Code == link.EndCode);
- if (endLinkParter is IRevitLink)
+ if (endLinkParter is IRevitLink endLink)
{
var junction = new Model.RevitJunction();
junction.Id = Yw.Untity.UniqueHelper.CreateFromFirst("junction", allParterList.Select(x => x.Code).ToList());
@@ -200,7 +321,15 @@
junction.DemandPattern = null;
rhs.Junctions.Add(junction);
link.EndCode = junction.Code;
- (endLinkParter as IRevitLink).StartCode = junction.Code;
+ if (endLink.StartCode == link.EndCode)
+ {
+ endLink.StartCode = junction.Code;
+ }
+ else if (endLink.EndCode == link.EndCode)
+ {
+ endLink.EndCode = junction.Code;
+ }
+ allParterList.Add(junction);
}
}
return true;
--
Gitblit v1.9.3