修复现存报错

duheng

2025-01-14 81890c425d1d4217c5210c65c915a670b4326628

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs

@@ -1,11 +1,4 @@
using HStation.CAL;
using HStation.WinFrmUI.PhartRelation;
using Swashbuckle.AspNetCore.SwaggerGen;
using System.Linq;
using System.Windows.Input;
using Yw.WinFrmUI.Q3d;

namespace HStation.WinFrmUI
namespace HStation.WinFrmUI
{
    public class AssetsMatchingHelper
    {
@@ -424,8 +417,7 @@
            {
                input.MatchingValveSetting = valve.ValveSetting;
            }
            input.MatchingValveType = (Yw.WinFrmUI. eValveType)(int )valve.ValveType;
             if (input.CurveDbId == null)
            if (input.CurveDbId == null)
            {
                var list = Task.Run(async () =>
                    await new BLL.PhartDiagramRelation().GetExByObjectTypeAndObjectID(HStation.Assets.DataType.ValveMain, valve.ID)).Result;
@@ -434,26 +426,21 @@
                    var def = list.OrderByDescending(x => x.Importance).First();
                    input.MatchingCurveDbId = def.ID.ToString();
                    var curve = def.Diagram.GraphList[0].GetFeatPointList();
                    if (valve.ValveType == HStation.Assets.eValveType.GPV)
                    input.MatchingCurveQL = new List<HydroCurvePointViewModel>();
                    /*   foreach (var item in curve)
                       {
                           input.MatchingCurveQL.Add(new HydroCurvePointViewModel(item.X, item.Y));
                       }*/

                    input.MatchingCurveOL = new List<HydroCurvePointViewModel>();
                    foreach (var item in curve)
                    {
                        input.MatchingCurveQL = new List<HydroCurvePointViewModel>();
                        foreach (var item in curve)
                        {
                            input.MatchingCurveQL.Add(new HydroCurvePointViewModel(item.X, item.Y));
                        }
                    }
                    else if (valve.ValveType == HStation.Assets.eValveType.TCV)
                    {
                        input.MatchingCurveOL = new List<HydroCurvePointViewModel>();
                        foreach (var item in curve)
                        {
                            input.MatchingCurveOL.Add(new HydroCurvePointViewModel(item.X, item.Y));
                        }
                        input.MatchingCurveOL.Add(new HydroCurvePointViewModel(item.X, item.Y));
                    }
                }
                return true;
            }

            return true;
            return false;
        }

        //管道匹配
@@ -924,7 +911,7 @@
            }
            if (input.MinorLoss <= 0)
            {
                input.MatchingMinorLoss = sprinkler.MinorLoss;
                input.MatchingMinorLoss = sprinkler.FlowMinorLoss;
            }

            return true;
@@ -1977,10 +1964,6 @@
            if (input.StartDiameter < 0)
            {
                input.MatchingStartDiameter = translation.StartDiameter;
            }
            if (input.Diameter < 0)
            {
                input.MatchingDiameter = translation.Diameter;
            }

            return true;