1

lixiaojun

2024-07-30 0832ac460e994d1f852f14e91b09b380ebf66a52

1

 Entry/HStation.Entry.Xhs.Core/HStation.Entry.Xhs.Core.csproj

@@ -17,7 +17,7 @@
    </ProjectExtensions>

    <ItemGroup>
        <ProjectReference Include="..\HStation.WebApi.Xhs.Core\HStation.WebApi.Xhs.Core.csproj" />
        <ProjectReference Include="..\..\WebApi\HStation.WebApi.Xhs.Core\HStation.WebApi.Xhs.Core.csproj" />
    </ItemGroup>

</Project>

 Hydro/HStation.Hydro.Core/GlobalUsings.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1 @@
global using Yw.Untity;

 Hydro/HStation.Hydro.Core/HStation.Hydro.Core.csproj

@@ -3,11 +3,12 @@
  <PropertyGroup>
    <TargetFramework>net6.0</TargetFramework>
    <ImplicitUsings>enable</ImplicitUsings>
    <Nullable>enable</Nullable>
    <Nullable>disable</Nullable>
  </PropertyGroup>

  <ItemGroup>
    <PackageReference Include="Yw.BLL.Hydro.Core" Version="3.0.3" />
    <PackageReference Include="Yw.BLL.Hydro.Core" Version="3.0.5" />
    <PackageReference Include="Yw.Untity.Core" Version="3.0.1" />
  </ItemGroup>

  <ItemGroup>

 Hydro/HStation.Hydro.Core/ParseHelper.cs

@@ -1,4 +1,6 @@
namespace HStation.Hydro
using HStation.Model;

