From b9c79f595e5ad4684d731f968bf120ff8c52dbd8 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 23 十二月 2024 00:42:25 +0800
Subject: [PATCH] 解决重复HydroInfo获取问题
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/12-monitor/00-core/HydroMonitorPropHelper.cs | 154 +++++++++++++++++++++++++++++++--------------------
1 files changed, 94 insertions(+), 60 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/12-monitor/00-core/HydroMonitorPropHelper.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/12-monitor/00-core/HydroMonitorPropHelper.cs
index 2a75c35..cd5996d 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/12-monitor/00-core/HydroMonitorPropHelper.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/12-monitor/00-core/HydroMonitorPropHelper.cs
@@ -9,159 +9,193 @@
public class HydroMonitorPropHelper
{
/// <summary>
- /// 鑾峰彇鍚嶇О瀛楀吀
+ /// 鑾峰彇灞炴�у垪琛�
/// </summary>
- public static Dictionary<string, string> GetNameDict(string catalog)
+ public static List<string> GetPropList(string catalog)
{
if (string.IsNullOrEmpty(catalog))
{
return default;
}
- var dict = new Dictionary<string, string>();
+ var list = new List<string>();
switch (catalog)
{
case Yw.Hydro.ParterCatalog.Reservoir:
{
- dict.Add(MonitorProp.CalcuL, MonitorPropHelper.GetName(MonitorProp.CalcuL));
+ list.Add(MonitorProp.CalcuL);
}
break;
case Yw.Hydro.ParterCatalog.Tank:
{
- dict.Add(MonitorProp.CalcuL, MonitorPropHelper.GetName(MonitorProp.CalcuL));
+ list.Add(MonitorProp.CalcuL);
}
break;
case Yw.Hydro.ParterCatalog.Waterbox:
{
- dict.Add(MonitorProp.CalcuL, MonitorPropHelper.GetName(MonitorProp.CalcuL));
+ list.Add(MonitorProp.CalcuL);
}
break;
case ParterCatalog.Junction:
{
- dict.Add(MonitorProp.CalcuPr, MonitorPropHelper.GetName(MonitorProp.CalcuPr));
+ list.Add(MonitorProp.CalcuPr);
}
break;
case Yw.Hydro.ParterCatalog.Blunthead:
{
- dict.Add(MonitorProp.CalcuPr, MonitorPropHelper.GetName(MonitorProp.CalcuPr));
+ list.Add(MonitorProp.CalcuPr);
}
break;
case Yw.Hydro.ParterCatalog.Elbow:
{
- dict.Add(MonitorProp.CalcuPr, MonitorPropHelper.GetName(MonitorProp.CalcuPr));
+ list.Add(MonitorProp.CalcuPr);
}
break;
case Yw.Hydro.ParterCatalog.Threelink:
{
- dict.Add(MonitorProp.CalcuPr, MonitorPropHelper.GetName(MonitorProp.CalcuPr));
+ list.Add(MonitorProp.CalcuPr);
}
break;
case Yw.Hydro.ParterCatalog.Fourlink:
{
- dict.Add(MonitorProp.CalcuPr, MonitorPropHelper.GetName(MonitorProp.CalcuPr));
+ list.Add(MonitorProp.CalcuPr);
}
break;
case Yw.Hydro.ParterCatalog.Nozzle:
{
- dict.Add(MonitorProp.CalcuPr, MonitorPropHelper.GetName(MonitorProp.CalcuPr));
+ list.Add(MonitorProp.CalcuQ);
+ list.Add(MonitorProp.CalcuPr);
}
break;
case Yw.Hydro.ParterCatalog.Hydrant:
{
- dict.Add(MonitorProp.CalcuPr, MonitorPropHelper.GetName(MonitorProp.CalcuPr));
+ list.Add(MonitorProp.CalcuQ);
+ list.Add(MonitorProp.CalcuPr);
+ }
+ break;
+ case Yw.Hydro.ParterCatalog.Cooling:
+ {
+ list.Add(MonitorProp.CalcuQ);
+ list.Add(MonitorProp.CalcuPr);
}
break;
case Yw.Hydro.ParterCatalog.Meter:
{
- dict.Add(MonitorProp.CalcuPr, MonitorPropHelper.GetName(MonitorProp.CalcuPr));
+ list.Add(MonitorProp.CalcuQ);
+ list.Add(MonitorProp.CalcuPr);
}
break;
case Yw.Hydro.ParterCatalog.Flowmeter:
{
- dict.Add(MonitorProp.CalcuPr, MonitorPropHelper.GetName(MonitorProp.CalcuPr));
+ list.Add(MonitorProp.CalcuQ);
}
break;
case Yw.Hydro.ParterCatalog.Pressmeter:
{
- dict.Add(MonitorProp.CalcuPr, MonitorPropHelper.GetName(MonitorProp.CalcuPr));
+ list.Add(MonitorProp.CalcuPr);
}
break;
case Yw.Hydro.ParterCatalog.Pipe:
{
- dict.Add(MonitorProp.CalcuQ, MonitorPropHelper.GetName(MonitorProp.CalcuQ));
+ list.Add(MonitorProp.CalcuQ);
+ list.Add(MonitorProp.CalcuPr1);
+ list.Add(MonitorProp.CalcuPr2);
}
break;
case Yw.Hydro.ParterCatalog.Translation:
{
- dict.Add(MonitorProp.CalcuQ, MonitorPropHelper.GetName(MonitorProp.CalcuQ));
+ list.Add(MonitorProp.CalcuQ);
+ list.Add(MonitorProp.CalcuPr1);
+ list.Add(MonitorProp.CalcuPr2);
}
break;
case Yw.Hydro.ParterCatalog.Pump:
{
- dict.Add(MonitorProp.CalcuQ, MonitorPropHelper.GetName(MonitorProp.CalcuQ));
- dict.Add(MonitorProp.CalcuPr1, MonitorPropHelper.GetName(MonitorProp.CalcuPr1));
- dict.Add(MonitorProp.CalcuPr2, MonitorPropHelper.GetName(MonitorProp.CalcuPr2));
- dict.Add(MonitorProp.CalcuPrd, MonitorPropHelper.GetName(MonitorProp.CalcuPrd));
- dict.Add(MonitorProp.CalcuO1, MonitorPropHelper.GetName(MonitorProp.CalcuO1));
- dict.Add(MonitorProp.CalcuO2, MonitorPropHelper.GetName(MonitorProp.CalcuO2));
- dict.Add(MonitorProp.CalcuH, MonitorPropHelper.GetName(MonitorProp.CalcuH));
- dict.Add(MonitorProp.CalcuP, MonitorPropHelper.GetName(MonitorProp.CalcuP));
- dict.Add(MonitorProp.CalcuE, MonitorPropHelper.GetName(MonitorProp.CalcuE));
- dict.Add(MonitorProp.CalcuE, MonitorPropHelper.GetName(MonitorProp.CalcuE));
+ list.Add(MonitorProp.CalcuQ);
+ list.Add(MonitorProp.CalcuPr1);
+ list.Add(MonitorProp.CalcuPr2);
+ list.Add(MonitorProp.CalcuPrd);
+ list.Add(MonitorProp.CalcuO1);
+ list.Add(MonitorProp.CalcuO2);
+ list.Add(MonitorProp.CalcuH);
+ list.Add(MonitorProp.CalcuP);
+ list.Add(MonitorProp.CalcuE);
}
break;
case Yw.Hydro.ParterCatalog.Valve:
{
- dict.Add(MonitorProp.CalcuQ, MonitorPropHelper.GetName(MonitorProp.CalcuQ));
- dict.Add(MonitorProp.CalcuPr1, MonitorPropHelper.GetName(MonitorProp.CalcuPr1));
- dict.Add(MonitorProp.CalcuPr2, MonitorPropHelper.GetName(MonitorProp.CalcuPr2));
- dict.Add(MonitorProp.CalcuO, MonitorPropHelper.GetName(MonitorProp.CalcuO));
+ list.Add(MonitorProp.CalcuQ);
+ list.Add(MonitorProp.CalcuPr1);
+ list.Add(MonitorProp.CalcuPr2);
+ list.Add(MonitorProp.CalcuO);
}
break;
case Yw.Hydro.ParterCatalog.Resistance:
{
- dict.Add(MonitorProp.CalcuQ, MonitorPropHelper.GetName(MonitorProp.CalcuQ));
- dict.Add(MonitorProp.CalcuPr1, MonitorPropHelper.GetName(MonitorProp.CalcuPr1));
- dict.Add(MonitorProp.CalcuPr2, MonitorPropHelper.GetName(MonitorProp.CalcuPr2));
- dict.Add(MonitorProp.CalcuPrd, MonitorPropHelper.GetName(MonitorProp.CalcuPrd));
- dict.Add(MonitorProp.CalcuO1, MonitorPropHelper.GetName(MonitorProp.CalcuO1));
- dict.Add(MonitorProp.CalcuO2, MonitorPropHelper.GetName(MonitorProp.CalcuO2));
- dict.Add(MonitorProp.CalcuT1, MonitorPropHelper.GetName(MonitorProp.CalcuT1));
- dict.Add(MonitorProp.CalcuT2, MonitorPropHelper.GetName(MonitorProp.CalcuT2));
- dict.Add(MonitorProp.CalcuTd, MonitorPropHelper.GetName(MonitorProp.CalcuTd));
+ list.Add(MonitorProp.CalcuQ);
+ list.Add(MonitorProp.CalcuPr1);
+ list.Add(MonitorProp.CalcuPr2);
+ list.Add(MonitorProp.CalcuPrd);
+ list.Add(MonitorProp.CalcuO1);
+ list.Add(MonitorProp.CalcuO2);
+ list.Add(MonitorProp.CalcuT1);
+ list.Add(MonitorProp.CalcuT2);
+ list.Add(MonitorProp.CalcuTd);
}
break;
case Yw.Hydro.ParterCatalog.Exchanger:
{
- dict.Add(MonitorProp.CalcuQ, MonitorPropHelper.GetName(MonitorProp.CalcuQ));
- dict.Add(MonitorProp.CalcuPr1, MonitorPropHelper.GetName(MonitorProp.CalcuPr1));
- dict.Add(MonitorProp.CalcuPr2, MonitorPropHelper.GetName(MonitorProp.CalcuPr2));
- dict.Add(MonitorProp.CalcuPrd, MonitorPropHelper.GetName(MonitorProp.CalcuPrd));
- dict.Add(MonitorProp.CalcuO1, MonitorPropHelper.GetName(MonitorProp.CalcuO1));
- dict.Add(MonitorProp.CalcuO2, MonitorPropHelper.GetName(MonitorProp.CalcuO2));
- dict.Add(MonitorProp.CalcuT1, MonitorPropHelper.GetName(MonitorProp.CalcuT1));
- dict.Add(MonitorProp.CalcuT2, MonitorPropHelper.GetName(MonitorProp.CalcuT2));
- dict.Add(MonitorProp.CalcuTd, MonitorPropHelper.GetName(MonitorProp.CalcuTd));
+ list.Add(MonitorProp.CalcuQ);
+ list.Add(MonitorProp.CalcuPr1);
+ list.Add(MonitorProp.CalcuPr2);
+ list.Add(MonitorProp.CalcuPrd);
+ list.Add(MonitorProp.CalcuO1);
+ list.Add(MonitorProp.CalcuO2);
+ list.Add(MonitorProp.CalcuT1);
+ list.Add(MonitorProp.CalcuT2);
+ list.Add(MonitorProp.CalcuTd);
}
break;
case Yw.Hydro.ParterCatalog.Compressor:
{
- dict.Add(MonitorProp.CalcuQ, MonitorPropHelper.GetName(MonitorProp.CalcuQ));
- dict.Add(MonitorProp.CalcuPr1, MonitorPropHelper.GetName(MonitorProp.CalcuPr1));
- dict.Add(MonitorProp.CalcuPr2, MonitorPropHelper.GetName(MonitorProp.CalcuPr2));
- dict.Add(MonitorProp.CalcuPrd, MonitorPropHelper.GetName(MonitorProp.CalcuPrd));
- dict.Add(MonitorProp.CalcuO1, MonitorPropHelper.GetName(MonitorProp.CalcuO1));
- dict.Add(MonitorProp.CalcuO2, MonitorPropHelper.GetName(MonitorProp.CalcuO2));
- dict.Add(MonitorProp.CalcuT1, MonitorPropHelper.GetName(MonitorProp.CalcuT1));
- dict.Add(MonitorProp.CalcuT2, MonitorPropHelper.GetName(MonitorProp.CalcuT2));
- dict.Add(MonitorProp.CalcuTd, MonitorPropHelper.GetName(MonitorProp.CalcuTd));
+ list.Add(MonitorProp.CalcuQ);
+ list.Add(MonitorProp.CalcuPr1);
+ list.Add(MonitorProp.CalcuPr2);
+ list.Add(MonitorProp.CalcuPrd);
+ list.Add(MonitorProp.CalcuO1);
+ list.Add(MonitorProp.CalcuO2);
+ list.Add(MonitorProp.CalcuT1);
+ list.Add(MonitorProp.CalcuT2);
+ list.Add(MonitorProp.CalcuTd);
}
break;
default: break;
}
- return dict;
+ return list;
}
+ /// <summary>
+ /// 鑾峰彇鍚嶇О
+ /// </summary>
+ public static string GetName(string code)
+ {
+ if (string.IsNullOrEmpty(code))
+ {
+ return string.Empty;
+ }
+ return MonitorPropHelper.GetName(code);
+ }
+ /// <summary>
+ /// 鑾峰彇鍗曚綅
+ /// </summary>
+ public static string GetUnit(string code)
+ {
+ if (string.IsNullOrEmpty(code))
+ {
+ return string.Empty;
+ }
+ return MonitorPropHelper.GetUnit(code);
+ }
}
}
--
Gitblit v1.9.3