From b9c79f595e5ad4684d731f968bf120ff8c52dbd8 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 23 十二月 2024 00:42:25 +0800
Subject: [PATCH] 解决重复HydroInfo获取问题
---
Service/HStation.Service.PhartRelation.Core/05-service/00-core/PhartGraphExtensions.cs | 47 ++++++-----------------------------------------
1 files changed, 6 insertions(+), 41 deletions(-)
diff --git a/Service/HStation.Service.PhartRelation.Core/05-service/00-core/PhartGraphExtensions.cs b/Service/HStation.Service.PhartRelation.Core/05-service/00-core/PhartGraphExtensions.cs
index 641d3fd..8cdd098 100644
--- a/Service/HStation.Service.PhartRelation.Core/05-service/00-core/PhartGraphExtensions.cs
+++ b/Service/HStation.Service.PhartRelation.Core/05-service/00-core/PhartGraphExtensions.cs
@@ -23,26 +23,7 @@
var key = $"{rhs.ID}:graph-paras";
return MemoryCacheHelper.GetSet(key, () =>
{
- object obj = null;
- switch ((eGraphType)rhs.GraphType)
- {
- case eGraphType.PumpQH:
- {
- obj = Model.QHGraphParasModel.ToModel(rhs.GraphParas);
- }
- break;
- case eGraphType.PumpQP:
- {
- obj = Model.QPGraphParasModel.ToModel(rhs.GraphParas);
- }
- break;
- case eGraphType.PumpQE:
- {
- obj = Model.QEGraphParasModel.ToModel(rhs.GraphParas);
- }
- break;
- default: break;
- }
+ object obj = PhartGraphHelper.GetGraphParas((eGraphType)rhs.GraphType, rhs.GraphParas);
return obj;
}, _cache_time);
}
@@ -81,16 +62,7 @@
var key = $"{rhs.ID}:geometry-paras";
return MemoryCacheHelper.GetSet(key, () =>
{
- object obj = null;
- switch ((eGeometryStyle)rhs.GeometryStyle)
- {
- case eGeometryStyle.FeatCurve:
- {
- obj = Model.FeatCurveGeometryParasModel.ToModel(rhs.GraphParas);
- }
- break;
- default: break;
- }
+ object obj = PhartGraphHelper.GetGeometryParas((eGeometryStyle)rhs.GeometryStyle, rhs.GeometryParas);
return obj;
}, _cache_time);
}
@@ -119,7 +91,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,16 +100,8 @@
var key = $"{rhs.ID}:perform-curve";
return MemoryCacheHelper.GetSet(key, () =>
{
- Yw.Pump.PerformCurveBase performCurve = null;
- switch ((eGeometryStyle)rhs.GeometryStyle)
- {
- case eGeometryStyle.FeatCurve:
- {
- performCurve = Yw.Pump.PerformCurveHelper.ToModel(rhs.GeometryInfo);
- }
- break;
- default: break;
- }
+ Yw.Ahart.PerformCurveBase performCurve = null;
+ performCurve = PhartGraphHelper.GetPerformCurve((eGeometryStyle)rhs.GeometryStyle, rhs.GeometryInfo);
return performCurve;
}, _cache_time);
}
@@ -158,4 +122,5 @@
#endregion
}
+
}
--
Gitblit v1.9.3