namespace HStation.Hydro
{
    /// <summary>
    /// è§£æžè¾…助类
@@ -8,8 +10,40 @@
        /// <summary>
        /// ä»ŽRevit解析
        /// </summary>
        public static Yw.Model.HydroModelInfo FromRevit(HStation.Model.RevitModel revitModel)
        public static Yw.Model.HydroModelInfo FromRevit(HStation.Model.RevitModel revitModel, out string msg)
        {
            msg = string.Empty;

            #region Revit组件整合

            var allRevitParterList = new List<HStation.Model.RevitParter>();
            if (revitModel.Reservoirs != null)
            {
                allRevitParterList.AddRange(revitModel.Reservoirs);
            }
            if (revitModel.Tanks != null)
            {
                allRevitParterList.AddRange(revitModel.Tanks);
            }
            if (revitModel.Junctions != null)
            {
                allRevitParterList.AddRange(revitModel.Junctions);
            }
            if (revitModel.Pipes != null)
            {
                allRevitParterList.AddRange(revitModel.Pipes);
            }
            if (revitModel.Valves != null)
            {
                allRevitParterList.AddRange(revitModel.Valves);
            }
            if (revitModel.Pumps != null)
            {
                allRevitParterList.AddRange(revitModel.Pumps);
            }

            #endregion

            var hydro = new Yw.Model.HydroModelInfo();
            hydro.Name = revitModel.Name;
            hydro.Code = null;
@@ -19,237 +53,232 @@
            hydro.TagName = null;
            hydro.Description = revitModel.Description;

            //水库
            if (revitModel.Reservoirs != null && revitModel.Reservoirs.Count > 0)
            {
                hydro.Reservoirs = new List<Yw.Model.HydroReservoirInfo>();
                foreach (var revitReservoir in revitModel.Reservoirs)
                {
                    var reservoir = new Yw.Model.HydroReservoirInfo();
                    reservoir.Catalog = Yw.Hydro.Catalog.Reservoir;
                    reservoir.Name = revitReservoir.Name;
                    reservoir.Code = revitReservoir.Code;
                    reservoir.Flags = revitReservoir.Flags;
                    reservoir.Description = revitReservoir.Description;
                    reservoir.Head = revitReservoir.Head;
                    reservoir.Pattern = revitReservoir.Pattern;
                    var center = revitReservoir.BoundingBox.Center;
                    reservoir.Position2d = new Yw.Model.Hydro.Position2d(center.X, center.Y);
                    reservoir.Position3d = new Yw.Model.Hydro.Position3d(center.X, center.Y, center.Z);
                    reservoir.ScenePropValueList = revitReservoir.PropValueList?.Select(x => new Yw.Model.HydroScenePropValuePureInfo()
                    {
                        PropName = x.Key,
                        PropValue = x.Value?.ToString()
                    }).ToList();
                    hydro.Reservoirs.Add(reservoir);
                }
            }
            ////水库
            //if (revitModel.Reservoirs != null && revitModel.Reservoirs.Count > 0)
            //{
            //    hydro.Reservoirs = new List<Yw.Model.HydroReservoirInfo>();
            //    foreach (var revitReservoir in revitModel.Reservoirs)
            //    {
            //        var reservoir = new Yw.Model.HydroReservoirInfo();
            //        reservoir.Catalog = Yw.Hydro.Catalog.Reservoir;
            //        reservoir.Name = revitReservoir.Name;
            //        reservoir.Code = revitReservoir.Code;
            //        reservoir.Flags = revitReservoir.Flags;
            //        reservoir.Description = revitReservoir.Description;
            //        reservoir.Head = revitReservoir.Head;
            //        reservoir.Pattern = revitReservoir.Pattern;
            //        var center = revitReservoir.BoundingBox.Center;
            //        reservoir.Position2d = new Yw.Model.Hydro.Position2d(center.X, center.Y);
            //        reservoir.Position3d = new Yw.Model.Hydro.Position3d(center.X, center.Y, center.Z);
            //        reservoir.ScenePropValueList = revitReservoir.PropValueList?.Select(x => new Yw.Model.HydroScenePropValuePureInfo()
            //        {
            //            PropName = x.Key,
            //            PropValue = x.Value?.ToString()
            //        }).ToList();
            //        hydro.Reservoirs.Add(reservoir);
            //    }
            //}

            //æ°´æ± 
            if (revitModel.Tanks != null && revitModel.Tanks.Count > 0)
            {
                hydro.Tanks = new List<Yw.Model.HydroTankInfo>();
                foreach (var revitTank in revitModel.Tanks)
                {
                    var tank = new Yw.Model.HydroTankInfo();
                    tank.Catalog = Yw.Hydro.Catalog.Tank;
                    tank.Name = revitTank.Name;
                    tank.Code = revitTank.Code;
                    tank.Flags = revitTank.Flags;
                    tank.Description = revitTank.Description;
                    tank.Elev = revitTank.Elev;
                    tank.InitLevel = revitTank.InitLevel;
                    tank.MinLevel = revitTank.MinLevel;
                    tank.MaxLevel = revitTank.MaxLevel;
                    tank.Diameter = revitTank.Diameter;
                    tank.MinVol = revitTank.MinVol;
                    tank.VolCurve = revitTank.VolCurve;
                    var center = revitTank.BoundingBox.Center;
                    tank.Position2d = new Yw.Model.Hydro.Position2d(center.X, center.Y);
                    tank.Position3d = new Yw.Model.Hydro.Position3d(center.X, center.Y, center.Z);
                    tank.ScenePropValueList = revitTank.PropValueList?.Select(x => new Yw.Model.HydroScenePropValuePureInfo()
                    {
                        PropName = x.Key,
                        PropValue = x.Value?.ToString()
                    }).ToList();
                    hydro.Tanks.Add(tank);
                }
            }
            ////æ°´æ± 
            //if (revitModel.Tanks != null && revitModel.Tanks.Count > 0)
            //{
            //    hydro.Tanks = new List<Yw.Model.HydroTankInfo>();
            //    foreach (var revitTank in revitModel.Tanks)
            //    {
            //        var tank = new Yw.Model.HydroTankInfo();
            //        tank.Catalog = Yw.Hydro.Catalog.Tank;
            //        tank.Name = revitTank.Name;
            //        tank.Code = revitTank.Code;
            //        tank.Flags = revitTank.Flags;
            //        tank.Description = revitTank.Description;
            //        tank.Elev = revitTank.PoolElev;
            //        tank.InitLevel = revitTank.InitLevel;
            //        tank.MinLevel = revitTank.MinLevel;
            //        tank.MaxLevel = revitTank.MaxLevel;
            //        tank.Diameter = revitTank.Diameter;
            //        tank.MinVol = revitTank.MinVol;
            //        tank.VolCurve = revitTank.VolCurve;
            //        var center = revitTank.BoundingBox.Center;
            //        tank.Position2d = new Yw.Model.Hydro.Position2d(center.X, center.Y);
            //        tank.Position3d = new Yw.Model.Hydro.Position3d(center.X, center.Y, center.Z);
            //        tank.ScenePropValueList = revitTank.PropValueList?.Select(x => new Yw.Model.HydroScenePropValuePureInfo()
            //        {
            //            PropName = x.Key,
            //            PropValue = x.Value?.ToString()
            //        }).ToList();
            //        hydro.Tanks.Add(tank);
            //    }
            //}

            //扩散器
            if (revitModel.Emitters != null && revitModel.Emitters.Count > 0)
            {
                hydro.Emitters = new List<Yw.Model.HydroEmitterInfo>();
                foreach (var revitEmitter in revitModel.Emitters)
                {
                    var emitter = new Yw.Model.HydroEmitterInfo();
                    emitter.Catalog = Yw.Hydro.Catalog.Emitter;
                    emitter.Name = revitEmitter.Name;
                    emitter.Code = revitEmitter.Code;
                    emitter.Flags = revitEmitter.Flags;
                    emitter.Description = revitEmitter.Description;
                    emitter.EmitterType = revitEmitter.EmitterType;
                    emitter.FlowCoefficient = revitEmitter.FlowCoefficient;
                    var center = revitEmitter.BoundingBox.Center;
                    emitter.Position2d = new Yw.Model.Hydro.Position2d(center.X, center.Y);
                    emitter.Position3d = new Yw.Model.Hydro.Position3d(center.X, center.Y, center.Z);
                    emitter.ScenePropValueList = revitEmitter.PropValueList?.Select(x => new Yw.Model.HydroScenePropValuePureInfo()
                    {
                        PropName = x.Key,
                        PropValue = x.Value?.ToString()
                    }).ToList();
                    hydro.Emitters.Add(emitter);
                }
            }
            ////节点
            //if (revitModel.Junctions != null && revitModel.Junctions.Count > 0)
            //{
            //    hydro.Junctions = new List<Yw.Model.HydroJunctionInfo>();
            //    foreach (var revitJunction in revitModel.Junctions)
            //    {
            //        var junction = new Yw.Model.HydroJunctionInfo();
            //        junction.Catalog = Yw.Hydro.Catalog.Junction;
            //        junction.Name = revitJunction.Name;
            //        junction.Code = revitJunction.Code;
            //        junction.Flags = revitJunction.Flags;
            //        junction.Description = revitJunction.Description;
            //        junction.Elev = revitJunction.Elev;
            //        junction.Demand = revitJunction.Demand;
            //        junction.Pattern = revitJunction.Pattern;
            //        var center = revitJunction.BoundingBox.Center;
            //        junction.Position2d = new Yw.Model.Hydro.Position2d(center.X, center.Y);
            //        junction.Position3d = new Yw.Model.Hydro.Position3d(center.X, center.Y, center.Z);
            //        junction.ScenePropValueList = revitJunction.PropValueList?.Select(x => new Yw.Model.HydroScenePropValuePureInfo()
            //        {
            //            PropName = x.Key,
            //            PropValue = x.Value?.ToString()
            //        }).ToList();
            //        hydro.Junctions.Add(junction);
            //    }
            //}

            //节点
            if (revitModel.Junctions != null && revitModel.Junctions.Count > 0)
            {
                hydro.Junctions = new List<Yw.Model.HydroJunctionInfo>();
                foreach (var revitJunction in revitModel.Junctions)
                {
                    var junction = new Yw.Model.HydroJunctionInfo();
                    junction.Catalog = Yw.Hydro.Catalog.Junction;
                    junction.Name = revitJunction.Name;
                    junction.Code = revitJunction.Code;
                    junction.Flags = revitJunction.Flags;
                    junction.Description = revitJunction.Description;
                    junction.Elev = revitJunction.Elev;
                    junction.Demand = revitJunction.Demand;
                    junction.Pattern = revitJunction.Pattern;
                    var center = revitJunction.BoundingBox.Center;
                    junction.Position2d = new Yw.Model.Hydro.Position2d(center.X, center.Y);
                    junction.Position3d = new Yw.Model.Hydro.Position3d(center.X, center.Y, center.Z);
                    junction.ScenePropValueList = revitJunction.PropValueList?.Select(x => new Yw.Model.HydroScenePropValuePureInfo()
                    {
                        PropName = x.Key,
                        PropValue = x.Value?.ToString()
                    }).ToList();
                    hydro.Junctions.Add(junction);
                }
            }
            ////æ°´æ³µ
            //if (revitModel.Pumps != null && revitModel.Pumps.Count > 0)
            //{
            //    hydro.Pumps = new List<Yw.Model.HydroPumpInfo>();
            //    foreach (var revitPump in revitModel.Pumps)
            //    {
            //        var revitStartParter = allRevitParterList.Find(x => x.Code == revitPump.StartCode);
            //        if (revitStartParter == null)
            //        {
            //            msg = $"Pump：{revitPump.Code}，StartCode：{revitPump.StartCode} Error";
            //            return default;
            //        }
            //        if (revitStartParter is RevitReservoir)
            //        {
            //            msg = $"Pump：{revitPump.Code}，StartCode：{revitPump.StartCode} Error，Canot Reservoir";
            //            return default;
            //        }
            //        if (revitStartParter is RevitTank)
            //        {
            //            msg = $"Pump：{revitPump.Code}，StartCode：{revitPump.StartCode} Error，Canot Tank";
            //            return default;
            //        }

            //æ°´æ³µ
            if (revitModel.Pumps != null && revitModel.Pumps.Count > 0)
            {
                hydro.Pumps = new List<Yw.Model.HydroPumpInfo>();
                foreach (var revitPump in revitModel.Pumps)
                {
                    var revitStartJunction = revitModel.Junctions?.Find(x => x.Code == revitPump.StartCode);
                    if (revitStartJunction == null)
                    {
            //        if (revitStartParter is not RevitJunction)
            //        {
            //            var revitStartJunction = new RevitJunction();
            //            revitStartJunction.Id = RevitHelper.CreateUniqueCode(Yw.Hydro.Catalog.Junction, allRevitParterList);
            //            revitStartJunction.Name = revitStartJunction.Id;
            //            revitStartJunction.Code = revitStartJunction.Id;
            //            revitStartJunction.Elev = revitPump.Elev;

                    }
            //        }

                    var revitEndJunction = revitModel.Junctions?.Find(x => x.Code == revitPump.EndCode);
                    if (revitEndJunction == null)
                    {
            //        var revitEndJunction = revitModel.Junctions?.Find(x => x.Code == revitPump.EndCode);
            //        if (revitEndJunction == null)
            //        {
            //            msg = $"Pump：{revitPump.Code}，EndCode：{revitPump.EndCode} Error";
            //            return default;
            //        }

                    }
            //        var pump = new Yw.Model.HydroPumpInfo();
            //        pump.Catalog = Yw.Hydro.Catalog.Pump;
            //        pump.Name = revitPump.Name;
            //        pump.Code = revitPump.Code;
            //        pump.Flags = revitPump.Flags;
            //        pump.Description = revitPump.Description;
            //        pump.StartCode = revitPump.StartCode;
            //        pump.EndCode = revitPump.EndCode;
            //        pump.Power = revitPump.Power;
            //        pump.Head = revitPump.Head;
            //        pump.Speed = revitPump.Speed;
            //        pump.Pattern = revitPump.Pattern;
            //        pump.ScenePropValueList = revitPump.PropValueList?.Select(x => new Yw.Model.HydroScenePropValuePureInfo()
            //        {
            //            PropName = x.Key,
            //            PropValue = x.Value?.ToString()
            //        }).ToList();
            //        hydro.Pumps.Add(pump);
            //    }
            //}

                    var pump = new Yw.Model.HydroPumpInfo();
                    pump.Catalog = Yw.Hydro.Catalog.Pump;
                    pump.Name = revitPump.Name;
                    pump.Code = revitPump.Code;
                    pump.Flags = revitPump.Flags;
                    pump.Description = revitPump.Description;
                    pump.StartCode = revitPump.StartCode;
                    pump.EndCode = revitPump.EndCode;
                    pump.Power = revitPump.Power;
                    pump.Head = revitPump.Head;
                    pump.Speed = revitPump.Speed;
                    pump.Pattern = revitPump.Pattern;
                    pump.ScenePropValueList = revitPump.PropValueList?.Select(x => new Yw.Model.HydroScenePropValuePureInfo()
                    {
                        PropName = x.Key,
                        PropValue = x.Value?.ToString()
                    }).ToList();
                    hydro.Pumps.Add(pump);
                }
            }
            ////阀门
            //if (revitModel.Valves != null && revitModel.Valves.Count > 0)
            //{
            //    hydro.Valves = new List<Yw.Model.HydroValveInfo>();
            //    foreach (var revitValve in revitModel.Valves)
            //    {
            //        var revitStartJunction = revitModel.Junctions?.Find(x => x.Code == revitValve.StartCode);
            //        if (revitStartJunction == null)
            //        {

            //阀门
            if (revitModel.Valves != null && revitModel.Valves.Count > 0)
            {
                hydro.Valves = new List<Yw.Model.HydroValveInfo>();
                foreach (var revitValve in revitModel.Valves)
                {
                    var revitStartJunction = revitModel.Junctions?.Find(x => x.Code == revitValve.StartCode);
                    if (revitStartJunction == null)
                    {
            //        }

                    }
            //        var revitEndJunction = revitModel.Junctions?.Find(x => x.Code == revitValve.EndCode);
            //        if (revitEndJunction == null)
            //        {

                    var revitEndJunction = revitModel.Junctions?.Find(x => x.Code == revitValve.EndCode);
                    if (revitEndJunction == null)
                    {
            //        }

                    }
            //        var valve = new Yw.Model.HydroValveInfo();
            //        valve.Catalog = Yw.Hydro.Catalog.Valve;
            //        valve.Name = revitValve.Name;
            //        valve.Code = revitValve.Code;
            //        valve.Flags = revitValve.Flags;
            //        valve.Description = revitValve.Description;
            //        valve.StartCode = revitValve.StartCode;
            //        valve.EndCode = revitValve.EndCode;
            //        valve.Diameter = revitValve.Diameter;
            //        valve.MinorLoss = revitValve.MinorLoss;
            //        valve.ValveType = revitValve.ValveType;
            //        valve.ValveSetting = revitValve.ValveSetting;
            //        valve.ScenePropValueList = revitValve.PropValueList?.Select(x => new Yw.Model.HydroScenePropValuePureInfo()
            //        {
            //            PropName = x.Key,
            //            PropValue = x.Value?.ToString()
            //        }).ToList();
            //        hydro.Valves.Add(valve);
            //    }
            //}

                    var valve = new Yw.Model.HydroValveInfo();
                    valve.Catalog = Yw.Hydro.Catalog.Valve;
                    valve.Name = revitValve.Name;
                    valve.Code = revitValve.Code;
                    valve.Flags = revitValve.Flags;
                    valve.Description = revitValve.Description;
                    valve.StartCode = revitValve.StartCode;
                    valve.EndCode = revitValve.EndCode;
                    valve.Diameter = revitValve.Diameter;
                    valve.MinorLoss = revitValve.MinorLoss;
                    valve.ValveType = revitValve.ValveType;
                    valve.ValveSetting = revitValve.ValveSetting;
                    valve.ScenePropValueList = revitValve.PropValueList?.Select(x => new Yw.Model.HydroScenePropValuePureInfo()
                    {
                        PropName = x.Key,
                        PropValue = x.Value?.ToString()
                    }).ToList();
                    hydro.Valves.Add(valve);
                }
            }
            ////管道
            //if (revitModel.Pipes != null && revitModel.Pipes.Count > 0)
            //{
            //    hydro.Pipes = new List<Yw.Model.HydroPipeInfo>();
            //    foreach (var revitPipe in revitModel.Pipes)
            //    {
            //        var pipe = new Yw.Model.HydroPipeInfo();
            //        pipe.Catalog = Yw.Hydro.Catalog.Pipe;
            //        pipe.Name = revitPipe.Name;
            //        pipe.Code = revitPipe.Code;
            //        pipe.Flags = revitPipe.Flags;
            //        pipe.Description = revitPipe.Description;
            //        pipe.StartCode = revitPipe.StartCode;
            //        pipe.EndCode = revitPipe.EndCode;
            //        pipe.Diameter = revitPipe.Diameter;
            //        pipe.Length = revitPipe.Length;
            //        pipe.Roughness = revitPipe.Roughness;
            //        pipe.MinorLoss = revitPipe.MinorLoss;
            //        pipe.PipeStatus = revitPipe.PipeStatus;
            //        pipe.ScenePropValueList = revitPipe.PropValueList?.Select(x => new Yw.Model.HydroScenePropValuePureInfo()
            //        {
            //            PropName = x.Key,
            //            PropValue = x.Value?.ToString()
            //        }).ToList();
            //        hydro.Pipes.Add(pipe);
            //    }
            //}

            //管道
            if (revitModel.Pipes != null && revitModel.Pipes.Count > 0)
            {
                hydro.Pipes = new List<Yw.Model.HydroPipeInfo>();
                foreach (var revitPipe in revitModel.Pipes)
                {
                    var pipe = new Yw.Model.HydroPipeInfo();
                    pipe.Catalog = Yw.Hydro.Catalog.Pipe;
                    pipe.Name = revitPipe.Name;
                    pipe.Code = revitPipe.Code;
                    pipe.Flags = revitPipe.Flags;
                    pipe.Description = revitPipe.Description;
                    pipe.StartCode = revitPipe.StartCode;
                    pipe.EndCode = revitPipe.EndCode;
                    pipe.Diameter = revitPipe.Diameter;
                    pipe.Length = revitPipe.Length;
                    pipe.Roughness = revitPipe.Roughness;
                    pipe.MinorLoss = revitPipe.MinorLoss;
                    pipe.PipeStatus = revitPipe.PipeStatus;
                    pipe.ScenePropValueList = revitPipe.PropValueList?.Select(x => new Yw.Model.HydroScenePropValuePureInfo()
                    {
                        PropName = x.Key,
                        PropValue = x.Value?.ToString()
                    }).ToList();
                    hydro.Pipes.Add(pipe);
                }
            }


            //装饰件
            if (revitModel.Decorators != null && revitModel.Decorators.Count > 0)
            {
                hydro.Decorators = new List<Yw.Model.HydroDecoratorInfo>();
                foreach (var revitDecorator in revitModel.Decorators)
                {
                    var decorator = new Yw.Model.HydroDecoratorInfo();
                    decorator.Name = revitDecorator.Name;
                    decorator.Category = revitDecorator.Category;
                    decorator.Decoration = revitDecorator.Decoration;
                    decorator.Description = revitDecorator.Description;
                    hydro.Decorators.Add(decorator);
                }
            }
            ////装饰件
            //if (revitModel.Decorators != null && revitModel.Decorators.Count > 0)
            //{
            //    hydro.Decorators = new List<Yw.Model.HydroDecoratorInfo>();
            //    foreach (var revitDecorator in revitModel.Decorators)
            //    {
            //        var decorator = new Yw.Model.HydroDecoratorInfo();
            //        decorator.Name = revitDecorator.Name;
            //        decorator.Category = revitDecorator.Category;
            //        decorator.Decoration = revitDecorator.Decoration;
            //        decorator.Description = revitDecorator.Description;
            //        hydro.Decorators.Add(decorator);
            //    }
            //}

            return hydro;
        }

