From 7505bedd1778aa618b62eba7d026e7e51ac851c8 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期五, 08 十一月 2024 13:10:24 +0800
Subject: [PATCH] 升级basic bll
---
Hydro/HStation.Hydro.Core/TransferHelper.cs | 89 ++++++++++++++++++--------------------------
1 files changed, 37 insertions(+), 52 deletions(-)
diff --git a/Hydro/HStation.Hydro.Core/TransferHelper.cs b/Hydro/HStation.Hydro.Core/TransferHelper.cs
index 95e11f7..d4155f0 100644
--- a/Hydro/HStation.Hydro.Core/TransferHelper.cs
+++ b/Hydro/HStation.Hydro.Core/TransferHelper.cs
@@ -1,8 +1,4 @@
-锘縰sing HStation.Model;
-using System.Diagnostics.Metrics;
-using System.Transactions;
-using Yw.EPAnet;
-using Yw.Model;
+锘縰sing Yw.Model;
namespace HStation.Hydro
{
@@ -36,7 +32,6 @@
foreach (var revitReservoir in revitModel.Reservoirs)
{
var reservoir = FromRevit(revitReservoir);
- //reservoir.PropStatusList = null;
hydro.Reservoirs.Add(reservoir);
}
}
@@ -51,7 +46,6 @@
foreach (var revitTank in revitModel.Tanks)
{
var tank = FromRevit(revitTank);
- //tank.PropStatusList = null;
hydro.Tanks.Add(tank);
}
}
@@ -66,7 +60,6 @@
foreach (var revitWaterbox in revitModel.Waterboxs)
{
var waterbox = FromRevit(revitWaterbox);
- //waterbox.PropStatusList = null;
hydro.Waterboxs.Add(waterbox);
}
}
@@ -81,7 +74,6 @@
foreach (var revitJunction in revitModel.Junctions)
{
var junction = FromRevit(revitJunction);
- //junction.PropStatusList = null;
hydro.Junctions.Add(junction);
}
}
@@ -96,7 +88,6 @@
foreach (var revitBlunthead in revitModel.Bluntheads)
{
var blunthead = FromRevit(revitBlunthead);
- // blunthead.PropStatusList = null;
hydro.Bluntheads.Add(blunthead);
}
}
@@ -111,7 +102,6 @@
foreach (var revitElbow in revitModel.Elbows)
{
var elbow = FromRevit(revitElbow);
- //elbow.PropStatusList = null;
hydro.Elbows.Add(elbow);
}
}
@@ -126,7 +116,6 @@
foreach (var revitThreelink in revitModel.Threelinks)
{
var threelink = FromRevit(revitThreelink);
- //threelink.PropStatusList = null;
hydro.Threelinks.Add(threelink);
}
}
@@ -141,7 +130,6 @@
foreach (var revitFourlink in revitModel.Fourlinks)
{
var fourlink = FromRevit(revitFourlink);
- //fourlink.PropStatusList = null;
hydro.Fourlinks.Add(fourlink);
}
}
@@ -156,7 +144,6 @@
foreach (var revitHydrant in revitModel.Hydrants)
{
var hydrant = FromRevit(revitHydrant);
- //hydrant.PropStatusList = null;
hydro.Hydrants.Add(hydrant);
}
}
@@ -171,7 +158,6 @@
foreach (var revitNozzle in revitModel.Nozzles)
{
var nozzle = FromRevit(revitNozzle);
- //nozzle.PropStatusList = null;
hydro.Nozzles.Add(nozzle);
}
}
@@ -186,7 +172,6 @@
foreach (var revitMeter in revitModel.Meters)
{
var meter = FromRevit(revitMeter);
- //meter.PropStatusList = null;
hydro.Meters.Add(meter);
}
}
@@ -201,7 +186,6 @@
foreach (var revitFlowmeter in revitModel.Flowmeters)
{
var flowmeter = FromRevit(revitFlowmeter);
- //flowmeter.PropStatusList = null;
hydro.Flowmeters.Add(flowmeter);
}
}
@@ -216,7 +200,6 @@
foreach (var revitPressmeter in revitModel.Pressmeters)
{
var pressmeter = FromRevit(revitPressmeter);
- //pressmeter.PropStatusList = null;
hydro.Pressmeters.Add(pressmeter);
}
}
@@ -231,7 +214,6 @@
foreach (var revitPipe in revitModel.Pipes)
{
var pipe = FromRevit(revitPipe);
- //pipe.PropStatusList = null;
hydro.Pipes.Add(pipe);
}
}
@@ -246,38 +228,7 @@
foreach (var revitTranslation in revitModel.Translations)
{
var translation = FromRevit(revitTranslation);
- // translation.PropStatusList = null;
hydro.Translations.Add(translation);
- }
- }
-
- //鎹㈢儹鍣�
- if (revitModel.Exchangers != null && revitModel.Exchangers.Count > 0)
- {
- if (hydro.Exchangers == null)
- {
- hydro.Exchangers = new List<HydroExchangerInfo>();
- }
- foreach (var revitExchanger in revitModel.Exchangers)
- {
- var exchanger = FromRevit(revitExchanger);
- // exchanger.PropStatusList = null;
- hydro.Exchangers.Add(exchanger);
- }
- }
-
- //绌哄帇鏈�
- if (revitModel.Compressors != null && revitModel.Compressors.Count > 0)
- {
- if (hydro.Compressors == null)
- {
- hydro.Compressors = new List<HydroCompressorInfo>();
- }
- foreach (var revitCompressor in revitModel.Compressors)
- {
- var compressor = FromRevit(revitCompressor);
- //compressor.PropStatusList = null;
- hydro.Compressors.Add(compressor);
}
}
@@ -291,7 +242,6 @@
foreach (var revitPump in revitModel.Pumps)
{
var pump = FromRevit(revitPump);
- //pump.PropStatusList = null;
hydro.Pumps.Add(pump);
}
}
@@ -306,8 +256,35 @@
foreach (var revitValve in revitModel.Valves)
{
var valve = FromRevit(revitValve);
- //valve.PropStatusList = null;
hydro.Valves.Add(valve);
+ }
+ }
+
+ //鎹㈢儹鍣�
+ if (revitModel.Exchangers != null && revitModel.Exchangers.Count > 0)
+ {
+ if (hydro.Exchangers == null)
+ {
+ hydro.Exchangers = new List<HydroExchangerInfo>();
+ }
+ foreach (var revitExchanger in revitModel.Exchangers)
+ {
+ var exchanger = FromRevit(revitExchanger);
+ hydro.Exchangers.Add(exchanger);
+ }
+ }
+
+ //绌哄帇鏈�
+ if (revitModel.Compressors != null && revitModel.Compressors.Count > 0)
+ {
+ if (hydro.Compressors == null)
+ {
+ hydro.Compressors = new List<HydroCompressorInfo>();
+ }
+ foreach (var revitCompressor in revitModel.Compressors)
+ {
+ var compressor = FromRevit(revitCompressor);
+ hydro.Compressors.Add(compressor);
}
}
@@ -720,6 +697,10 @@
nozzle.UpdatePropStatus(nameof(nozzle.Position2d), revitNozzle, nameof(revitNozzle.Position));
nozzle.Position3d = new Yw.Model.Hydro.Position3d(revitNozzle.Position.X, revitNozzle.Position.Y, revitNozzle.Position.Z);
nozzle.UpdatePropStatus(nameof(nozzle.Position3d), revitNozzle, nameof(revitNozzle.Position));
+ nozzle.Material = revitNozzle.Material;
+ nozzle.UpdatePropStatus(nameof(nozzle.Material), revitNozzle, nameof(revitNozzle.Material));
+ nozzle.Caliber = revitNozzle.Caliber;
+ nozzle.UpdatePropStatus(nameof(nozzle.Caliber), revitNozzle, nameof(revitNozzle.Caliber));
nozzle.Coefficient = revitNozzle.Coefficient;
nozzle.UpdatePropStatus(nameof(nozzle.Coefficient), revitNozzle, nameof(revitNozzle.Coefficient));
nozzle.ScenePropValueList = revitNozzle.PropValueList?.Select(x => new Yw.Model.HydroParterScenePropValueInfo()
@@ -762,6 +743,10 @@
hydrant.UpdatePropStatus(nameof(hydrant.Position2d), revitHydrant, nameof(revitHydrant.Position));
hydrant.Position3d = new Yw.Model.Hydro.Position3d(revitHydrant.Position.X, revitHydrant.Position.Y, revitHydrant.Position.Z);
hydrant.UpdatePropStatus(nameof(hydrant.Position3d), revitHydrant, nameof(revitHydrant.Position));
+ hydrant.Material = revitHydrant.Material;
+ hydrant.UpdatePropStatus(nameof(hydrant.Material), revitHydrant, nameof(revitHydrant.Material));
+ hydrant.Caliber = revitHydrant.Caliber;
+ hydrant.UpdatePropStatus(nameof(hydrant.Caliber), revitHydrant, nameof(revitHydrant.Caliber));
hydrant.Coefficient = revitHydrant.Coefficient;
hydrant.UpdatePropStatus(nameof(hydrant.Coefficient), revitHydrant, nameof(revitHydrant.Coefficient));
hydrant.ScenePropValueList = revitHydrant.PropValueList?.Select(x => new Yw.Model.HydroParterScenePropValueInfo()
--
Gitblit v1.9.3