From 98e49c0dd42840a094837f7acae532bc237a719a Mon Sep 17 00:00:00 2001
From: yangyin <1850366751@qq.com>
Date: 星期二, 20 八月 2024 15:42:37 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
Hydro/Yw.Hydro.Core/ParseHelper.cs | 40 ++++++++++++++++++++++------------------
1 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/Hydro/Yw.Hydro.Core/ParseHelper.cs b/Hydro/Yw.Hydro.Core/ParseHelper.cs
index 7e48d39..6030acd 100644
--- a/Hydro/Yw.Hydro.Core/ParseHelper.cs
+++ b/Hydro/Yw.Hydro.Core/ParseHelper.cs
@@ -1,4 +1,6 @@
-锘縩amespace Yw.Hydro
+锘縰sing System.Transactions;
+
+namespace Yw.Hydro
{
/// <summary>
/// 瑙ｆ瀽杈呭姪绫�
@@ -191,23 +193,6 @@
}
}
- //鎹㈢儹鍣�
- if (model.Exchangers != null && model.Exchangers.Count > 0)
- {
- foreach (var exchanger in model.Exchangers)
- {
- var exchangerModel = new Junction();
- exchangerModel.Id = exchanger.Code;
- exchangerModel.Name = exchanger.Name;
- exchangerModel.Quality = exchanger.Quality;
- exchangerModel.Position = new Position2d(exchanger.Position2d.X, exchanger.Position2d.Y);
- exchangerModel.Elev = exchanger.Elev;
- exchangerModel.Demand = exchanger.Demand;
- exchangerModel.DemandPattern = exchanger.DemandPattern;
- netWork.Junctions.Add(exchangerModel);
- }
- }
-
//姘村簱
if (model.Reservoirs != null && model.Reservoirs.Count > 0)
{
@@ -311,6 +296,25 @@
}
}
+ //鎹㈢儹鍣�
+ if (model.Exchangers != null && model.Exchangers.Count > 0)
+ {
+ foreach (var exchanger in model.Exchangers)
+ {
+ var exchangerModel = new Pipe();
+ exchangerModel.Id = exchanger.Code;
+ exchangerModel.Name = exchanger.Name;
+ exchangerModel.StartNode = allNodes.Find(x => x.Id == exchanger.StartCode);
+ exchangerModel.EndNode = allNodes.Find(x => x.Id == exchanger.EndCode);
+ exchangerModel.LinkStatus = exchanger.LinkStatus;
+ exchangerModel.Length = exchanger.Length;
+ exchangerModel.Diameter = exchanger.Diameter;
+ exchangerModel.Roughness = exchanger.Roughness;
+ exchangerModel.MinorLoss = exchanger.MinorLoss;
+ netWork.Pipes.Add(exchangerModel);
+ }
+ }
+
//姘存车
if (model.Pumps != null && model.Pumps.Count > 0)
{
--
Gitblit v1.9.3