 Hydro/HStation.Hydro.Core/RevitHelper.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
namespace HStation.Hydro
{
    /// <summary>
    /// Revit辅助类
    /// </summary>
    public class RevitHelper
    {
        /// <summary>
        /// åˆ›å»ºå”¯ä¸€ç¼–码
        /// </summary>
        /// <param name="catalog">分类</param>
        /// <param name="allParterList">所有组件</param>
        /// <returns>唯一编码</returns>
        public static string CreateUniqueCode(string catalog, List<HStation.Model.RevitParter> allParterList)
        {
            var allCodeList = allParterList?.Select(x => x.Code).Distinct().ToList();
            var code = UniqueHelper.CreateFromFirst(catalog, allCodeList);
            return code;
        }


    }
}

 Hydro/HStation.Hydro.Xhs.Core/Class1.cs

ÎļþÒÑɾ³ý

 Hydro/Yw.EPAcore.Core/x64/Debug/Yw.EPAcore.Core.Build.CppClean.log

@@ -1,66 +1,66 @@
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\x64\debug\yw.epacore.core.bsc
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\hydcoeffs.sbr
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\hydcoeffs.obj
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\smatrix.sbr
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\smatrix.obj
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\hydsolver.sbr
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\hydsolver.obj
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\stdafx.sbr
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\stdafx.obj
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\inpfile.sbr
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\inpfile.obj
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\epanet2.sbr
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\epanet2.obj
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\hash.sbr
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\hash.obj
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\qualreact.sbr
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\qualreact.obj
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\input3.sbr
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\input3.obj
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\input1.sbr
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\input1.obj
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\mempool.sbr
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\mempool.obj
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\qualroute.sbr
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\qualroute.obj
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\hydraul.sbr
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\hydraul.obj
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\.netframework,version=v4.7.2.assemblyattributes.sbr
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\.netframework,version=v4.7.2.assemblyattributes.obj
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\input2.sbr
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\input2.obj
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\hydstatus.sbr
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\hydstatus.obj
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\rules.sbr
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\rules.obj
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\epanet.sbr
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\epanet.obj
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\project.sbr
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\project.obj
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\output.sbr
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\output.obj
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\main.sbr
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\main.obj
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\report.sbr
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\report.obj
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\genmmd.sbr
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\genmmd.obj
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\quality.sbr
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\quality.obj
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\x64\debug\yw.epacore.core.dll
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\x64\debug\yw.epacore.core.pdb
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\x64\debug\yw.epacore.core.lib
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\x64\debug\yw.epacore.core.exp
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\yw.epacore.core.tlog\bscmake.command.1.tlog
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\yw.epacore.core.tlog\bscmake.read.1.tlog
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\yw.epacore.core.tlog\bscmake.write.1.tlog
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\yw.epacore.core.tlog\cl.command.1.tlog
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\yw.epacore.core.tlog\cl.items.tlog
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\yw.epacore.core.tlog\cl.read.1.tlog
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\yw.epacore.core.tlog\cl.write.1.tlog
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\yw.epacore.core.tlog\link.command.1.tlog
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\yw.epacore.core.tlog\link.read.1.tlog
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\yw.epacore.core.tlog\link.write.1.tlog
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\yw.epacore.core.tlog\link.write.2u.tlog
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\yw.epacore.core.tlog\metagen.read.1.tlog
d:\desktop\d_production\工具项目\isupply\xhs.v1.0\hydro\yw.epacore.core\x64\debug\yw.epacore.core.tlog\metagen.write.1.tlog
d:\workdata\git\hstation\xhs\x64\debug\yw.epacore.core.bsc
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\hydcoeffs.sbr
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\hydcoeffs.obj
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\input2.sbr
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\input2.obj
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\inpfile.sbr
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\inpfile.obj
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\output.sbr
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\output.obj
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\main.sbr
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\main.obj
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\input3.sbr
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\input3.obj
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\hydraul.sbr
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\hydraul.obj
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\epanet2.sbr
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\epanet2.obj
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\qualroute.sbr
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\qualroute.obj
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\stdafx.sbr
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\stdafx.obj
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\hydstatus.sbr
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\hydstatus.obj
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\mempool.sbr
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\mempool.obj
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\genmmd.sbr
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\genmmd.obj
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\quality.sbr
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\quality.obj
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\rules.sbr
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\rules.obj
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\project.sbr
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\project.obj
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\hash.sbr
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\hash.obj
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\qualreact.sbr
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\qualreact.obj
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\smatrix.sbr
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\smatrix.obj
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\input1.sbr
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\input1.obj
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\epanet.sbr
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\epanet.obj
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\report.sbr
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\report.obj
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\.netframework,version=v4.7.2.assemblyattributes.sbr
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\.netframework,version=v4.7.2.assemblyattributes.obj
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\hydsolver.sbr
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\hydsolver.obj
d:\workdata\git\hstation\xhs\x64\debug\yw.epacore.core.dll
d:\workdata\git\hstation\xhs\x64\debug\yw.epacore.core.pdb
d:\workdata\git\hstation\xhs\x64\debug\yw.epacore.core.lib
d:\workdata\git\hstation\xhs\x64\debug\yw.epacore.core.exp
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\yw.epacore.core.tlog\bscmake.command.1.tlog
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\yw.epacore.core.tlog\bscmake.read.1.tlog
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\yw.epacore.core.tlog\bscmake.write.1.tlog
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\yw.epacore.core.tlog\cl.command.1.tlog
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\yw.epacore.core.tlog\cl.items.tlog
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\yw.epacore.core.tlog\cl.read.1.tlog
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\yw.epacore.core.tlog\cl.write.1.tlog
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\yw.epacore.core.tlog\link.command.1.tlog
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\yw.epacore.core.tlog\link.read.1.tlog
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\yw.epacore.core.tlog\link.secondary.1.tlog
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\yw.epacore.core.tlog\link.write.1.tlog
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\yw.epacore.core.tlog\metagen.read.1.tlog
d:\workdata\git\hstation\xhs\hydro\yw.epacore.core\x64\debug\yw.epacore.core.tlog\metagen.write.1.tlog

 Hydro/Yw.EPAcore.Core/x64/Debug/Yw.EPAcore.Core.dll.recipe

@@ -2,7 +2,7 @@
<Project>
  <ProjectOutputs>
    <ProjectOutput>
      <FullPath>D:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\x64\Debug\Yw.EPAcore.Core.dll</FullPath>
      <FullPath>D:\WorkData\git\HStation\XHS\x64\Debug\Yw.EPAcore.Core.dll</FullPath>
    </ProjectOutput>
  </ProjectOutputs>
  <ContentFiles />

 Hydro/Yw.EPAcore.Core/x64/Debug/Yw.EPAcore.Core.log

@@ -1,4 +1,4 @@
C:\Program Files\Microsoft Visual Studio\2022\Community\MSBuild\Microsoft\VC\v170\Microsoft.CppBuild.targets(531,5): warning MSB8028: ä¸­é—´ç›®å½•(x64\Debug\)包含从另一个项目(Hydro.HydraulicCore.vcxproj)共享的文件。   è¿™ä¼šå¯¼è‡´é”™è¯¯çš„清除和重新生成行为。
C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\VC\v170\Microsoft.CppBuild.targets(531,5): warning MSB8028: ä¸­é—´ç›®å½•(x64\Debug\)包含从另一个项目(Hydro.HydraulicCore.vcxproj)共享的文件。   è¿™ä¼šå¯¼è‡´é”™è¯¯çš„清除和重新生成行为。
  epanet.cpp
  epanet2.cpp
  genmmd.cpp
@@ -24,5 +24,5 @@
  stdafx.cpp
  .NETFramework,Version=v4.7.2.AssemblyAttributes.cpp
  epanet.obj : é‡åˆ°äº† MSIL æ¨¡å—；对 MSIL ç¦ç”¨äº†å¢žé‡é“¾æŽ¥ï¼›æ­£åœ¨æ‰§è¡Œå®Œå…¨é“¾æŽ¥
    æ­£åœ¨åˆ›å»ºåº“ D:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\x64\Debug\Yw.EPAcore.Core.lib å’Œå¯¹è±¡ D:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\x64\Debug\Yw.EPAcore.Core.exp
  Yw.EPAcore.Core.vcxproj -> D:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\x64\Debug\Yw.EPAcore.Core.dll
    æ­£åœ¨åˆ›å»ºåº“ D:\WorkData\git\HStation\XHS\x64\Debug\Yw.EPAcore.Core.lib å’Œå¯¹è±¡ D:\WorkData\git\HStation\XHS\x64\Debug\Yw.EPAcore.Core.exp
  Yw.EPAcore.Core.vcxproj -> D:\WorkData\git\HStation\XHS\x64\Debug\Yw.EPAcore.Core.dll

 Hydro/Yw.EPAcore.Core/x64/Debug/Yw.EPAcore.Core.tlog/CL.command.1.tlog

Binary files differ

 Hydro/Yw.EPAcore.Core/x64/Debug/Yw.EPAcore.Core.tlog/CL.read.1.tlog

Binary files differ

 Hydro/Yw.EPAcore.Core/x64/Debug/Yw.EPAcore.Core.tlog/CL.write.1.tlog

Binary files differ

