冲突

duheng

2024-12-11 2e8e85f65748ee5a5adf0dcda864aa4167cbf2ef

 Service/HStation.Service.PhartRelation.Core/05-service/00-core/PhartGraphExtensions.cs

@@ -119,7 +119,7 @@
        /// <summary>
        /// 获取特性曲线
        /// </summary>
        public static Yw.Pump.PerformCurveBase GetPerformCurve(this Yw.Model.PhartGraph rhs)
        public static Yw.Ahart.PerformCurveBase GetPerformCurve(this Yw.Model.PhartGraph rhs)
        {
            if (rhs == null)
            {
@@ -128,12 +128,12 @@
            var key = $"{rhs.ID}:perform-curve";
            return MemoryCacheHelper.GetSet(key, () =>
            {
                Yw.Pump.PerformCurveBase performCurve = null;
                Yw.Ahart.PerformCurveBase performCurve = null;
                switch ((eGeometryStyle)rhs.GeometryStyle)
                {
                    case eGeometryStyle.FeatCurve:
                        {
                            performCurve = Yw.Pump.PerformCurveHelper.ToModel(rhs.GeometryInfo);
                            performCurve = Yw.Ahart.PerformCurveHelper.ToModel(rhs.GeometryInfo);
                        }
                        break;
                    default: break;