From 63834af1872ab37f22a5e67b5df20a082f7a052a Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 24 十二月 2024 16:40:00 +0800
Subject: [PATCH] 修改资产--四通
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/00-core/04-monitor/03-marker/SimulationMonitorMarkerHelper.cs | 64 +++++++++-----------------------
1 files changed, 18 insertions(+), 46 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/00-core/04-monitor/03-marker/SimulationMonitorMarkerHelper.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/00-core/04-monitor/03-marker/SimulationMonitorMarkerHelper.cs
index 57cd54f..7befb34 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/00-core/04-monitor/03-marker/SimulationMonitorMarkerHelper.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/00-core/04-monitor/03-marker/SimulationMonitorMarkerHelper.cs
@@ -1,5 +1,4 @@
-锘縰sing Yw.Vmo;
-using Yw.WinFrmUI.Bimface;
+锘縰sing Yw.WinFrmUI.Bimface;
namespace HStation.WinFrmUI
{
@@ -11,15 +10,18 @@
/// <summary>
///
/// </summary>
- public SimulationMonitorMarkerHelper(SimulationMonitorHelper monitorHelper, ISimulationMonitorMarkerView view)
+ public SimulationMonitorMarkerHelper
+ (
+ SimulationMonitorHelper monitorHelper,
+ ISimulationMonitorMarkerView view
+ )
{
_monitorHelper = monitorHelper;
_views = new List<ISimulationMonitorMarkerView>() { view };
}
- private SimulationMonitorHelper _monitorHelper = null;//鐩戞祴鐐硅緟鍔╃被
- private List<ISimulationMonitorMarkerView> _views = null;//瑙嗗浘鍒楄〃
- private List<LogicMonitorMarker> _allMarkerList = null;//鎵�鏈夋爣璁板垪琛�
+ private readonly SimulationMonitorHelper _monitorHelper = null;//鐩戞祴鐐硅緟鍔╃被
+ private readonly List<ISimulationMonitorMarkerView> _views = null;//瑙嗗浘鍒楄〃
/// <summary>
/// 鏄惁鍙
@@ -32,49 +34,19 @@
private bool _visible = false;
/// <summary>
- /// 鑾峰彇
+ /// 鑾峰彇鎵�鏈�
/// </summary>
- public async Task<List<LogicMonitorMarker>> Get()
+ public async Task<List<LogicMonitorMarker>> GetAll()
{
- var allMonitorList = await _monitorHelper.Get();
- _allMarkerList = allMonitorList?.Select(x => new LogicMonitorMarker()
+ var allMonitorList = await _monitorHelper.GetAll();
+ var allGroupList = allMonitorList?.GroupBy(x => new { x.Relation, x.SourceType }).ToList();
+ var allMarkerList = allGroupList?.Select(x => new LogicMonitorMarker()
{
- Id = x.Relation,
- PropName = x.PropName,
- Description = x.Description
+ Code = x.Key.Relation,
+ SourceType = (int)x.Key.SourceType,
+ Description = x.Key.SourceType == Yw.Hydro.eSourceType.Docking ? $"浼犳劅鍣ㄦ祴鐐�({x.Count()})" : $"鍒嗘瀽娴嬬偣({x.Count()})"
}).ToList();
- return _allMarkerList;
- }
-
- /// <summary>
- /// 鏇存柊
- /// </summary>
- public async void Update(string code, List<HydroMonitorVmo> monitorList)
- {
- var allMarkerList = await Get();
- var markerList = allMarkerList.Where(x => x.Id == code).ToList();
- markerList?.ForEach(x =>
- {
- var result = monitorList?.Exists(t => t.Relation == x.Id && t.PropName == x.PropName);
- if (!(result.HasValue && result.Value))
- {
- allMarkerList.Remove(x);
- }
- });
- monitorList?.ForEach(x =>
- {
- var result = markerList?.Exists(t => t.Id == x.Relation && t.PropName == x.PropName);
- if (!(result.HasValue && result.Value))
- {
- var vm = new LogicMonitorMarker()
- {
- Id = x.Relation,
- PropName = x.PropName,
- Description = x.Description
- };
- allMarkerList.Add(vm);
- }
- });
+ return allMarkerList;
}
/// <summary>
@@ -84,7 +56,7 @@
{
if (this.Visible)
{
- var allMarkerList = await Get();
+ var allMarkerList = await GetAll();
_views.ForEach(x => x.SetLogicMonitors(allMarkerList));
}
else
--
Gitblit v1.9.3