 Hydro/Yw.EPAcore.Core/x64/Debug/Yw.EPAcore.Core.tlog/Cl.items.tlog

@@ -1,24 +1,24 @@
d:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\Hydro\Yw.EPAcore.Core\src\epanet.cpp;d:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\Hydro\Yw.EPAcore.Core\x64\Debug\epanet.obj
d:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\Hydro\Yw.EPAcore.Core\src\epanet2.cpp;d:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\Hydro\Yw.EPAcore.Core\x64\Debug\epanet2.obj
d:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\Hydro\Yw.EPAcore.Core\src\genmmd.cpp;d:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\Hydro\Yw.EPAcore.Core\x64\Debug\genmmd.obj
d:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\Hydro\Yw.EPAcore.Core\src\hash.cpp;d:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\Hydro\Yw.EPAcore.Core\x64\Debug\hash.obj
d:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\Hydro\Yw.EPAcore.Core\src\hydcoeffs.cpp;d:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\Hydro\Yw.EPAcore.Core\x64\Debug\hydcoeffs.obj
d:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\Hydro\Yw.EPAcore.Core\src\hydraul.cpp;d:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\Hydro\Yw.EPAcore.Core\x64\Debug\hydraul.obj
d:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\Hydro\Yw.EPAcore.Core\src\hydsolver.cpp;d:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\Hydro\Yw.EPAcore.Core\x64\Debug\hydsolver.obj
d:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\Hydro\Yw.EPAcore.Core\src\hydstatus.cpp;d:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\Hydro\Yw.EPAcore.Core\x64\Debug\hydstatus.obj
d:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\Hydro\Yw.EPAcore.Core\src\inpfile.cpp;d:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\Hydro\Yw.EPAcore.Core\x64\Debug\inpfile.obj
d:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\Hydro\Yw.EPAcore.Core\src\input1.cpp;d:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\Hydro\Yw.EPAcore.Core\x64\Debug\input1.obj
d:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\Hydro\Yw.EPAcore.Core\src\input2.cpp;d:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\Hydro\Yw.EPAcore.Core\x64\Debug\input2.obj
d:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\Hydro\Yw.EPAcore.Core\src\input3.cpp;d:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\Hydro\Yw.EPAcore.Core\x64\Debug\input3.obj
d:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\Hydro\Yw.EPAcore.Core\src\main.cpp;d:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\Hydro\Yw.EPAcore.Core\x64\Debug\main.obj
d:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\Hydro\Yw.EPAcore.Core\src\mempool.cpp;d:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\Hydro\Yw.EPAcore.Core\x64\Debug\mempool.obj
d:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\Hydro\Yw.EPAcore.Core\src\output.cpp;d:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\Hydro\Yw.EPAcore.Core\x64\Debug\output.obj
d:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\Hydro\Yw.EPAcore.Core\src\project.cpp;d:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\Hydro\Yw.EPAcore.Core\x64\Debug\project.obj
d:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\Hydro\Yw.EPAcore.Core\src\quality.cpp;d:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\Hydro\Yw.EPAcore.Core\x64\Debug\quality.obj
d:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\Hydro\Yw.EPAcore.Core\src\qualreact.cpp;d:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\Hydro\Yw.EPAcore.Core\x64\Debug\qualreact.obj
d:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\Hydro\Yw.EPAcore.Core\src\qualroute.cpp;d:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\Hydro\Yw.EPAcore.Core\x64\Debug\qualroute.obj
d:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\Hydro\Yw.EPAcore.Core\src\report.cpp;d:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\Hydro\Yw.EPAcore.Core\x64\Debug\report.obj
d:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\Hydro\Yw.EPAcore.Core\src\rules.cpp;d:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\Hydro\Yw.EPAcore.Core\x64\Debug\rules.obj
d:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\Hydro\Yw.EPAcore.Core\src\smatrix.cpp;d:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\Hydro\Yw.EPAcore.Core\x64\Debug\smatrix.obj
d:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\Hydro\Yw.EPAcore.Core\src\stdafx.cpp;d:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\Hydro\Yw.EPAcore.Core\x64\Debug\stdafx.obj
d:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\Hydro\Yw.EPAcore.Core\x64\Debug\.NETFramework,Version=v4.7.2.AssemblyAttributes.cpp;d:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\Hydro\Yw.EPAcore.Core\x64\Debug\.NETFramework,Version=v4.7.2.AssemblyAttributes.obj
D:\WorkData\git\HStation\XHS\Hydro\Yw.EPAcore.Core\src\epanet.cpp;D:\WorkData\git\HStation\XHS\Hydro\Yw.EPAcore.Core\x64\Debug\epanet.obj
D:\WorkData\git\HStation\XHS\Hydro\Yw.EPAcore.Core\src\epanet2.cpp;D:\WorkData\git\HStation\XHS\Hydro\Yw.EPAcore.Core\x64\Debug\epanet2.obj
D:\WorkData\git\HStation\XHS\Hydro\Yw.EPAcore.Core\src\genmmd.cpp;D:\WorkData\git\HStation\XHS\Hydro\Yw.EPAcore.Core\x64\Debug\genmmd.obj
D:\WorkData\git\HStation\XHS\Hydro\Yw.EPAcore.Core\src\hash.cpp;D:\WorkData\git\HStation\XHS\Hydro\Yw.EPAcore.Core\x64\Debug\hash.obj
D:\WorkData\git\HStation\XHS\Hydro\Yw.EPAcore.Core\src\hydcoeffs.cpp;D:\WorkData\git\HStation\XHS\Hydro\Yw.EPAcore.Core\x64\Debug\hydcoeffs.obj
D:\WorkData\git\HStation\XHS\Hydro\Yw.EPAcore.Core\src\hydraul.cpp;D:\WorkData\git\HStation\XHS\Hydro\Yw.EPAcore.Core\x64\Debug\hydraul.obj
D:\WorkData\git\HStation\XHS\Hydro\Yw.EPAcore.Core\src\hydsolver.cpp;D:\WorkData\git\HStation\XHS\Hydro\Yw.EPAcore.Core\x64\Debug\hydsolver.obj
D:\WorkData\git\HStation\XHS\Hydro\Yw.EPAcore.Core\src\hydstatus.cpp;D:\WorkData\git\HStation\XHS\Hydro\Yw.EPAcore.Core\x64\Debug\hydstatus.obj
D:\WorkData\git\HStation\XHS\Hydro\Yw.EPAcore.Core\src\inpfile.cpp;D:\WorkData\git\HStation\XHS\Hydro\Yw.EPAcore.Core\x64\Debug\inpfile.obj
D:\WorkData\git\HStation\XHS\Hydro\Yw.EPAcore.Core\src\input1.cpp;D:\WorkData\git\HStation\XHS\Hydro\Yw.EPAcore.Core\x64\Debug\input1.obj
D:\WorkData\git\HStation\XHS\Hydro\Yw.EPAcore.Core\src\input2.cpp;D:\WorkData\git\HStation\XHS\Hydro\Yw.EPAcore.Core\x64\Debug\input2.obj
D:\WorkData\git\HStation\XHS\Hydro\Yw.EPAcore.Core\src\input3.cpp;D:\WorkData\git\HStation\XHS\Hydro\Yw.EPAcore.Core\x64\Debug\input3.obj
D:\WorkData\git\HStation\XHS\Hydro\Yw.EPAcore.Core\src\main.cpp;D:\WorkData\git\HStation\XHS\Hydro\Yw.EPAcore.Core\x64\Debug\main.obj
D:\WorkData\git\HStation\XHS\Hydro\Yw.EPAcore.Core\src\mempool.cpp;D:\WorkData\git\HStation\XHS\Hydro\Yw.EPAcore.Core\x64\Debug\mempool.obj
D:\WorkData\git\HStation\XHS\Hydro\Yw.EPAcore.Core\src\output.cpp;D:\WorkData\git\HStation\XHS\Hydro\Yw.EPAcore.Core\x64\Debug\output.obj
D:\WorkData\git\HStation\XHS\Hydro\Yw.EPAcore.Core\src\project.cpp;D:\WorkData\git\HStation\XHS\Hydro\Yw.EPAcore.Core\x64\Debug\project.obj
D:\WorkData\git\HStation\XHS\Hydro\Yw.EPAcore.Core\src\quality.cpp;D:\WorkData\git\HStation\XHS\Hydro\Yw.EPAcore.Core\x64\Debug\quality.obj
D:\WorkData\git\HStation\XHS\Hydro\Yw.EPAcore.Core\src\qualreact.cpp;D:\WorkData\git\HStation\XHS\Hydro\Yw.EPAcore.Core\x64\Debug\qualreact.obj
D:\WorkData\git\HStation\XHS\Hydro\Yw.EPAcore.Core\src\qualroute.cpp;D:\WorkData\git\HStation\XHS\Hydro\Yw.EPAcore.Core\x64\Debug\qualroute.obj
D:\WorkData\git\HStation\XHS\Hydro\Yw.EPAcore.Core\src\report.cpp;D:\WorkData\git\HStation\XHS\Hydro\Yw.EPAcore.Core\x64\Debug\report.obj
D:\WorkData\git\HStation\XHS\Hydro\Yw.EPAcore.Core\src\rules.cpp;D:\WorkData\git\HStation\XHS\Hydro\Yw.EPAcore.Core\x64\Debug\rules.obj
D:\WorkData\git\HStation\XHS\Hydro\Yw.EPAcore.Core\src\smatrix.cpp;D:\WorkData\git\HStation\XHS\Hydro\Yw.EPAcore.Core\x64\Debug\smatrix.obj
D:\WorkData\git\HStation\XHS\Hydro\Yw.EPAcore.Core\src\stdafx.cpp;D:\WorkData\git\HStation\XHS\Hydro\Yw.EPAcore.Core\x64\Debug\stdafx.obj
D:\WorkData\git\HStation\XHS\Hydro\Yw.EPAcore.Core\x64\Debug\.NETFramework,Version=v4.7.2.AssemblyAttributes.cpp;D:\WorkData\git\HStation\XHS\Hydro\Yw.EPAcore.Core\x64\Debug\.NETFramework,Version=v4.7.2.AssemblyAttributes.obj

 Hydro/Yw.EPAcore.Core/x64/Debug/Yw.EPAcore.Core.tlog/Yw.EPAcore.Core.lastbuildstate

@@ -1,2 +1,2 @@
PlatformToolSet=v143:VCToolArchitecture=Native64Bit:VCToolsVersion=14.36.32532:TargetPlatformVersion=10.0.22000.0:TargetFrameworkVersion=v4.7.2::EnableManagedIncrementalBuild=true:
Debug|x64|D:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\|
PlatformToolSet=v143:VCToolArchitecture=Native64Bit:VCToolsVersion=14.39.33519:TargetPlatformVersion=10.0.22621.0:TargetFrameworkVersion=v4.7.2::EnableManagedIncrementalBuild=true:
Debug|x64|D:\WorkData\git\HStation\XHS\|

 Hydro/Yw.EPAcore.Core/x64/Debug/Yw.EPAcore.Core.tlog/bscmake.command.1.tlog

Binary files differ

 Hydro/Yw.EPAcore.Core/x64/Debug/Yw.EPAcore.Core.tlog/bscmake.read.1.tlog

Binary files differ

 Hydro/Yw.EPAcore.Core/x64/Debug/Yw.EPAcore.Core.tlog/bscmake.write.1.tlog

Binary files differ

 Hydro/Yw.EPAcore.Core/x64/Debug/Yw.EPAcore.Core.tlog/link.command.1.tlog

Binary files differ

 Hydro/Yw.EPAcore.Core/x64/Debug/Yw.EPAcore.Core.tlog/link.read.1.tlog

Binary files differ

 Hydro/Yw.EPAcore.Core/x64/Debug/Yw.EPAcore.Core.tlog/link.secondary.1.tlog

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,3 @@
^D:\WORKDATA\GIT\HSTATION\XHS\HYDRO\YW.EPACORE.CORE\X64\DEBUG\.NETFRAMEWORK,VERSION=V4.7.2.ASSEMBLYATTRIBUTES.OBJ|D:\WORKDATA\GIT\HSTATION\XHS\HYDRO\YW.EPACORE.CORE\X64\DEBUG\EPANET.OBJ|D:\WORKDATA\GIT\HSTATION\XHS\HYDRO\YW.EPACORE.CORE\X64\DEBUG\EPANET2.OBJ|D:\WORKDATA\GIT\HSTATION\XHS\HYDRO\YW.EPACORE.CORE\X64\DEBUG\GENMMD.OBJ|D:\WORKDATA\GIT\HSTATION\XHS\HYDRO\YW.EPACORE.CORE\X64\DEBUG\HASH.OBJ|D:\WORKDATA\GIT\HSTATION\XHS\HYDRO\YW.EPACORE.CORE\X64\DEBUG\HYDCOEFFS.OBJ|D:\WORKDATA\GIT\HSTATION\XHS\HYDRO\YW.EPACORE.CORE\X64\DEBUG\HYDRAUL.OBJ|D:\WORKDATA\GIT\HSTATION\XHS\HYDRO\YW.EPACORE.CORE\X64\DEBUG\HYDSOLVER.OBJ|D:\WORKDATA\GIT\HSTATION\XHS\HYDRO\YW.EPACORE.CORE\X64\DEBUG\HYDSTATUS.OBJ|D:\WORKDATA\GIT\HSTATION\XHS\HYDRO\YW.EPACORE.CORE\X64\DEBUG\INPFILE.OBJ|D:\WORKDATA\GIT\HSTATION\XHS\HYDRO\YW.EPACORE.CORE\X64\DEBUG\INPUT1.OBJ|D:\WORKDATA\GIT\HSTATION\XHS\HYDRO\YW.EPACORE.CORE\X64\DEBUG\INPUT2.OBJ|D:\WORKDATA\GIT\HSTATION\XHS\HYDRO\YW.EPACORE.CORE\X64\DEBUG\INPUT3.OBJ|D:\WORKDATA\GIT\HSTATION\XHS\HYDRO\YW.EPACORE.CORE\X64\DEBUG\MAIN.OBJ|D:\WORKDATA\GIT\HSTATION\XHS\HYDRO\YW.EPACORE.CORE\X64\DEBUG\MEMPOOL.OBJ|D:\WORKDATA\GIT\HSTATION\XHS\HYDRO\YW.EPACORE.CORE\X64\DEBUG\OUTPUT.OBJ|D:\WORKDATA\GIT\HSTATION\XHS\HYDRO\YW.EPACORE.CORE\X64\DEBUG\PROJECT.OBJ|D:\WORKDATA\GIT\HSTATION\XHS\HYDRO\YW.EPACORE.CORE\X64\DEBUG\QUALITY.OBJ|D:\WORKDATA\GIT\HSTATION\XHS\HYDRO\YW.EPACORE.CORE\X64\DEBUG\QUALREACT.OBJ|D:\WORKDATA\GIT\HSTATION\XHS\HYDRO\YW.EPACORE.CORE\X64\DEBUG\QUALROUTE.OBJ|D:\WORKDATA\GIT\HSTATION\XHS\HYDRO\YW.EPACORE.CORE\X64\DEBUG\REPORT.OBJ|D:\WORKDATA\GIT\HSTATION\XHS\HYDRO\YW.EPACORE.CORE\X64\DEBUG\RULES.OBJ|D:\WORKDATA\GIT\HSTATION\XHS\HYDRO\YW.EPACORE.CORE\X64\DEBUG\SMATRIX.OBJ|D:\WORKDATA\GIT\HSTATION\XHS\HYDRO\YW.EPACORE.CORE\X64\DEBUG\STDAFX.OBJ
D:\WorkData\git\HStation\XHS\x64\Debug\Yw.EPAcore.Core.LIB
D:\WorkData\git\HStation\XHS\x64\Debug\Yw.EPAcore.Core.EXP

