From 8c0d9657f6737dd56c5751c489a825b7838678d8 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期六, 08 六月 2024 10:55:32 +0800
Subject: [PATCH] 冲突
---
Hydraulic/Hydro.MapView/MapViewNetWork2Inp.cs | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/Hydraulic/Hydro.MapView/MapViewNetWork2Inp.cs b/Hydraulic/Hydro.MapView/MapViewNetWork2Inp.cs
index 6904e1e..2ba8a4b 100644
--- a/Hydraulic/Hydro.MapView/MapViewNetWork2Inp.cs
+++ b/Hydraulic/Hydro.MapView/MapViewNetWork2Inp.cs
@@ -59,7 +59,7 @@
if (parts[-2] == "Meter")
{
var m = new MeterViewModel();
- m.DlTemplateID = parts.ToString(-4, "");
+ m.DlTemplateID = ToDisplyName(parts.ToString(-4, ""));
j = m;
}
else if (parts[-2] == "Nozzle")
@@ -354,6 +354,28 @@
return StatusType.DEFAULT;
break;
}
+ }
+
+ /// <summary>
+ /// 涓嬫媺鏂囨湰妗嗚浆鎹负鏄剧ず鍐呭
+ /// </summary>
+ /// <param name="id"></param>
+ /// <returns></returns>
+ public string ToDisplyName(string id)
+ {
+ if (string.IsNullOrEmpty(id))
+ return null;
+ var filePath = Path.Combine(Directory.GetCurrentDirectory(), "Data\\WaterEquivalent.Json");
+ List<EquivalentTemplateModel> equivalentTemplateModels = new List<EquivalentTemplateModel>();
+ if (File.Exists(filePath))
+ {
+ var json = File.ReadAllText(filePath);
+ if (!string.IsNullOrEmpty(json))
+ {
+ equivalentTemplateModels = JsonConvert.DeserializeObject<List<EquivalentTemplateModel>>(json);
+ }
+ }
+ return equivalentTemplateModels.Where(x => x.ID == Convert.ToInt64(id)).FirstOrDefault().Name;
}
public void BuildRelation()
@@ -973,7 +995,7 @@
if (o is JunctionViewModel j)
junctionStringBuilder.AppendLine(j.ToString() + $"{j.Level}\tJunction\t{o.Tags}");
else if (o is MeterViewModel m)
- junctionStringBuilder.AppendLine(m.ToString() + $"{o.Level}\tMeter\t{o.Tags}\t{m.DlTemplateID}");
+ junctionStringBuilder.AppendLine(m.ToString() + $"{o.Level}\tMeter\t{o.Tags}\t{m.GetTemplateID()}");
else if (o is NozzleViewModel no)
junctionStringBuilder.AppendLine(no.ToString() + $"{o.Level}\tNozzle\t{o.Tags}\t{no.FlowCoefficient}");
});
--
Gitblit v1.9.3