From cec8d92bdca1da0b2eafe6eb3130f4bf6f03028b Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期三, 12 三月 2025 10:21:09 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/00-core/04-monitor/02-value/SimulationMonitorValueHelper.cs | 73 +++---------------------------------
1 files changed, 6 insertions(+), 67 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/00-core/04-monitor/02-value/SimulationMonitorValueHelper.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/00-core/04-monitor/02-value/SimulationMonitorValueHelper.cs
index 1d7ab45..de69dcc 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/00-core/04-monitor/02-value/SimulationMonitorValueHelper.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/00-core/04-monitor/02-value/SimulationMonitorValueHelper.cs
@@ -1,6 +1,5 @@
-锘縰sing DevExpress.Xpo.Helpers;
-using Yw.Hydro;
-using Yw.Vmo;
+锘縰sing Yw.Hydro;
+using static Yw.WinFrmUI.Q3d.EpanetEnum;
namespace HStation.WinFrmUI
{
@@ -15,19 +14,15 @@
public SimulationMonitorValueHelper
(
SimulationVisualListHelper visualListHelper,
- SimulationMonitorHelper monitorHelper,
- SimulationCalcuResultHelper calcuResultHelper
+ SimulationMonitorHelper monitorHelper
)
{
_visualListHelper = visualListHelper;
_monitorHelper = monitorHelper;
- _calcuResultHelper = calcuResultHelper;
- _calcuResultHelper.InitialEvent += async () => await Update();
}
private readonly SimulationVisualListHelper _visualListHelper = null;//鍙鍒楄〃杈呭姪绫�
private readonly SimulationMonitorHelper _monitorHelper = null;//鐩戞祴鐐硅緟鍔╃被
- private readonly SimulationCalcuResultHelper _calcuResultHelper = null;//璁＄畻缁撴灉杈呭姪绫�
private List<HydroMonitorValueViewModel> _allList = null;//鎵�鏈夌洃娴嬪�煎垪琛�
/// <summary>
@@ -49,13 +44,7 @@
if (allVisualDict.ContainsKey(monitor.Parter))
{
var visual = allVisualDict[monitor.Parter];
- double? propValue = null;
- var calcuVisualResult = _calcuResultHelper.GetVisual(monitor.Parter);
- if (calcuVisualResult != null)
- {
- propValue = calcuVisualResult.GetCalcuValue(monitor.PropName);
- }
- var vm = new HydroMonitorValueViewModel(monitor, visual, propValue);
+ var vm = new HydroMonitorValueViewModel(monitor, visual, null);
_allList.Add(vm);
}
}
@@ -66,66 +55,16 @@
}
/// <summary>
- /// 鑾峰彇瀵规帴鍒楄〃
- /// </summary>
- public async Task<List<HydroMonitorValueViewModel>> GetDockingList()
- {
- var all = await GetAll();
- return all.Where(x => x.Vmo.SourceType == eSourceType.Docking).ToList();
- }
-
- /// <summary>
- /// 鑾峰彇鍒嗘瀽鍒楄〃
- /// </summary>
- public async Task<List<HydroMonitorValueViewModel>> GetAnalyseList()
- {
- var all = await GetAll();
- return all.Where(x => x.Vmo.SourceType == eSourceType.Analyse).ToList();
- }
-
- /// <summary>
/// 鏇存柊
/// </summary>
- public async Task Update()
+ public async Task Update(string code, List<HydroMonitorValueViewModel> valueList)
{
var all = await GetAll();
- foreach (var item in all)
- {
- if (!item.PropValue.HasValue)
- {
- var calcuVisualResult = _calcuResultHelper.GetVisual(item.Vmo.Parter);
- if (calcuVisualResult != null)
- {
- var propValue = calcuVisualResult.GetCalcuValue(item.Vmo.PropName);
- if (propValue.HasValue)
- {
- item.UpdatePropValue(propValue.Value);
- }
- }
- }
- }
- }
-
- /// <summary>
- /// 鏇存柊
- /// </summary>
- public async Task Update(string code, eSourceType sourceType, List<HydroMonitorValueViewModel> valueList)
- {
- var all = await GetAll();
- all.RemoveAll(x => x.Vmo.Parter == code && x.Vmo.SourceType == sourceType);
+ all.RemoveAll(x => x.Vmo.Parter == code);
if (valueList != null && valueList.Count > 0)
{
all.AddRange(valueList);
}
- }
-
- /// <summary>
- /// 閲嶇疆
- /// </summary>
- public async Task Reset(List<HydroWorkingMonitorViewModel> allWorkingMonitorList)
- {
- var all = await GetAll();
- all.UpdateMonitorValue(allWorkingMonitorList);
}
/// <summary>
--
Gitblit v1.9.3