 Hydro/Yw.EPAcore.Core/x64/Debug/Yw.EPAcore.Core.tlog/link.write.1.tlog

Binary files differ

 Hydro/Yw.EPAcore.Core/x64/Debug/Yw.EPAcore.Core.tlog/link.write.2u.tlog

Binary files differ

 Hydro/Yw.EPAcore.Core/x64/Debug/Yw.EPAcore.Core.vcxproj.FileListAbsolute.txt

@@ -1 +1,2 @@
d:\Desktop\D_Production\工具项目\ISupply\XHS.V1.0\Hydro\Yw.EPAcore.Core\x64\Debug\Yw.EPAcore.Core.vcxproj.AssemblyReference.cache
D:\WorkData\git\HStation\XHS\Hydro\Yw.EPAcore.Core\x64\Debug\Yw.EPAcore.Core.vcxproj.AssemblyReference.cache

 Service/HStation.Service.Revit.Core/00-core/PipeStatus.cs

@@ -8,12 +8,12 @@
        /// <summary>
        /// å¼€å¯
        /// </summary>
        public const string Open = "OPEN";
        public const string Open = "Open";

        /// <summary>
        /// å…³é—­
        /// </summary>
        public const string Close = "CLOSE";
        public const string Closed = "Closed";

        /// <summary>
        /// CV æ„å‘³ç€ç®¡é“包含了限制流向的止回阀

 Service/HStation.Service.Revit.Core/00-core/PumpStatus.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
namespace HStation.Revit
{
    /// <summary>
    /// æ°´æ³µçŠ¶æ€
    /// </summary>
    public class PumpStatus
    {
        /// <summary>
        /// å¼€å¯
        /// </summary>
        public const string Open = "Open";

        /// <summary>
        /// å…³é—­
        /// </summary>
        public const string Closed = "Closed";
    }
}

 Service/HStation.Service.Revit.Core/00-core/Valve.cs

@@ -1,4 +1,4 @@
namespace Yw.Hydro
namespace HStation.Revit
{
    /// <summary>
    /// é˜€é—¨

 Service/HStation.Service.Revit.Core/00-core/ValveStatus.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
namespace HStation.Revit
{
    /// <summary>
    /// é˜€é—¨çŠ¶æ€
    /// </summary>
    public class ValveStatus
    {
        /// <summary>
        /// æ— 
        /// </summary>
        public const string None = "None";

        /// <summary>
        /// å¼€å¯
        /// </summary>
        public const string Open = "Open";

        /// <summary>
        /// å…³é—­
        /// </summary>
        public const string Closed = "Closed";
    }
}

 Service/HStation.Service.Revit.Core/01-model/RevitModel.cs

@@ -20,12 +20,15 @@

            this.Reservoirs = new List<RevitReservoir>();
            this.Tanks = new List<RevitTank>();
            this.Emitters = new List<RevitEmitter>();
            this.Junctions = new List<RevitJunction>();

            this.Pumps = new List<RevitPump>();
            this.Valves = new List<RevitValve>();
            this.Pipes = new List<RevitPipe>();

            this.Curves = new List<RevitCurve>();
            this.Patterns = new List<RevitPattern>();
            this.Rules = new List<RevitRule>();

            this.Decorators = new List<RevitDecorator>();
        }
@@ -58,18 +61,13 @@
        public List<RevitTank> Tanks { get; set; }

        /// <summary>
        /// æ‰©æ•£å™¨åˆ—表
        /// </summary>
        public List<RevitEmitter> Emitters { get; set; }

        /// <summary>
        /// èŠ‚点列表
        /// </summary>
        public List<RevitJunction> Junctions { get; set; }

        #endregion

        #region Linker
        #region Link

        /// <summary>
        /// æ°´æ³µåˆ—表
@@ -88,6 +86,26 @@

        #endregion

        #region æ“ä½œ

        /// <summary>
        /// æ›²çº¿åˆ—表
        /// </summary>
        public List<RevitCurve> Curves { get; set; }

        /// <summary>
        /// æ¨¡å¼åˆ—表
        /// </summary>
        public List<RevitPattern> Patterns { get; set; }

        /// <summary>
        /// è§„则列表
        /// </summary>
        public List<RevitRule> Rules { get; set; }


        #endregion

        #region è£…饰件

        /// <summary>

 Service/HStation.Service.Revit.Core/02-parter/00-core/RevitCurvePoint.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,41 @@
namespace HStation.Model
{
    /// <summary>
    /// æ›²çº¿ç‚¹
    /// </summary>
    public class RevitCurvePoint
    {
        /// <summary>
        /// 
        /// </summary>
        public RevitCurvePoint() { }

        /// <summary>
        /// 
        /// </summary>
        public RevitCurvePoint(double x, double y)
        {
            this.X = x;
            this.Y = y;
        }

        /// <summary>
        /// 
        /// </summary>
        public RevitCurvePoint(RevitCurvePoint rhs)
        {
            this.X = rhs.X;
            this.Y = rhs.Y;
        }

        /// <summary>
        /// X
        /// </summary>
        public double X { get; set; }

        /// <summary>
        /// Y
        /// </summary>
        public double Y { get; set; }
    }
}

 Service/HStation.Service.Revit.Core/02-parter/01-interface/00-core/IRevitLink.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,34 @@
namespace HStation.Model
{
    /// <summary>
    /// ç®¡æ®µ
    /// </summary>
    public interface IRevitLink : IRevitParter, IRevitModelType, IRevitVisual, IRevitProp
    {
        /// <summary>
        /// ä¸Šæ¸¸èŠ‚点编码
        /// </summary>
        string StartCode { get; set; }

        /// <summary>
        /// ä¸Šæ¸¸èŠ‚点编码
        /// </summary>
        string EndCode { get; set; }

        /// <summary>
        /// ç®¡æ®µçŠ¶æ€
        /// </summary>
        string LinkStatus { get; set; }

        /// <summary>
        /// ä¸Šæ¸¸æ ‡é«˜
        /// </summary>
        double StartElev { get; set; }

        /// <summary>
        /// ä¸‹æ¸¸æ ‡é«˜
        /// </summary>
        double EndElev { get; set; }

    }
}

 Service/HStation.Service.Revit.Core/02-parter/01-interface/00-core/IRevitLinker.cs

ÎļþÒÑɾ³ý

 Service/HStation.Service.Revit.Core/02-parter/01-interface/00-core/IRevitModelType.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
namespace HStation.Model
{
    /// <summary>
    /// åž‹å·
    /// </summary>
    public interface IRevitModelType
    {
        /// <summary>
        /// åž‹å·
        /// </summary>
        string ModelType { get; set; }
    }
}

 Service/HStation.Service.Revit.Core/02-parter/01-interface/00-core/IRevitNode.cs

@@ -3,13 +3,13 @@
    /// <summary>
    /// èŠ‚点
    /// </summary>
    public interface IRevitNode : IRevitParter
    public interface IRevitNode : IRevitParter, IRevitModelType, IRevitVisual, IRevitProp
    {

        /// <summary>
        /// æ ‡é«˜ï¼ˆ2024-7-25 lxj æ–°å¢žï¼‰
        /// åˆå§‹æ°´è´¨
        /// </summary>
        double Elev { get; set; }
        double Quality { get; set; }




 Service/HStation.Service.Revit.Core/02-parter/01-interface/00-core/IRevitOperation.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,10 @@
namespace HStation.Model
{
    /// <summary>
    /// æ“ä½œ
    /// </summary>
    public interface IRevitOperation : IRevitParter
    {

    }
}

 Service/HStation.Service.Revit.Core/02-parter/01-interface/00-core/IRevitParter.cs

@@ -6,20 +6,9 @@
    public interface IRevitParter
    {

        /// <summary>
        /// åž‹å·
        /// </summary>
        public string ModelType { get; set; }

        /// <summary>
        /// å±žæ€§å€¼åˆ—表
        /// </summary>
        Dictionary<string, object> PropValueList { get; set; }

        /// <summary>
        /// ä½ç½®
        /// </summary>
        public RevitBoundingBox BoundingBox { get; set; }


    }
}

 Service/HStation.Service.Revit.Core/02-parter/01-interface/00-core/IRevitProp.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
namespace HStation.Model
{
    /// <summary>
    /// å±žæ€§æŽ¥å£
    /// </summary>
    public interface IRevitProp
    {
        /// <summary>
        /// å±žæ€§å€¼åˆ—表
        /// </summary>
        Dictionary<string, object> PropValueList { get; set; }
    }
}

 Service/HStation.Service.Revit.Core/02-parter/01-interface/00-core/IRevitVisual.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
namespace HStation.Model
{
    /// <summary>
    /// å¯è§†åŒ–接口
    /// </summary>
    public interface IRevitVisual
    {
        /// <summary>
        /// ä½ç½®
        /// </summary>
        RevitBoundingBox BoundingBox { get; set; }
    }
}

 Service/HStation.Service.Revit.Core/02-parter/01-interface/01-node/IRevitEmitter.cs

ÎļþÒÑɾ³ý

 Service/HStation.Service.Revit.Core/02-parter/01-interface/01-node/IRevitJunction.cs

@@ -1,7 +1,7 @@
namespace HStation.Model
{
    /// <summary>
    /// èŠ‚点
    /// è¿žæŽ¥èŠ‚点
    /// [JUNCTIONS]节至少需要一个连接节点
    /// å¦‚果没有提供需水量模式，那么连接节点需水量遵从[OPTIONS]节提供的缺省需水量模
    /// å¼ï¼Œæˆ–者如果没有指定缺省模式，采用模式1。如果缺省模式（或者模式1）不存在，那么
@@ -10,16 +10,25 @@
    /// </summary>
    public interface IRevitJunction : IRevitNode
    {
        /// <summary>
        /// å–·å°„系数
        /// </summary>
        public double Coefficient { get; set; }

        /// <summary>
        /// éœ€æ°´é‡ (2024-7-25 lxj ä¿®æ”¹ä¸ºå¯ç©ºï¼Œå‚ç…§EPANET2工具箱)
        /// æ ‡é«˜
        /// </summary>
        double Elev { get; set; }

