From f373ad1f566c9c8679547f4205d86eb6e0836d59 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 06 一月 2025 17:22:13 +0800
Subject: [PATCH] 修改保存逻辑
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/05-function/SimulationFunctionCtrl.cs | 71 ++++++-----------------------------
1 files changed, 12 insertions(+), 59 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/05-function/SimulationFunctionCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/05-function/SimulationFunctionCtrl.cs
index dc49fe8..1f3ab72 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/05-function/SimulationFunctionCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/05-function/SimulationFunctionCtrl.cs
@@ -26,10 +26,6 @@
/// </summary>
public event Action<XhsProjectVmo, XhsProjectSiteVmo, XhsSchemeVmo, Yw.Model.HydroModelInfo, Dictionary<HydroWorkingVmo, bool>, SvgImage> ShowProjectSiteSimulationEvent;
/// <summary>
- /// 鏄剧ず椤圭洰绔欏伐鍐典簨浠�
- /// </summary>
- public event Action<XhsProjectVmo, XhsProjectSiteVmo, XhsSchemeVmo, Yw.Model.HydroModelInfo, HydroWorkingVmo, SvgImage> ShowProjectSiteWorkingEvent;
- /// <summary>
/// 椤圭洰绔欏伐鍐甸�夋嫨鏀瑰彉浜嬩欢
/// </summary>
public event Action<XhsProjectVmo, XhsProjectSiteVmo, XhsSchemeVmo, HydroWorkingVmo, bool> ProjectSiteWorkingCheckedEvent;
@@ -48,7 +44,7 @@
/// <summary>
/// 鍒涘缓椤圭洰绔欐柟妗堜簨浠�
/// </summary>
- public event Action<XhsProjectVmo, XhsProjectSiteVmo, Yw.Model.HydroModelInfo, SvgImage> CreateProjectSiteSchemeEvent;
+ public event Action<XhsProjectVmo, XhsProjectSiteVmo, Yw.Model.HydroModelInfo, List<XhsSchemeVmo>, SvgImage> CreateProjectSiteSchemeEvent;
/// <summary>
/// 椤圭洰绔欐柟妗堝鍔犱簨浠�
/// </summary>
@@ -158,7 +154,8 @@
{
return;
}
- this.CreateProjectSiteSchemeEvent?.Invoke(_project, _projectSite, hydroInfo, this.svgImg32[3]);
+ var allSchemeList = _allSchemeHydroInfoDict?.Keys.ToList();
+ this.CreateProjectSiteSchemeEvent?.Invoke(_project, _projectSite, hydroInfo, allSchemeList, this.svgImg32[3]);
}
//鍙抽敭寮瑰嚭
@@ -279,7 +276,8 @@
}
}
- var overlay = this.ShowOverlay();
+ WaitFormHelper.ShowWaitForm(this.FindForm(), "姝ｅ湪鍔犺浇妯″瀷鏁版嵁锛岃绋嶅悗...");
+ //var overlay = this.ShowOverlay();
if (!_gettingHydroInfoDict.TryAdd(key, true))
{
_gettingHydroInfoDict[key] = true;
@@ -300,11 +298,10 @@
{
return default;
}
- //var hydroInfo = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.GetByID(relation.ModelID);
- var hydroInfo = await HStation.BLL.XhsHydroInfo.GetByID(relation.ModelID);
+ var hydroInfo = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.GetByID(relation.ModelID);
_gettingHydroInfoDict[key] = false;
- overlay.Close();
-
+ //overlay.Close();
+ WaitFormHelper.HideWaitForm();
return hydroInfo;
}
@@ -524,14 +521,9 @@
elementWorking.Text = working.Name;
elementWorking.Hint = working.Description;
elementWorking.Tag = working;
- elementWorking.Click += async (sender, e) =>
+ elementWorking.Click += (sender, e) =>
{
- var hydroInfo = await GetHydroInfo(null, true);
- if (hydroInfo == null)
- {
- return;
- }
- this.ShowProjectSiteWorkingEvent?.Invoke(_project, _projectSite, null, hydroInfo, working, this.svgImg32[4]);
+
};
this.elementProjectSiteSimulation.Elements.Add(elementWorking);
this.elementProjectSiteSimulation.Style = DevExpress.XtraBars.Navigation.ElementStyle.Group;
@@ -578,14 +570,9 @@
elementWorking.Text = working.Name;
elementWorking.Hint = working.Description;
elementWorking.Tag = working;
- elementWorking.Click += async (sender, e) =>
+ elementWorking.Click += (sender, e) =>
{
- var hydroInfo = await GetHydroInfo(scheme, true);
- if (hydroInfo == null)
- {
- return;
- }
- this.ShowProjectSiteWorkingEvent?.Invoke(_project, _projectSite, scheme, hydroInfo, working, this.svgImg32[4]);
+
};
elementScheme.Elements.Add(elementWorking);
elementScheme.Style = DevExpress.XtraBars.Navigation.ElementStyle.Group;
@@ -795,40 +782,6 @@
return;
}
this.ShowProjectSiteInfoEvent?.Invoke(_project, _projectSite, hydroInfo, this.svgImg32[0]);
- }
-
- /// <summary>
- /// 淇濆瓨
- /// </summary>
- public async Task<Yw.Model.HydroModelInfo> SaveModel(XhsSchemeVmo scheme, Yw.Model.HydroModelInfo hydroInfo)
- {
- if (hydroInfo == null)
- {
- return default;
- }
- //var id = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.Save(hydroInfo);
- var id = await HStation.BLL.XhsHydroInfo.Save(hydroInfo);
- if (id < 1)
- {
- return default;
- }
- var db = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.GetByID(id);
- if (scheme == null)
- {
- _hydroInfo = db;
- return _hydroInfo;
- }
- if (_allSchemeHydroInfoDict == null || _allSchemeHydroInfoDict.Count < 1)
- {
- return default;
- }
- var schemeKey = _allSchemeHydroInfoDict.Keys.FirstOrDefault(x => x.ID == scheme.ID);
- if (schemeKey == null)
- {
- return default;
- }
- _allSchemeHydroInfoDict[schemeKey] = db;
- return db;
}
/// <summary>
--
Gitblit v1.9.3