Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

yangyin

2024-08-20 98e49c0dd42840a094837f7acae532bc237a719a

 Hydro/Yw.Hydro.Core/ParseHelper.cs

@@ -1,4 +1,6 @@
namespace Yw.Hydro
using 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)
            {