        /// <summary>
        /// éœ€æ°´é‡ 
        /// </summary>
        double? Demand { get; set; }

        /// <summary>
        /// æ¨¡å¼ ï¼ˆéœ€æ°´é‡æ¨¡å¼ID）（可选的）
        /// éœ€æ°´æ¨¡å¼ï¼ˆå¯é€‰çš„）
        /// </summary>
        string Pattern { get; set; }
        string DemandPattern { get; set; }


    }

 Service/HStation.Service.Revit.Core/02-parter/01-interface/01-node/IRevitReservoir.cs

@@ -15,8 +15,8 @@
        double Head { get; set; }

        /// <summary>
        /// æ¨¡å¼ï¼ˆæ°´å¤´æ¨¡å¼ID ï¼‰(可选的)
        /// æ°´å¤´æ¨¡å¼ (可选的)
        /// </summary>
        string Pattern { get; set; }
        string HeadPattern { get; set; }
    }
}

 Service/HStation.Service.Revit.Core/02-parter/01-interface/01-node/IRevitTank.cs

@@ -10,6 +10,10 @@
    /// </summary>
    public interface IRevitTank : IRevitNode
    {
        /// <summary>
        /// æ± åº•æ ‡é«˜
        /// </summary>
        double PoolElev { get; set; }

        /// <summary>
        /// åˆå§‹æ°´ä½
@@ -37,7 +41,7 @@
        double MinVol { get; set; }

        /// <summary>
        /// å®¹ç§¯æ›²çº¿ï¼ˆå®¹ç§¯æ›²çº¿ID）(可选的)
        /// å®¹ç§¯æ›²çº¿ (可选的)
        /// </summary>
        string VolCurve { get; set; }
    }

 Service/HStation.Service.Revit.Core/02-parter/01-interface/02-link/IRevitPipe.cs

ÎļþÃû´Ó Service/HStation.Service.Revit.Core/02-parter/01-interface/02-linker/IRevitPipe.cs ÐÞ¸Ä
@@ -8,7 +8,7 @@
    /// è®¾ç½®çŠ¶æ€ä¸ºCV，意味着管道包含了限制流向的止回阀
    /// å¦‚果局部损失系数为0，管道状态为OPEN，那么这两项可以在输入行中省略
    /// </summary>
    public interface IRevitPipe : IRevitLinker
    public interface IRevitPipe : IRevitLink
    {
        /// <summary>
        /// é•¿åº¦
@@ -30,10 +30,7 @@
        /// </summary>
        double MinorLoss { get; set; }

        /// <summary>
        /// ç®¡é“状态 (OPEN, CLOSE或CV)
        /// </summary>
        string PipeStatus { get; set; }



    }

 Service/HStation.Service.Revit.Core/02-parter/01-interface/02-link/IRevitPump.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,46 @@
namespace HStation.Model
{
    /// <summary>
    /// æ°´æ³µ
    /// </summary>
    public interface IRevitPump : IRevitLink
    {

        /// <summary>
        ///  é¢å®šåŠŸçŽ‡
        /// </summary>
        double RatedPower { get; set; }

        /// <summary>
        /// æµé‡æ‰¬ç¨‹æ›²çº¿
        /// </summary>
        string CurveQH { get; set; }

        /// <summary>
        /// è½¬é€Ÿæ¯”
        /// </summary>
        double? SpeedRatio { get; set; }

        /// <summary>
        /// è½¬é€Ÿæ¯”模式
        /// æè¿°è½¬é€Ÿæ¯”设置怎样随时间变化的时间模式
        /// æ¨¡å¼ç¼–码
        /// </summary>
        string SpeedRatioPattern { get; set; }

        /// <summary>
        /// èƒ½è€—ä»·æ ¼
        /// </summary>
        double? Price { get; set; }

        /// <summary>
        /// ä»·æ ¼æ¨¡å¼
        /// </summary>
        string PricePattern { get; set; }

        /// <summary>
        /// æ•ˆçŽ‡æ›²çº¿
        /// </summary>
        string CurveQE { get; set; }
    }
}

 Service/HStation.Service.Revit.Core/02-parter/01-interface/02-link/IRevitValve.cs

ÎļþÃû´Ó Service/HStation.Service.Revit.Core/02-parter/01-interface/02-linker/IRevitValve.cs ÐÞ¸Ä
@@ -10,12 +10,17 @@
    ///GPV(常规阀门) æ°´å¤´æŸå¤±æ›²çº¿ID
    ///隔断阀和止回阀认为是管道的一部分，而不是独立的控制阀门组件
    /// </summary>
    public interface IRevitValve : IRevitNode, IRevitLinker
    public interface IRevitValve : IRevitLink
    {
        /// <summary>
        /// ç›´å¾„
        /// </summary>
        double Diameter { get; set; }

        /// <summary>
        /// å±€é˜»ç³»æ•°
        /// </summary>
        double MinorLoss { get; set; }

        /// <summary>
        /// é˜€é—¨ç±»åž‹
@@ -27,9 +32,6 @@
        /// </summary>
        string ValveSetting { get; set; }

        /// <summary>
        /// å±€é˜»ç³»æ•°
        /// </summary>
        double MinorLoss { get; set; }

    }
}

 Service/HStation.Service.Revit.Core/02-parter/01-interface/02-linker/IRevitPump.cs

ÎļþÒÑɾ³ý

 Service/HStation.Service.Revit.Core/02-parter/01-interface/03-operation/IRevitCurve.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
namespace HStation.Model
{
    /// <summary>
    /// æ›²çº¿
    /// </summary>
    public interface IRevitCurve : IRevitOperation
    {
        /// <summary>
        /// æ›²çº¿ç±»åž‹
        /// </summary>
        string CurveType { get; set; }

        /// <summary>
        /// æ›²çº¿æ•°æ®
        /// </summary>
        List<RevitCurvePoint> CurveData { get; set; }
    }
}

 Service/HStation.Service.Revit.Core/02-parter/01-interface/03-operation/IRevitPattern.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
namespace HStation.Model
{
    /// <summary>
    /// æ¨¡å¼
    /// </summary>
    public interface IRevitPattern : IRevitOperation
    {
        /// <summary>
        /// ç±»åˆ«
        /// </summary>
        string Category { get; set; }

        /// <summary>
        /// ä¹˜å­
        /// </summary>
        List<double> Multipliers { get; set; }
    }
}

 Service/HStation.Service.Revit.Core/02-parter/01-interface/03-operation/IRevitRule.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
namespace HStation.Model
{
    /// <summary>
    /// 
    /// </summary>
    public interface IRevitRule : IRevitOperation
    {
    }
}

 Service/HStation.Service.Revit.Core/02-parter/02-node/RevitEmitter.cs

ÎļþÒÑɾ³ý

 Service/HStation.Service.Revit.Core/02-parter/02-node/RevitJunction.cs

@@ -16,19 +16,33 @@
        public RevitJunction(RevitJunction rhs) : base(rhs)
        {
            this.ModelType = rhs.ModelType;
            this.Quality = rhs.Quality;
            this.Coefficient = rhs.Coefficient;
            this.Elev = rhs.Elev;
            this.Demand = rhs.Demand;
            this.Pattern = rhs.Pattern;
            this.DemandPattern = rhs.DemandPattern;
            this.PropValueList = rhs.PropValueList;
            this.BoundingBox = rhs.BoundingBox;
        }


        /// <summary>
        /// åž‹å·
        /// åž‹å·ä¿¡æ¯
        /// </summary>
        [JsonProperty("型号信息", NullValueHandling = NullValueHandling.Ignore)]
        public string ModelType { get; set; }

        /// <summary>
        /// åˆå§‹æ°´è´¨
        /// </summary>
        [JsonProperty("初始水质", NullValueHandling = NullValueHandling.Ignore)]
        public double Quality { get; set; }

        /// <summary>
        /// å–·å°„系数
        /// </summary>
        [JsonProperty("喷射系数", NullValueHandling = NullValueHandling.Ignore)]
        public double Coefficient { get; set; }

        /// <summary>
        /// æ ‡é«˜
@@ -46,7 +60,7 @@
        /// éœ€æ°´æ¨¡å¼
        /// </summary>
        [JsonProperty("需水模式", NullValueHandling = NullValueHandling.Ignore)]
        public string Pattern { get; set; }
        public string DemandPattern { get; set; }

        /// <summary>
        /// å±žæ€§å€¼åˆ—表

 Service/HStation.Service.Revit.Core/02-parter/02-node/RevitReservoir.cs

@@ -16,24 +16,24 @@
        public RevitReservoir(RevitReservoir rhs) : base(rhs)
        {
            this.ModelType = rhs.ModelType;
            this.Elev = rhs.Elev;
            this.Quality = rhs.Quality;
            this.Head = rhs.Head;
            this.Pattern = rhs.Pattern;
            this.HeadPattern = rhs.HeadPattern;
            this.PropValueList = rhs.PropValueList;
            this.BoundingBox = rhs.BoundingBox;
        }

        /// <summary>
        /// åž‹å·
        /// åž‹å·ä¿¡æ¯
        /// </summary>
        [JsonProperty("型号信息", NullValueHandling = NullValueHandling.Ignore)]
        public string ModelType { get; set; }

        /// <summary>
        /// æ ‡é«˜
        /// åˆå§‹æ°´è´¨
        /// </summary>
        [JsonProperty("标高", NullValueHandling = NullValueHandling.Ignore)]
        public double Elev { get; set; }
        [JsonProperty("初始水质", NullValueHandling = NullValueHandling.Ignore)]
        public double Quality { get; set; }

        /// <summary>
        /// æ€»æ°´å¤´
@@ -42,10 +42,10 @@
        public double Head { get; set; }

        /// <summary>
        /// æ¨¡å¼
        /// æ°´å¤´æ¨¡å¼
        /// </summary>
        [JsonProperty("模式", NullValueHandling = NullValueHandling.Ignore)]
        public string Pattern { get; set; }
        [JsonProperty("水头模式", NullValueHandling = NullValueHandling.Ignore)]
        public string HeadPattern { get; set; }

        /// <summary>
        /// å±žæ€§å€¼åˆ—表
@@ -58,6 +58,5 @@
        /// </summary>
        [JsonProperty("位置", NullValueHandling = NullValueHandling.Ignore)]
        public RevitBoundingBox BoundingBox { get; set; }

    }
}

 Service/HStation.Service.Revit.Core/02-parter/02-node/RevitTank.cs

@@ -16,7 +16,8 @@
        public RevitTank(RevitTank rhs) : base(rhs)
        {
            this.ModelType = rhs.ModelType;
            this.Elev = rhs.Elev;
            this.Quality = rhs.Quality;
            this.PoolElev = rhs.PoolElev;
            this.InitLevel = rhs.InitLevel;
            this.MinLevel = rhs.MinLevel;
            this.MaxLevel = rhs.MaxLevel;
@@ -28,16 +29,22 @@
        }

        /// <summary>
        /// åž‹å·
        /// åž‹å·ä¿¡æ¯
        /// </summary>
        [JsonProperty("型号信息", NullValueHandling = NullValueHandling.Ignore)]
        public string ModelType { get; set; }

        /// <summary>
        /// åˆå§‹æ°´è´¨
        /// </summary>
        [JsonProperty("初始水质", NullValueHandling = NullValueHandling.Ignore)]
        public double Quality { get; set; }

        /// <summary>
        /// æ± åº•æ ‡é«˜
        /// </summary>
        [JsonProperty("标高", NullValueHandling = NullValueHandling.Ignore)]
        public double Elev { get; set; }
        [JsonProperty("池底标高", NullValueHandling = NullValueHandling.Ignore)]
        public double PoolElev { get; set; }

        /// <summary>
        /// åˆå§‹æ°´ä½

 Service/HStation.Service.Revit.Core/02-parter/03-link/RevitPipe.cs

