From aaac84e4ed86d089c01c5b180e4249db73cc78d7 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期三, 19 二月 2025 14:08:04 +0800
Subject: [PATCH] 监测分析改造
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/monitor-analy/01-core/HydroMonitorAnalyHelper.cs | 29 ++++++++++++++---------------
1 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/13-print/monitor/helper/SimulationPrintMonitorAnalyHelper.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/monitor-analy/01-core/HydroMonitorAnalyHelper.cs
similarity index 68%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/13-print/monitor/helper/SimulationPrintMonitorAnalyHelper.cs
rename to WinFrmUI/Yw.WinFrmUI.Hydro.Core/monitor-analy/01-core/HydroMonitorAnalyHelper.cs
index e862880..cd8a96a 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/13-print/monitor/helper/SimulationPrintMonitorAnalyHelper.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/monitor-analy/01-core/HydroMonitorAnalyHelper.cs
@@ -1,16 +1,14 @@
-锘縰sing Mapster;
-
-namespace HStation.WinFrmUI
+锘縩amespace Yw.WinFrmUI
{
/// <summary>
///
/// </summary>
- public class SimulationPrintMonitorAnalyHelper
+ public class HydroMonitorAnalyHelper
{
/// <summary>
/// 鍒涘缓
/// </summary>
- public static SimulationPrintMonitorAnalyViewModel Create
+ public static HydroMonitorAnalyViewModel Create
(
Yw.Model.HydroModelInfo hydroInfo,
List<Yw.Vmo.HydroMonitorVmo> allMonitorList,
@@ -20,31 +18,31 @@
List<Yw.Vmo.HydroEvaluationVmo> allEvaluationList = null
)
{
- var vm = new SimulationPrintMonitorAnalyViewModel();
-
//楠岃瘉
if (hydroInfo == null)
{
- return vm;
+ return default;
}
if (allMonitorList == null || allMonitorList.Count < 1)
{
- return vm;
+ return default;
}
if (working == null)
{
- return vm;
+ return default;
}
+ var vm = new HydroMonitorAnalyViewModel();
+
+
//杩囨护娴嬬偣锛屼粎闇�瑕佸垎鏋愭祴鐐�
- var monitorList = allMonitorList?.Where(x => x.SourceType == Yw.Hydro.eSourceType.Analyse).ToList();
+ var monitorList = allMonitorList.Where(x => x.SourceType == Yw.Hydro.eSourceType.Analyse).ToList();
if (monitorList == null || monitorList.Count < 1)
{
return vm;
}
- //璧嬪�兼ā鍨嬩俊鎭紝閬垮厤骞叉壈
- //var newHydroInfo = hydroInfo.Adapt<Yw.Model.HydroModelInfo>();
+ //鏋勪欢鍒楄〃
var allVisualDict = hydroInfo.GetVisualDict();
if (allVisualDict == null || allVisualDict.Count < 1)
{
@@ -54,6 +52,7 @@
//璁＄畻缁撴灉
if (calcuResult == null)
{
+ hydroInfo.UpdateWorkingInfo(working.WorkingInfo);
calcuResult = hydroInfo.Calcu(Yw.EPAnet.CalcuMode.MinorLoss, isHead, allEvaluationList);
if (!calcuResult.Succeed)
{
@@ -63,10 +62,10 @@
var allCalcuVisualDict = calcuResult.GetVisualDict();
//閬嶅巻娴嬬偣
- vm.Items = new List<SimulationPrintMonitorAnalyItemViewModel>();
+ vm.Items = new List<HydroMonitorAnalyItemViewModel>();
foreach (var monitor in monitorList)
{
- var item = new SimulationPrintMonitorAnalyItemViewModel(monitor, allVisualDict, allCalcuVisualDict);
+ var item = new HydroMonitorAnalyItemViewModel(monitor, allVisualDict, allCalcuVisualDict);
vm.Items.Add(item);
}
--
Gitblit v1.9.3