From 46f64905a3c309a50c0f245b3350cdeb8dd699c6 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期三, 22 一月 2025 17:29:02 +0800
Subject: [PATCH] 计算优化
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/08-grading/00-core/HydroGradingHelper.cs | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/08-grading/00-core/HydroGradingHelper.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/08-grading/00-core/HydroGradingHelper.cs
index 508d0a1..1eb4958 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/08-grading/00-core/HydroGradingHelper.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/08-grading/00-core/HydroGradingHelper.cs
@@ -144,7 +144,7 @@
{
Catalog = Yw.Hydro.ParterCatalog.Pressmeter,
CatalogName = HydroParterCatalogHelper.GetName(Yw.Hydro.ParterCatalog.Pressmeter),
- PropName = HydroVisualCalcuProp.CalcuQ
+ PropName = HydroVisualCalcuProp.CalcuPr
});
}
//绠￠亾
@@ -218,7 +218,7 @@
Yw.Model.HydroModelInfo hydroInfo,
List<HydroGradingVmo> allGradingList,
List<HydroGradingApplyViewModel> allApplyList,
- List<HydroCalcuVisualResult> allCalcuResultList
+ Dictionary<string, HydroCalcuVisualResult> allCalcuResultVisualDict
)
{
if (hydroInfo == null)
@@ -233,7 +233,7 @@
var list = new List<HydroGradingResultViewModel>();
allVisualList.ForEach(x =>
{
- var result = GetResult(x, allGradingList, allApplyList, allCalcuResultList);
+ var result = GetResult(x, allGradingList, allApplyList, allCalcuResultVisualDict);
if (result != null)
{
list.Add(result);
@@ -250,7 +250,7 @@
Yw.Model.HydroVisualInfo visual,
List<HydroGradingVmo> allGradingList,
List<HydroGradingApplyViewModel> allApplyList,
- List<HydroCalcuVisualResult> allCalcuResultList
+ Dictionary<string, HydroCalcuVisualResult> allCalcuResultVisualDict
)
{
if (visual == null)
@@ -312,7 +312,7 @@
var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuFlow).OrderBy(t => t.SortCode).ToList();
if (gradingList != null && gradingList.Count > 0)
{
- var calcuResult = allCalcuResultList?.Find(t => t.Code == pump.Code);
+ var calcuResult = allCalcuResultVisualDict?.GetValue(pump.Code);
if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
{
if (calcuLinkResult.CalcuFlow.HasValue)
@@ -338,7 +338,7 @@
var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuVelocity).OrderBy(t => t.SortCode).ToList();
if (gradingList != null && gradingList.Count > 0)
{
- var calcuResult = allCalcuResultList?.Find(t => t.Code == pump.Code);
+ var calcuResult = allCalcuResultVisualDict?.GetValue(pump.Code);
if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
{
if (calcuLinkResult.CalcuVelocity.HasValue)
@@ -364,7 +364,7 @@
var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuHeadLoss).OrderBy(t => t.SortCode).ToList();
if (gradingList != null && gradingList.Count > 0)
{
- var calcuResult = allCalcuResultList?.Find(t => t.Code == pump.Code);
+ var calcuResult = allCalcuResultVisualDict?.GetValue(pump.Code);
if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
{
if (calcuLinkResult.CalcuHeadLoss.HasValue)
@@ -421,7 +421,7 @@
var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuFlow).OrderBy(t => t.SortCode).ToList();
if (gradingList != null && gradingList.Count > 0)
{
- var calcuResult = allCalcuResultList?.Find(t => t.Code == valve.Code);
+ var calcuResult = allCalcuResultVisualDict?.GetValue(valve.Code);
if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
{
if (calcuLinkResult.CalcuFlow.HasValue)
@@ -447,7 +447,7 @@
var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuVelocity).OrderBy(t => t.SortCode).ToList();
if (gradingList != null && gradingList.Count > 0)
{
- var calcuResult = allCalcuResultList?.Find(t => t.Code == valve.Code);
+ var calcuResult = allCalcuResultVisualDict?.GetValue(valve.Code);
if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
{
if (calcuLinkResult.CalcuVelocity.HasValue)
@@ -473,7 +473,7 @@
var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuHeadLoss).OrderBy(t => t.SortCode).ToList();
if (gradingList != null && gradingList.Count > 0)
{
- var calcuResult = allCalcuResultList?.Find(t => t.Code == valve.Code);
+ var calcuResult = allCalcuResultVisualDict?.GetValue(valve.Code);
if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
{
if (calcuLinkResult.CalcuHeadLoss.HasValue)
@@ -511,7 +511,7 @@
var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuFlow).OrderBy(t => t.SortCode).ToList();
if (gradingList != null && gradingList.Count > 0)
{
- var calcuResult = allCalcuResultList?.Find(t => t.Code == pipe.Code);
+ var calcuResult = allCalcuResultVisualDict?.GetValue(pipe.Code);
if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
{
if (calcuLinkResult.CalcuFlow.HasValue)
@@ -537,7 +537,7 @@
var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuVelocity).OrderBy(t => t.SortCode).ToList();
if (gradingList != null && gradingList.Count > 0)
{
- var calcuResult = allCalcuResultList?.Find(t => t.Code == pipe.Code);
+ var calcuResult = allCalcuResultVisualDict?.GetValue(pipe.Code);
if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
{
if (calcuLinkResult.CalcuVelocity.HasValue)
@@ -563,7 +563,7 @@
var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuHeadLoss).OrderBy(t => t.SortCode).ToList();
if (gradingList != null && gradingList.Count > 0)
{
- var calcuResult = allCalcuResultList?.Find(t => t.Code == pipe.Code);
+ var calcuResult = allCalcuResultVisualDict?.GetValue(pipe.Code);
if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
{
if (calcuLinkResult.CalcuHeadLoss.HasValue)
--
Gitblit v1.9.3