ÎļþÃû´Ó Service/HStation.Service.Revit.Core/02-parter/03-linker/RevitPipe.cs ÐÞ¸Ä
@@ -18,32 +18,52 @@
            this.ModelType = rhs.ModelType;
            this.StartCode = rhs.StartCode;
            this.EndCode = rhs.EndCode;
            this.LinkStatus = rhs.LinkStatus;
            this.StartElev = rhs.StartElev;
            this.EndElev = rhs.EndElev;
            this.Diameter = rhs.Diameter;
            this.Length = rhs.Length;
            this.Roughness = rhs.Roughness;
            this.MinorLoss = rhs.MinorLoss;
            this.PipeStatus = rhs.PipeStatus;
            this.PropValueList = rhs.PropValueList;
            this.BoundingBox = rhs.BoundingBox;
        }

        /// <summary>
        /// åž‹å·
        /// åž‹å·ä¿¡æ¯
        /// </summary>
        [JsonProperty("型号信息", NullValueHandling = NullValueHandling.Ignore)]
        public string ModelType { get; set; }

        /// <summary>
        /// ä¸Šæ¸¸ç¼–号
        /// ä¸Šæ¸¸èŠ‚点编码
        /// </summary>
        [JsonProperty("上游节点编码", NullValueHandling = NullValueHandling.Ignore)]
        public string StartCode { get; set; }

        /// <summary>
        /// ä¸‹æ¸¸ç¼–号
        /// ä¸‹æ¸¸èŠ‚点编码
        /// </summary>
        [JsonProperty("下游节点编码", NullValueHandling = NullValueHandling.Ignore)]
        public string EndCode { get; set; }

        /// <summary>
        /// æ°´æ³µçŠ¶æ€
        /// </summary>
        [JsonProperty("水泵状态", NullValueHandling = NullValueHandling.Ignore)]
        public string LinkStatus { get; set; }

        /// <summary>
        /// ä¸Šæ¸¸æ ‡é«˜
        /// </summary>
        [JsonProperty("上游标高", NullValueHandling = NullValueHandling.Ignore)]
        public double StartElev { get; set; }

        /// <summary>
        /// ä¸‹æ¸¸æ ‡é«˜
        /// </summary>
        [JsonProperty("下游标高", NullValueHandling = NullValueHandling.Ignore)]
        public double EndElev { get; set; }

        /// <summary>
        /// ç›´å¾„(内径) mm
@@ -68,12 +88,6 @@
        /// </summary>
        [JsonProperty("局部阻力系数", NullValueHandling = NullValueHandling.Ignore)]
        public double MinorLoss { get; set; }

        /// <summary>
        /// ç®¡é“状态
        /// </summary>
        [JsonProperty("管道状态", NullValueHandling = NullValueHandling.Ignore)]
        public string PipeStatus { get; set; }

        /// <summary>
        /// å±žæ€§å€¼åˆ—表

 Service/HStation.Service.Revit.Core/02-parter/03-link/RevitPump.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,128 @@
namespace HStation.Model
{
    /// <summary>
    /// æ°´æ³µ
    /// </summary>
    public class RevitPump : RevitParter, IRevitPump
    {
        /// <summary>
        /// 
        /// </summary>
        public RevitPump() { }

        /// <summary>
        /// 
        /// </summary>
        public RevitPump(RevitPump rhs) : base(rhs)
        {
            this.ModelType = rhs.ModelType;
            this.StartCode = rhs.StartCode;
            this.EndCode = rhs.EndCode;
            this.LinkStatus = rhs.LinkStatus;
            this.StartElev = rhs.StartElev;
            this.EndElev = rhs.EndElev;
            this.RatedPower = rhs.RatedPower;
            this.CurveQH = rhs.CurveQH;
            this.SpeedRatio = rhs.SpeedRatio;
            this.SpeedRatioPattern = rhs.SpeedRatioPattern;
            this.Price = rhs.Price;
            this.PricePattern = rhs.PricePattern;
            this.CurveQE = rhs.CurveQE;
            this.PropValueList = rhs.PropValueList;
            this.BoundingBox = rhs.BoundingBox;
        }

        /// <summary>
        /// åž‹å·ä¿¡æ¯
        /// </summary>
        [JsonProperty("型号信息", NullValueHandling = NullValueHandling.Ignore)]
        public string ModelType { get; set; }

        /// <summary>
        /// ä¸Šæ¸¸èŠ‚点编码
        /// </summary>
        [JsonProperty("上游节点编码", NullValueHandling = NullValueHandling.Ignore)]
        public string StartCode { get; set; }

        /// <summary>
        /// ä¸‹æ¸¸èŠ‚点编码
        /// </summary>
        [JsonProperty("下游节点编码", NullValueHandling = NullValueHandling.Ignore)]
        public string EndCode { get; set; }

        /// <summary>
        /// æ°´æ³µçŠ¶æ€
        /// </summary>
        [JsonProperty("水泵状态", NullValueHandling = NullValueHandling.Ignore)]
        public string LinkStatus { get; set; }

        /// <summary>
        /// ä¸Šæ¸¸æ ‡é«˜
        /// </summary>
        [JsonProperty("上游标高", NullValueHandling = NullValueHandling.Ignore)]
        public double StartElev { get; set; }

        /// <summary>
        /// ä¸‹æ¸¸æ ‡é«˜
        /// </summary>
        [JsonProperty("下游标高", NullValueHandling = NullValueHandling.Ignore)]
        public double EndElev { get; set; }

        /// <summary>
        ///  é¢å®šåŠŸçŽ‡
        /// </summary>
        [JsonProperty("额定功率", NullValueHandling = NullValueHandling.Ignore)]
        public double RatedPower { get; set; }

        /// <summary>
        /// æµé‡æ‰¬ç¨‹æ›²çº¿
        /// </summary>
        [JsonProperty("流量扬程曲线", NullValueHandling = NullValueHandling.Ignore)]
        public string CurveQH { get; set; }

        /// <summary>
        /// è½¬é€Ÿæ¯”
        /// </summary>
        [JsonProperty("转速比", NullValueHandling = NullValueHandling.Ignore)]
        public double? SpeedRatio { get; set; }

        /// <summary>
        ///  è½¬é€Ÿæ¯”模式
        /// </summary>
        [JsonProperty("转速比模式", NullValueHandling = NullValueHandling.Ignore)]
        public string SpeedRatioPattern { get; set; }

        /// <summary>
        ///  èƒ½è€—ä»·æ ¼
        /// </summary>
        [JsonProperty("能耗价格", NullValueHandling = NullValueHandling.Ignore)]
        public double? Price { get; set; }

        /// <summary>
        ///  ä»·æ ¼æ¨¡å¼
        /// </summary>
        [JsonProperty("价格模式", NullValueHandling = NullValueHandling.Ignore)]
        public string PricePattern { get; set; }

        /// <summary>
        ///  æµé‡æ•ˆçŽ‡æ›²çº¿
        /// </summary>
        [JsonProperty("流量效率曲线", NullValueHandling = NullValueHandling.Ignore)]
        public string CurveQE { get; set; }

        /// <summary>
        /// å±žæ€§å€¼åˆ—表
        /// </summary>
        [JsonProperty("属性值列表", NullValueHandling = NullValueHandling.Ignore)]
        public Dictionary<string, object> PropValueList { get; set; }

        /// <summary>
        /// ä½ç½®
        /// </summary>
        [JsonProperty("位置", NullValueHandling = NullValueHandling.Ignore)]
        public RevitBoundingBox BoundingBox { get; set; }



    }
}

 Service/HStation.Service.Revit.Core/02-parter/03-link/RevitValve.cs

ÎļþÃû´Ó Service/HStation.Service.Revit.Core/02-parter/03-linker/RevitValve.cs ÐÞ¸Ä
@@ -16,9 +16,11 @@
        public RevitValve(RevitValve rhs) : base(rhs)
        {
            this.ModelType = rhs.ModelType;
            this.Elev = rhs.Elev;
            this.StartCode = rhs.StartCode;
            this.EndCode = rhs.EndCode;
            this.LinkStatus = rhs.LinkStatus;
            this.StartElev = rhs.StartElev;
            this.EndElev = rhs.EndElev;
            this.Diameter = rhs.Diameter;
            this.MinorLoss = rhs.MinorLoss;
            this.ValveType = rhs.ValveType;
@@ -28,33 +30,45 @@
        }

        /// <summary>
        /// åž‹å·
        /// åž‹å·ä¿¡æ¯
        /// </summary>
        [JsonProperty("型号信息", NullValueHandling = NullValueHandling.Ignore)]
        public string ModelType { get; set; }

        /// <summary>
        /// ä¸Šæ¸¸ç¼–号
        /// ä¸Šæ¸¸èŠ‚点编码
        /// </summary>
        [JsonProperty("上游节点编码", NullValueHandling = NullValueHandling.Ignore)]
        public string StartCode { get; set; }

        /// <summary>
        /// ä¸‹æ¸¸ç¼–号
        /// ä¸‹æ¸¸èŠ‚点编码
        /// </summary>
        [JsonProperty("下游节点编码", NullValueHandling = NullValueHandling.Ignore)]
        public string EndCode { get; set; }

        /// <summary>
        /// æ ‡é«˜
        /// é˜€é—¨çŠ¶æ€
        /// </summary>
        [JsonProperty("标高", NullValueHandling = NullValueHandling.Ignore)]
        public double Elev { get; set; }
        [JsonProperty("阀门状态", NullValueHandling = NullValueHandling.Ignore)]
        public string LinkStatus { get; set; }

        /// <summary>
        /// ç›´å¾„
        /// ä¸Šæ¸¸æ ‡é«˜
        /// </summary>
        [JsonProperty("直径", NullValueHandling = NullValueHandling.Ignore)]
        [JsonProperty("上游标高", NullValueHandling = NullValueHandling.Ignore)]
        public double StartElev { get; set; }

        /// <summary>
        /// ä¸‹æ¸¸æ ‡é«˜
        /// </summary>
        [JsonProperty("下游标高", NullValueHandling = NullValueHandling.Ignore)]
        public double EndElev { get; set; }

        /// <summary>
        /// é˜€é—¨ç›´å¾„
        /// </summary>
        [JsonProperty("阀门直径", NullValueHandling = NullValueHandling.Ignore)]
        public double Diameter { get; set; }

        /// <summary>
@@ -88,5 +102,6 @@
        public RevitBoundingBox BoundingBox { get; set; }



    }
}

 Service/HStation.Service.Revit.Core/02-parter/03-linker/RevitPump.cs

ÎļþÒÑɾ³ý

 Service/HStation.Service.Revit.Core/02-parter/04-operation/RevitCurve.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,32 @@
namespace HStation.Model
{
    /// <summary>
    /// 
    /// </summary>
    public class RevitCurve : RevitParter, IRevitCurve
    {
        /// <summary>
        /// 
        /// </summary>
        public RevitCurve() { }

        /// <summary>
        /// 
        /// </summary>
        public RevitCurve(RevitCurve rhs) : base(rhs)
        {
            this.CurveType = rhs.CurveType;
            this.CurveData = rhs.CurveData;
        }

        /// <summary>
        /// æ›²çº¿ç±»åž‹
        /// </summary>
        public string CurveType { get; set; }

        /// <summary>
        /// æ›²çº¿æ•°æ®
        /// </summary>
        public List<RevitCurvePoint> CurveData { get; set; }
    }
}

 Service/HStation.Service.Revit.Core/02-parter/04-operation/RevitPattern.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,33 @@

namespace HStation.Model
{
    /// <summary>
    /// 
    /// </summary>
    public class RevitPattern : RevitParter, IRevitPattern
    {
        /// <summary>
        /// 
        /// </summary>
        public RevitPattern() { }

        /// <summary>
        /// 
        /// </summary>
        public RevitPattern(RevitPattern rhs) : base(rhs)
        {
            this.Category = rhs.Category;
            this.Multipliers = rhs.Multipliers;
        }

        /// <summary>
        /// ç±»åˆ«
        /// </summary>
        public string Category { get; set; }

        /// <summary>
        /// ä¹˜å­
        /// </summary>
        public List<double> Multipliers { get; set; }
    }
}

 Service/HStation.Service.Revit.Core/02-parter/04-operation/RevitRule.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,21 @@
namespace HStation.Model
{
    /// <summary>
    /// è§„则控制
    /// </summary>
    public class RevitRule : RevitParter, IRevitRule
    {
        /// <summary>
        /// 
        /// </summary>
        public RevitRule() { }

        /// <summary>
        /// 
        /// </summary>
        public RevitRule(RevitRule rhs) : base(rhs)
        {

        }
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/04-GeneralProject/ImportXhsProjectHelper.cs

@@ -82,10 +82,10 @@
                return false;
            }

            var hydroInfo = HStation.Hydro.ParseHelper.FromRevit(revitModel);
            var hydroInfo = HStation.Hydro.ParseHelper.FromRevit(revitModel, out string msg);
            if (hydroInfo == null)
            {
                feedBackMsg?.Invoke("水力结构文件解析失败！！！");
                feedBackMsg?.Invoke($"水力结构文件解析失败，{msg}！！！");
                return false;
            }


 WinFrmUI/Hydro.HydraulicCore/x64/Debug/Yw.EPAcore.Core.Build.CppClean.log

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,66 @@
d:\workdata\git\hstation\xhs\x64\debug\yw.epacore.core.bsc
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\epanet.sbr
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\epanet.obj
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\quality.sbr
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\quality.obj
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\qualreact.sbr
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\qualreact.obj
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\qualroute.sbr
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\qualroute.obj
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\inpfile.sbr
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\inpfile.obj
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\genmmd.sbr
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\genmmd.obj
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\report.sbr
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\report.obj
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\input1.sbr
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\input1.obj
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\mempool.sbr
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\mempool.obj
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\epanet2.sbr
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\epanet2.obj
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\stdafx.sbr
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\stdafx.obj
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\hydcoeffs.sbr
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\hydcoeffs.obj
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\smatrix.sbr
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\smatrix.obj
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\input2.sbr
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\input2.obj
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\project.sbr
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\project.obj
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\hydsolver.sbr
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\hydsolver.obj
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\main.sbr
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\main.obj
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\hydstatus.sbr
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\hydstatus.obj
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\input3.sbr
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\input3.obj
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\output.sbr
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\output.obj
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\hash.sbr
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\hash.obj
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\rules.sbr
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\rules.obj
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\hydraul.sbr
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\hydraul.obj
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\.netframework,version=v4.7.2.assemblyattributes.sbr
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\.netframework,version=v4.7.2.assemblyattributes.obj
d:\workdata\git\hstation\xhs\x64\debug\yw.epacore.core.dll
d:\workdata\git\hstation\xhs\x64\debug\yw.epacore.core.pdb
d:\workdata\git\hstation\xhs\x64\debug\yw.epacore.core.lib
d:\workdata\git\hstation\xhs\x64\debug\yw.epacore.core.exp
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\yw.epacore.core.tlog\bscmake.command.1.tlog
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\yw.epacore.core.tlog\bscmake.read.1.tlog
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\yw.epacore.core.tlog\bscmake.write.1.tlog
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\yw.epacore.core.tlog\cl.command.1.tlog
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\yw.epacore.core.tlog\cl.items.tlog
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\yw.epacore.core.tlog\cl.read.1.tlog
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\yw.epacore.core.tlog\cl.write.1.tlog
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\yw.epacore.core.tlog\link.command.1.tlog
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\yw.epacore.core.tlog\link.read.1.tlog
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\yw.epacore.core.tlog\link.secondary.1.tlog
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\yw.epacore.core.tlog\link.write.1.tlog
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\yw.epacore.core.tlog\metagen.read.1.tlog
d:\workdata\git\hstation\xhs\winfrmui\hydro.hydrauliccore\x64\debug\yw.epacore.core.tlog\metagen.write.1.tlog

 WinFrmUI/Hydro.HydraulicCore/x64/Debug/Yw.EPAcore.Core.tlog/link.secondary.1.tlog

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,3 @@
^D:\WORKDATA\GIT\HSTATION\XHS\WINFRMUI\HYDRO.HYDRAULICCORE\X64\DEBUG\.NETFRAMEWORK,VERSION=V4.7.2.ASSEMBLYATTRIBUTES.OBJ|D:\WORKDATA\GIT\HSTATION\XHS\WINFRMUI\HYDRO.HYDRAULICCORE\X64\DEBUG\EPANET.OBJ|D:\WORKDATA\GIT\HSTATION\XHS\WINFRMUI\HYDRO.HYDRAULICCORE\X64\DEBUG\EPANET2.OBJ|D:\WORKDATA\GIT\HSTATION\XHS\WINFRMUI\HYDRO.HYDRAULICCORE\X64\DEBUG\GENMMD.OBJ|D:\WORKDATA\GIT\HSTATION\XHS\WINFRMUI\HYDRO.HYDRAULICCORE\X64\DEBUG\HASH.OBJ|D:\WORKDATA\GIT\HSTATION\XHS\WINFRMUI\HYDRO.HYDRAULICCORE\X64\DEBUG\HYDCOEFFS.OBJ|D:\WORKDATA\GIT\HSTATION\XHS\WINFRMUI\HYDRO.HYDRAULICCORE\X64\DEBUG\HYDRAUL.OBJ|D:\WORKDATA\GIT\HSTATION\XHS\WINFRMUI\HYDRO.HYDRAULICCORE\X64\DEBUG\HYDSOLVER.OBJ|D:\WORKDATA\GIT\HSTATION\XHS\WINFRMUI\HYDRO.HYDRAULICCORE\X64\DEBUG\HYDSTATUS.OBJ|D:\WORKDATA\GIT\HSTATION\XHS\WINFRMUI\HYDRO.HYDRAULICCORE\X64\DEBUG\INPFILE.OBJ|D:\WORKDATA\GIT\HSTATION\XHS\WINFRMUI\HYDRO.HYDRAULICCORE\X64\DEBUG\INPUT1.OBJ|D:\WORKDATA\GIT\HSTATION\XHS\WINFRMUI\HYDRO.HYDRAULICCORE\X64\DEBUG\INPUT2.OBJ|D:\WORKDATA\GIT\HSTATION\XHS\WINFRMUI\HYDRO.HYDRAULICCORE\X64\DEBUG\INPUT3.OBJ|D:\WORKDATA\GIT\HSTATION\XHS\WINFRMUI\HYDRO.HYDRAULICCORE\X64\DEBUG\MAIN.OBJ|D:\WORKDATA\GIT\HSTATION\XHS\WINFRMUI\HYDRO.HYDRAULICCORE\X64\DEBUG\MEMPOOL.OBJ|D:\WORKDATA\GIT\HSTATION\XHS\WINFRMUI\HYDRO.HYDRAULICCORE\X64\DEBUG\OUTPUT.OBJ|D:\WORKDATA\GIT\HSTATION\XHS\WINFRMUI\HYDRO.HYDRAULICCORE\X64\DEBUG\PROJECT.OBJ|D:\WORKDATA\GIT\HSTATION\XHS\WINFRMUI\HYDRO.HYDRAULICCORE\X64\DEBUG\QUALITY.OBJ|D:\WORKDATA\GIT\HSTATION\XHS\WINFRMUI\HYDRO.HYDRAULICCORE\X64\DEBUG\QUALREACT.OBJ|D:\WORKDATA\GIT\HSTATION\XHS\WINFRMUI\HYDRO.HYDRAULICCORE\X64\DEBUG\QUALROUTE.OBJ|D:\WORKDATA\GIT\HSTATION\XHS\WINFRMUI\HYDRO.HYDRAULICCORE\X64\DEBUG\REPORT.OBJ|D:\WORKDATA\GIT\HSTATION\XHS\WINFRMUI\HYDRO.HYDRAULICCORE\X64\DEBUG\RULES.OBJ|D:\WORKDATA\GIT\HSTATION\XHS\WINFRMUI\HYDRO.HYDRAULICCORE\X64\DEBUG\SMATRIX.OBJ|D:\WORKDATA\GIT\HSTATION\XHS\WINFRMUI\HYDRO.HYDRAULICCORE\X64\DEBUG\STDAFX.OBJ
D:\WorkData\git\HStation\XHS\x64\Debug\Yw.EPAcore.Core.LIB
D:\WorkData\git\HStation\XHS\x64\Debug\Yw.EPAcore.Core.EXP

 WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/Properties/licenses.licx

ÎļþÒÑɾ³ý

 WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/Yw.WinFrmUI.Hydro.Q3d.Core.csproj

@@ -46,7 +46,6 @@
    <Compile Update="WindowsForm\propertyform_Ex.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <EmbeddedResource Include="Properties\licenses.licx" />
  </ItemGroup>
  <ItemGroup>
    <Content Include="add12_storedselections.ico" />
@@ -54,6 +53,7 @@
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="Dapper" Version="2.1.28" />
    <PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
    <PackageReference Include="MathNet.Numerics" Version="4.1.0" />
    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
    <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
@@ -106,28 +106,5 @@
    <EmbeddedResource Remove="建模\AddFactoryForm.resx" />
    <EmbeddedResource Remove="建模\AddPumpForm.resx" />
    <EmbeddedResource Remove="建模\Form_建模.resx" />
  </ItemGroup>
  <ItemGroup>
    <Reference Include="DevExpress.Data.Desktop.v22.2">
      <HintPath>..\..\..\..\..\..\F_file\D_data\devframework\Components\Bin\Framework\DevExpress.Data.Desktop.v22.2.dll</HintPath>
    </Reference>
    <Reference Include="DevExpress.Data.v22.2">
      <HintPath>..\..\..\..\..\..\F_file\D_data\devframework\Components\Bin\Framework\DevExpress.Data.v22.2.dll</HintPath>
    </Reference>
    <Reference Include="DevExpress.Drawing.v22.2">
      <HintPath>..\..\..\..\..\..\F_file\D_data\devframework\Components\Bin\Framework\DevExpress.Drawing.v22.2.dll</HintPath>
    </Reference>
    <Reference Include="DevExpress.Printing.v22.2.Core">
      <HintPath>..\..\..\..\..\..\F_file\D_data\devframework\Components\Bin\Framework\DevExpress.Printing.v22.2.Core.dll</HintPath>
    </Reference>
    <Reference Include="DevExpress.Utils.v22.2">
      <HintPath>..\..\..\..\..\..\F_file\D_data\devframework\Components\Bin\Framework\DevExpress.Utils.v22.2.dll</HintPath>
    </Reference>
    <Reference Include="DevExpress.XtraEditors.v22.2">
      <HintPath>..\..\..\..\..\..\F_file\D_data\devframework\Components\Bin\Framework\DevExpress.XtraEditors.v22.2.dll</HintPath>
    </Reference>
    <Reference Include="DevExpress.XtraVerticalGrid.v22.2">
      <HintPath>..\..\..\..\..\..\F_file\D_data\devframework\Components\Bin\Framework\DevExpress.XtraVerticalGrid.v22.2.dll</HintPath>
    </Reference>
  </ItemGroup>
</Project>

 x64/Debug/Yw.EPAcore.Core.bsc

Binary files differ

 x64/Debug/Yw.EPAcore.Core.dll

Binary files differ

 x64/Debug/Yw.EPAcore.Core.exp

Binary files differ

 x64/Debug/Yw.EPAcore.Core.lib

Binary files differ

 x64/Debug/Yw.EPAcore.Core.pdb

Binary files differ