From 9eb94e9eec2e2e164698e34d0481d66093c8655b Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 15 一月 2025 17:40:55 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/UserMgrPage.cs | 2
WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/AddUserDlg.cs | 4
WinFrmUI/HStation.WinFrmUI.Auth.Core/04-role-projcet-menu/RoleTreeListCtrl.cs | 2
WinFrmUI/HStation.WinFrmUI.Auth.Core/01-menu/MenuViewModel.cs | 4
WinFrmUI/HStation.WinFrmUI.Auth.Core/04-role-projcet-menu/RoleProjectMenuPage.cs | 6
WinFrmUI/HStation.WinFrmUI.Auth.Core/04-role-projcet-menu/RoleTreeListViewModel.cs | 6
WinFrmUI/HStation.WinFrmUI.Auth.Core/01-menu/AddMenuDlg.cs | 11 +-
WinFrmUI/HStation.WinFrmUI.Auth.Core/HStation.WinFrmUI.Auth.Core.csproj | 3
WinFrmUI/Yw.WinFrmUI.Hydro.Core/00-core/05-extensions/HydroModelInfoExtensions.cs | 6 +
WinFrmUI/HStation.WinFrmUI.Auth.Core/02-role/AddRoleDlg.cs | 4
WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/UserRoleHaveViewModel.cs | 2
WinFrmUI/HStation.WinFrmUI.Auth.Core/01-menu/EditMenuDlg.cs | 6
WinFrmUI/HStation.WinFrmUI.Auth.Core/02-role/RoleViewModel.cs | 6
WinFrmUI/HStation.WinFrmUI.Auth.Core/01-menu/MenuMgrPage.cs | 8 +-
Desktop/HStation.Desktop.Xhs.Core/HStation.Desktop.Xhs.Core.csproj | 2
WinFrmUI/HStation.WinFrmUI.Auth.Core/04-role-projcet-menu/RoleProjcetMenuViewModel.cs | 4
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectHelper.cs | 4
WinFrmUI/HStation.WinFrmUI.Auth.Core/02-role/RoleUserHaveViewModel.cs | 2
WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/EditUserDlg.cs | 6
WinFrmUI/HStation.WinFrmUI.Auth.Core/02-role/EditRoleDlg.cs | 6
WinFrmUI/HStation.WinFrmUI.Auth.Core/02-role/RoleMgrPage.cs | 2
WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/UserAccountViewModel.cs | 2
WinFrmUI/Yw.WinFrmUI.Hydro.Core/14-matching/00-core/HydroMatchingHelper.cs | 12 +++
WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/UserViewModel.cs | 6
Service/HStation.Service.Revit.Core/04-service/01-json/RevitJsonHelper.cs | 2
WinFrmUI/Yw.WinFrmUI.Hydro.Core/00-core/02-enum/ePressType.cs | 18 ++++
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs | 96 ++++++++++++++++++++----
27 files changed, 167 insertions(+), 65 deletions(-)
diff --git a/Desktop/HStation.Desktop.Xhs.Core/HStation.Desktop.Xhs.Core.csproj b/Desktop/HStation.Desktop.Xhs.Core/HStation.Desktop.Xhs.Core.csproj
index 78f4b42..3c5c99e 100644
--- a/Desktop/HStation.Desktop.Xhs.Core/HStation.Desktop.Xhs.Core.csproj
+++ b/Desktop/HStation.Desktop.Xhs.Core/HStation.Desktop.Xhs.Core.csproj
@@ -16,7 +16,7 @@
<ItemGroup>
<PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
- <PackageReference Include="Yw.BLL.Auth.Core" Version="3.5.0" />
+ <PackageReference Include="Yw.BLL.Auth.Core" Version="3.5.3" />
</ItemGroup>
<ItemGroup>
diff --git a/Service/HStation.Service.Revit.Core/04-service/01-json/RevitJsonHelper.cs b/Service/HStation.Service.Revit.Core/04-service/01-json/RevitJsonHelper.cs
index 518175b..2d96426 100644
--- a/Service/HStation.Service.Revit.Core/04-service/01-json/RevitJsonHelper.cs
+++ b/Service/HStation.Service.Revit.Core/04-service/01-json/RevitJsonHelper.cs
@@ -1005,7 +1005,7 @@
}
#endregion
-
+
#region MinVol
if (jobject[RevitJsonProp.MinVol].MatchNumeric(out double minVol))
diff --git a/WinFrmUI/HStation.WinFrmUI.Auth.Core/01-menu/AddMenuDlg.cs b/WinFrmUI/HStation.WinFrmUI.Auth.Core/01-menu/AddMenuDlg.cs
index 01d2135..2a2c59b 100644
--- a/WinFrmUI/HStation.WinFrmUI.Auth.Core/01-menu/AddMenuDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Auth.Core/01-menu/AddMenuDlg.cs
@@ -17,16 +17,16 @@
InitializeComponent();
}
- public event Func<Yw.Vmo.ProjectMenu, Task<bool>> ReloadDataEvent;
+ public event Func<Yw.Vmo.AddProjectMenuExVmo, Task<bool>> ReloadDataEvent;
- private Yw.Vmo.ProjectMenu _model = null;
+ private Yw.Vmo.ProjectMenuVmo _model = null;
/// <summary>
/// 娣诲姞
/// </summary>
public async void SetBindingData(long parentId)
{
- _model = new Yw.Vmo.ProjectMenu();
+ _model = new Yw.Vmo.ProjectMenuVmo();
var allList = await new Yw.BLL.ProjectMenu().GetByProjectID(GlobalParas._GlobalParas.ProjectID);
this.treeListLookUpEdit1TreeList.DataSource = allList;
this.imageComboBoxMenuType.Properties.AddEnum(typeof(eMenuType));
@@ -62,7 +62,10 @@
_model.ParentID = this.ComboBoxEditParentsChoice.EditValue == null ? 0 : Convert.ToInt64(this.ComboBoxEditParentsChoice.EditValue);
_model.Type = (int)(eMenuType)this.imageComboBoxMenuType.EditValue;
_model.Permission = this.TxtEditPermission.Text.Trim();
- if (await this.ReloadDataEvent.Invoke(_model))
+ var AddProject = new Yw.Vmo.AddProjectMenuExVmo();
+ AddProject.ProjectMenu = _model;
+ AddProject.SoftwareIds = new List<long> { GlobalParas._GlobalParas.SoftwareID };
+ if (await this.ReloadDataEvent.Invoke(AddProject))
{
TipFormHelper.ShowSucceed("娣诲姞鎴愬姛!!");
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Auth.Core/01-menu/EditMenuDlg.cs b/WinFrmUI/HStation.WinFrmUI.Auth.Core/01-menu/EditMenuDlg.cs
index b91f0b6..25708e8 100644
--- a/WinFrmUI/HStation.WinFrmUI.Auth.Core/01-menu/EditMenuDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Auth.Core/01-menu/EditMenuDlg.cs
@@ -13,14 +13,14 @@
InitializeComponent();
}
- public event Func<Yw.Vmo.ProjectMenu, Task<bool>> ReloadDataEvent;
+ public event Func<Yw.Vmo.ProjectMenuVmo, Task<bool>> ReloadDataEvent;
- private Yw.Vmo.ProjectMenu _model = null;
+ private Yw.Vmo.ProjectMenuVmo _model = null;
/// <summary>
/// 缂栬緫
/// </summary>
- public async void SetBindingData(Yw.Vmo.ProjectMenu rhs)
+ public async void SetBindingData(Yw.Vmo.ProjectMenuVmo rhs)
{
_model = rhs;
this.NameTextEdit.EditValue = _model.Name;
diff --git a/WinFrmUI/HStation.WinFrmUI.Auth.Core/01-menu/MenuMgrPage.cs b/WinFrmUI/HStation.WinFrmUI.Auth.Core/01-menu/MenuMgrPage.cs
index f8bccb1..24a0408 100644
--- a/WinFrmUI/HStation.WinFrmUI.Auth.Core/01-menu/MenuMgrPage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Auth.Core/01-menu/MenuMgrPage.cs
@@ -47,7 +47,7 @@
this.menuViewModelBindingSource.DataSource = _allBindingList;
this.menuViewModelBindingSource.ResetBindings(false);
// this.treeList1.ForceInitialize();
- this.treeList1.ExpandAll();
+ this.treeList1.ExpandAll();
}
public override void VerifyAuth()
@@ -65,11 +65,11 @@
dlg.SetBindingData(row != null ? row.ID : 0);
dlg.ReloadDataEvent += async (rhs) =>
{
- var id = await _bll.Insert(rhs);
+ var id = await _bll.Insert(rhs.ProjectMenu);
if (id > 0)
{
- rhs.ID = id;
- this._allBindingList.Add(new MenuViewModel(rhs));
+ rhs.ProjectMenu.ID = id;
+ this._allBindingList.Add(new MenuViewModel(rhs.ProjectMenu));
this.menuViewModelBindingSource.ResetBindings(false);
//this.treeList1.Refresh();
return true;
diff --git a/WinFrmUI/HStation.WinFrmUI.Auth.Core/01-menu/MenuViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Auth.Core/01-menu/MenuViewModel.cs
index 31fb3d7..9e192f4 100644
--- a/WinFrmUI/HStation.WinFrmUI.Auth.Core/01-menu/MenuViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Auth.Core/01-menu/MenuViewModel.cs
@@ -14,7 +14,7 @@
public MenuViewModel()
{ }
- public MenuViewModel(Yw.Vmo.ProjectMenu rhs)
+ public MenuViewModel(Yw.Vmo.ProjectMenuVmo rhs)
{
this.ID = rhs.ID;
this.ProjectID = rhs.ProjectID;
@@ -32,7 +32,7 @@
this.Description = rhs.Description;
}
- public void Reset(Yw.Vmo.ProjectMenu rhs)
+ public void Reset(Yw.Vmo.ProjectMenuVmo rhs)
{
this.ID = rhs.ID;
this.ProjectID = rhs.ProjectID;
diff --git a/WinFrmUI/HStation.WinFrmUI.Auth.Core/02-role/AddRoleDlg.cs b/WinFrmUI/HStation.WinFrmUI.Auth.Core/02-role/AddRoleDlg.cs
index f04972a..5b5a7d1 100644
--- a/WinFrmUI/HStation.WinFrmUI.Auth.Core/02-role/AddRoleDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Auth.Core/02-role/AddRoleDlg.cs
@@ -15,7 +15,7 @@
/// <summary>
/// 杩斿洖鏁版嵁浜嬩欢
/// </summary>
- public event Action<Yw.Vmo.Role> ReloadDataEvent;
+ public event Action<Yw.Vmo.RoleVmo> ReloadDataEvent;
//楠岃瘉
private async Task<bool> Valid()
@@ -37,7 +37,7 @@
//纭畾
private async void GeneralOkAndCancelCtrl1_OkEvent()
{
- var vmo = new Yw.Vmo.RoleEx();
+ var vmo = new Yw.Vmo.RoleExVmo();
if (!await Valid())
{
return;
diff --git a/WinFrmUI/HStation.WinFrmUI.Auth.Core/02-role/EditRoleDlg.cs b/WinFrmUI/HStation.WinFrmUI.Auth.Core/02-role/EditRoleDlg.cs
index 54c85ac..97ea1e9 100644
--- a/WinFrmUI/HStation.WinFrmUI.Auth.Core/02-role/EditRoleDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Auth.Core/02-role/EditRoleDlg.cs
@@ -26,14 +26,14 @@
/// <summary>
/// 杩斿洖鏁版嵁浜嬩欢
/// </summary>
- public event Action<Yw.Vmo.Role> ReloadDataEvent;
+ public event Action<Yw.Vmo.RoleVmo> ReloadDataEvent;
- private Yw.Vmo.Role _vmo = null;
+ private Yw.Vmo.RoleVmo _vmo = null;
/// <summary>
/// 缁戝畾鏁版嵁
/// </summary>
- public async void SetBindingData(Yw.Vmo.Role vmo)
+ public async void SetBindingData(Yw.Vmo.RoleVmo vmo)
{
if (vmo == null)
{
diff --git a/WinFrmUI/HStation.WinFrmUI.Auth.Core/02-role/RoleMgrPage.cs b/WinFrmUI/HStation.WinFrmUI.Auth.Core/02-role/RoleMgrPage.cs
index 342f46e..8d391b1 100644
--- a/WinFrmUI/HStation.WinFrmUI.Auth.Core/02-role/RoleMgrPage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Auth.Core/02-role/RoleMgrPage.cs
@@ -434,7 +434,7 @@
{
return;
}
- var roleUserInput = new SetRoleUserInput();
+ var roleUserInput = new SetRoleUserInputVmo();
roleUserInput.RoleID = vm.ID;
roleUserInput.UserIds = new List<long>();
foreach (var item in _roleUserHaveViewModelList)
diff --git a/WinFrmUI/HStation.WinFrmUI.Auth.Core/02-role/RoleUserHaveViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Auth.Core/02-role/RoleUserHaveViewModel.cs
index 397a66c..43349fa 100644
--- a/WinFrmUI/HStation.WinFrmUI.Auth.Core/02-role/RoleUserHaveViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Auth.Core/02-role/RoleUserHaveViewModel.cs
@@ -8,7 +8,7 @@
public RoleUserHaveViewModel()
{ }
- public RoleUserHaveViewModel(Yw.Vmo.RoleUserHave rhs)
+ public RoleUserHaveViewModel(Yw.Vmo.RoleUserHaveVmo rhs)
{
this.ID = rhs.ID;
this.Name = rhs.Name;
diff --git a/WinFrmUI/HStation.WinFrmUI.Auth.Core/02-role/RoleViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Auth.Core/02-role/RoleViewModel.cs
index 40a9d55..2b3c0a5 100644
--- a/WinFrmUI/HStation.WinFrmUI.Auth.Core/02-role/RoleViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Auth.Core/02-role/RoleViewModel.cs
@@ -17,7 +17,7 @@
/// <summary>
///
/// </summary>
- public RoleViewModel(Yw.Vmo.Role rhs)
+ public RoleViewModel(Yw.Vmo.RoleVmo rhs)
{
this.ID = rhs.ID;
this.CorpID = rhs.CorpID;
@@ -31,7 +31,7 @@
/// <summary>
///
/// </summary>
- public void Reset(Yw.Vmo.Role rhs)
+ public void Reset(Yw.Vmo.RoleVmo rhs)
{
this.ID = rhs.ID;
this.CorpID = rhs.CorpID;
@@ -79,6 +79,6 @@
/// <summary>
///
/// </summary>
- public Yw.Vmo.Role Vmo { get; set; }
+ public Yw.Vmo.RoleVmo Vmo { get; set; }
}
}
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/AddUserDlg.cs b/WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/AddUserDlg.cs
index f7357a3..d7a7d74 100644
--- a/WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/AddUserDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/AddUserDlg.cs
@@ -15,7 +15,7 @@
/// <summary>
/// 杩斿洖鏁版嵁浜嬩欢
/// </summary>
- public event Action<Yw.Vmo.User> ReloadDataEvent;
+ public event Action<Yw.Vmo.UserVmo> ReloadDataEvent;
//楠岃瘉
private async Task<bool> Valid()
@@ -42,7 +42,7 @@
//纭畾
private async void GeneralOkAndCancelCtrl1_OkEvent()
{
- var vmo = new Yw.Vmo.User();
+ var vmo = new Yw.Vmo.UserVmo();
if (!await Valid())
{
return;
diff --git a/WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/EditUserDlg.cs b/WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/EditUserDlg.cs
index 4e513bf..c8eec4d 100644
--- a/WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/EditUserDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/EditUserDlg.cs
@@ -15,14 +15,14 @@
/// <summary>
/// 杩斿洖鏁版嵁浜嬩欢
/// </summary>
- public event Action<Yw.Vmo.User> ReloadDataEvent;
+ public event Action<Yw.Vmo.UserVmo> ReloadDataEvent;
- private Yw.Vmo.User _vmo = null;
+ private Yw.Vmo.UserVmo _vmo = null;
/// <summary>
/// 缁戝畾鏁版嵁
/// </summary>
- public async void SetBindingData(Yw.Vmo.User vmo)
+ public async void SetBindingData(Yw.Vmo.UserVmo vmo)
{
if (vmo == null)
{
diff --git a/WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/UserAccountViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/UserAccountViewModel.cs
index c11e6ac..74d5d33 100644
--- a/WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/UserAccountViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/UserAccountViewModel.cs
@@ -8,7 +8,7 @@
public UserAccountViewModel()
{ }
- public UserAccountViewModel(Yw.Vmo.UserLoginAccountStd rhs)
+ public UserAccountViewModel(Yw.Vmo.UserLoginAccountStdVmo rhs)
{
this.ID = rhs.ID;
this.LoginType = rhs.LoginType;
diff --git a/WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/UserMgrPage.cs b/WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/UserMgrPage.cs
index de80bcf..30c2fa8 100644
--- a/WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/UserMgrPage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/UserMgrPage.cs
@@ -428,7 +428,7 @@
{
return;
}
- var userRoleInput = new SetUserRoleInput();
+ var userRoleInput = new SetUserRoleInputVmo();
userRoleInput.UserID = vm.ID;
userRoleInput.RoleIds = new List<long>();
foreach (var item in _userRoleHaveViewModelList)
diff --git a/WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/UserRoleHaveViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/UserRoleHaveViewModel.cs
index c984bc4..04a7cf9 100644
--- a/WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/UserRoleHaveViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/UserRoleHaveViewModel.cs
@@ -8,7 +8,7 @@
public UserRoleHaveViewModel()
{ }
- public UserRoleHaveViewModel(Yw.Vmo.UserRoleHave rhs)
+ public UserRoleHaveViewModel(Yw.Vmo.UserRoleHaveVmo rhs)
{
this.ID = rhs.ID;
this.Name = rhs.Name;
diff --git a/WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/UserViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/UserViewModel.cs
index 31e664d..0231531 100644
--- a/WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/UserViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/UserViewModel.cs
@@ -17,7 +17,7 @@
/// <summary>
///
/// </summary>
- public UserViewModel(Yw.Vmo.User rhs)
+ public UserViewModel(Yw.Vmo.UserVmo rhs)
{
this.ID = rhs.ID;
this.CorpID = rhs.CorpID;
@@ -34,7 +34,7 @@
/// <summary>
///
/// </summary>
- public void Reset(Yw.Vmo.User rhs)
+ public void Reset(Yw.Vmo.UserVmo rhs)
{
this.ID = rhs.ID;
this.CorpID = rhs.CorpID;
@@ -94,6 +94,6 @@
/// <summary>
///
/// </summary>
- public Yw.Vmo.User Vmo { get; set; }
+ public Yw.Vmo.UserVmo Vmo { get; set; }
}
}
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Auth.Core/04-role-projcet-menu/RoleProjcetMenuViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Auth.Core/04-role-projcet-menu/RoleProjcetMenuViewModel.cs
index 8a0371e..f9ba315 100644
--- a/WinFrmUI/HStation.WinFrmUI.Auth.Core/04-role-projcet-menu/RoleProjcetMenuViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Auth.Core/04-role-projcet-menu/RoleProjcetMenuViewModel.cs
@@ -14,7 +14,7 @@
{
}
- public RoleProjcetMenuViewModel(Yw.Vmo.RoleProjectMenuHave rhs)
+ public RoleProjcetMenuViewModel(Yw.Vmo.RoleProjectMenuHaveVmo rhs)
{
this.ID = rhs.ID;
this.ParentID = rhs.ParentID;
@@ -32,7 +32,7 @@
this.Have = rhs.Have;
}
- public void Reset(Yw.Vmo.RoleProjectMenuHave rhs)
+ public void Reset(Yw.Vmo.RoleProjectMenuHaveVmo rhs)
{
this.Have = rhs.Have;
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Auth.Core/04-role-projcet-menu/RoleProjectMenuPage.cs b/WinFrmUI/HStation.WinFrmUI.Auth.Core/04-role-projcet-menu/RoleProjectMenuPage.cs
index 0e3a354..3f7fc53 100644
--- a/WinFrmUI/HStation.WinFrmUI.Auth.Core/04-role-projcet-menu/RoleProjectMenuPage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Auth.Core/04-role-projcet-menu/RoleProjectMenuPage.cs
@@ -21,12 +21,12 @@
private List<RoleProjcetMenuViewModel> _allBindingList;
- private Yw.Vmo.Role _lastRole;
+ private Yw.Vmo.RoleVmo _lastRole;
/// <summary>
/// 鑱氱劍鏀瑰彉浜嬩欢
/// </summary>
- private async void RoleTreeListCtrl1_FocusedChangedEvent(Yw.Vmo.Role obj)
+ private async void RoleTreeListCtrl1_FocusedChangedEvent(Yw.Vmo.RoleVmo obj)
{
_lastRole = obj;
_allBindingList = new List<RoleProjcetMenuViewModel>();
@@ -50,7 +50,7 @@
menuList.Add(item.ID);
}
}
- var vmo = new Yw.Vmo.SetRoleProjectMenu();
+ var vmo = new Yw.Vmo.SetRoleProjectMenuVmo();
vmo.ProjectID = GlobalParas._GlobalParas.ProjectID;
vmo.RoleID = _lastRole.ID;
vmo.MenuIds = menuList;
diff --git a/WinFrmUI/HStation.WinFrmUI.Auth.Core/04-role-projcet-menu/RoleTreeListCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Auth.Core/04-role-projcet-menu/RoleTreeListCtrl.cs
index e723b7d..c20a956 100644
--- a/WinFrmUI/HStation.WinFrmUI.Auth.Core/04-role-projcet-menu/RoleTreeListCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Auth.Core/04-role-projcet-menu/RoleTreeListCtrl.cs
@@ -27,7 +27,7 @@
/// <summary>
/// 鑱氱劍鏀瑰彉浜嬩欢
/// </summary>
- public event Action<Yw.Vmo.Role> FocusedChangedEvent;
+ public event Action<Yw.Vmo.RoleVmo> FocusedChangedEvent;
/// <summary>
/// 鎵�鏈夌粦瀹氬垪琛�
diff --git a/WinFrmUI/HStation.WinFrmUI.Auth.Core/04-role-projcet-menu/RoleTreeListViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Auth.Core/04-role-projcet-menu/RoleTreeListViewModel.cs
index 15c264a..5b7d2f6 100644
--- a/WinFrmUI/HStation.WinFrmUI.Auth.Core/04-role-projcet-menu/RoleTreeListViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Auth.Core/04-role-projcet-menu/RoleTreeListViewModel.cs
@@ -17,7 +17,7 @@
/// <summary>
///
/// </summary>
- public RoleTreeListViewModel(Yw.Vmo.Role rhs)
+ public RoleTreeListViewModel(Yw.Vmo.RoleVmo rhs)
{
this.ID = rhs.ID;
this.Name = rhs.Name;
@@ -28,7 +28,7 @@
/// <summary>
///
/// </summary>
- public void Reset(Yw.Vmo.Role rhs)
+ public void Reset(Yw.Vmo.RoleVmo rhs)
{
this.ID = rhs.ID;
this.Name = rhs.Name;
@@ -78,6 +78,6 @@
/// <summary>
///
/// </summary>
- public Yw.Vmo.Role Vmo { get; set; }
+ public Yw.Vmo.RoleVmo Vmo { get; set; }
}
}
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Auth.Core/HStation.WinFrmUI.Auth.Core.csproj b/WinFrmUI/HStation.WinFrmUI.Auth.Core/HStation.WinFrmUI.Auth.Core.csproj
index f9a38b1..637ade9 100644
--- a/WinFrmUI/HStation.WinFrmUI.Auth.Core/HStation.WinFrmUI.Auth.Core.csproj
+++ b/WinFrmUI/HStation.WinFrmUI.Auth.Core/HStation.WinFrmUI.Auth.Core.csproj
@@ -40,11 +40,10 @@
<ItemGroup>
<PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
<PackageReference Include="Microsoft.QualityTools.Testing.Fakes" Version="17.5.0-beta.23060.1" />
- <PackageReference Include="Yw.BLL.Auth.Core" Version="3.3.7" />
+ <PackageReference Include="Yw.BLL.Auth.Core" Version="3.5.3" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\..\BLL\HStation.BLL.Organize.Core\HStation.BLL.Organize.Core.csproj" />
<ProjectReference Include="..\HStation.WinFrmUI.Basic.Core\HStation.WinFrmUI.Basic.Core.csproj" />
<ProjectReference Include="..\HStation.WinFrmUI.Core\HStation.WinFrmUI.Core.csproj" />
</ItemGroup>
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectHelper.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectHelper.cs
index 9804ad6..68d7fc9 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectHelper.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectHelper.cs
@@ -404,8 +404,8 @@
feedBackProgress?.Invoke(100, 60);
feedBackMsg?.Invoke("姝ｅ湪杩涜妯″瀷杞婚噺鍖�...", Color.Black);
- var bimfaceTranslateStatus = await Yw.WinFrmUI.BimfaceHelper.TranslateRvtFile(bimfaceId);//鍙戣捣杞崲
- //var bimfaceTranslateStatus = Yw.BIMFace.eTranslateStatus.Processing;//娴嬭瘯浠ｇ爜
+ //var bimfaceTranslateStatus = await Yw.WinFrmUI.BimfaceHelper.TranslateRvtFile(bimfaceId);//鍙戣捣杞崲
+ var bimfaceTranslateStatus = Yw.BIMFace.eTranslateStatus.Processing;//娴嬭瘯浠ｇ爜
if (bimfaceTranslateStatus != Yw.BIMFace.eTranslateStatus.Success)
{
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs
index e455e43..7caf1c6 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs
@@ -528,7 +528,7 @@
}
//鏍囩
- int flagWeight = 1;
+ int flagWeight = 1000;
foreach (var item in pipeLineMainVmos)
{
if (item.Flags != null && item.Flags.Count > 0)
@@ -643,7 +643,7 @@
}
//鏍囩
- int flagWeight = 1;
+ int flagWeight = 1000;
foreach (var item in threelinkVmos)
{
if (item.Flags != null && item.Flags.Count > 0)
@@ -766,7 +766,7 @@
}
//鏍囩
- int flagWeight = 1;
+ int flagWeight = 1000;
foreach (var item in fourLinkVmos)
{
if (item.Flags != null && item.Flags.Count > 0)
@@ -884,7 +884,7 @@
}
//鏍囩
- int flagWeight = 1;
+ int flagWeight = 1000;
foreach (var item in sprinklerVmos)
{
if (item.Flags != null && item.Flags.Count > 0)
@@ -1002,7 +1002,7 @@
}
//鏍囩
- int flagWeight = 1;
+ int flagWeight = 1000;
foreach (var item in allExchangerList)
{
if (item.Flags != null && item.Flags.Count > 0)
@@ -1141,7 +1141,7 @@
}
//鏍囩
- int flagWeight = 1;
+ int flagWeight = 1000;
foreach (var item in allCompressorList)
{
if (item.Flags != null && item.Flags.Count > 0)
@@ -1280,7 +1280,7 @@
}
//鏍囩
- int flagWeight = 1;
+ int flagWeight = 1000;
foreach (var item in bluntheadVmos)
{
if (item.Flags != null && item.Flags.Count > 0)
@@ -1365,7 +1365,7 @@
}
//鏍囩
- int flagWeight = 1;
+ int flagWeight = 1000;
foreach (var item in tankVmos)
{
if (item.Flags != null && item.Flags.Count > 0)
@@ -1471,7 +1471,7 @@
}
//鏍囩
- int flagWeight = 10;
+ int flagWeight = 1000;
foreach (var item in allMeterList)
{
if (item.Flags != null && item.Flags.Count > 0)
@@ -1548,7 +1548,7 @@
}
//鏍囩
- int flagWeight = 10;
+ int flagWeight = 1000;
foreach (var item in allFlowmeterList)
{
if (item.Flags != null && item.Flags.Count > 0)
@@ -1658,7 +1658,7 @@
}
//鏍囩
- int flagWeight = 1;
+ int flagWeight = 1000;
foreach (var item in hydrantVmos)
{
if (item.Flags != null && item.Flags.Count > 0)
@@ -1727,7 +1727,40 @@
}
}
}
-
+ //鍙ｅ緞
+ int caliberWeight = 1;
+ if (input.Caliber > 0)
+ {
+ foreach (var item in allElbowList)
+ {
+ if (item.Caliber.HasValue)
+ {
+ var diff = Math.Abs(item.Caliber.Value - input.Caliber);
+ dict[item] += diff / input.Caliber * 100 * caliberWeight;
+ }
+ }
+ }
+ // 瑙掑害
+ int angleWeight = 1000;
+ if (input.BendingAngle > 0)
+ {
+ foreach (var item in allElbowList)
+ {
+ if (item.Angle > 0)
+ {
+ var count = Math.Abs(item.Angle.Value - input.BendingAngle);
+ if (count != 0)
+ {
+ dict[item] += (1.0 / count) * angleWeight;
+ }
+ else
+ {
+ // 濡傛灉 count 涓� 0锛岃〃绀哄畬鍏ㄥ尮閰嶏紝缁欎簣鏈�澶ф潈閲�
+ dict[item] += angleWeight * 100;
+ }
+ }
+ }
+ }
// 鍏抽敭瀛�
int keywordWeight = 1;
foreach (var item in allElbowList)
@@ -1743,7 +1776,7 @@
}
//鏍囩
- int flagWeight = 10;
+ int flagWeight = 1000;
foreach (var item in allElbowList)
{
if (item.Flags != null && item.Flags.Count > 0)
@@ -1835,7 +1868,7 @@
}
//鏍囩
- int flagWeight = 1;
+ int flagWeight = 1000;
foreach (var item in pressmeterVmos)
{
if (item.Flags != null && item.Flags.Count > 0)
@@ -1897,6 +1930,37 @@
}
}
+ // 涓婃父鍜屼笅娓哥洿寰�
+ int diameterWeight = 100;
+ if (input.StartDiameter > 0 && input.EndDiameter > 0)
+ {
+ foreach (var item in translationVmos)
+ {
+ if (item.StartDiameter > 0 && item.EndDiameter > 0)
+ {
+ var startCount = Math.Abs(item.StartDiameter - input.StartDiameter);
+ var endCount = Math.Abs(item.EndDiameter - input.EndDiameter);
+
+ if (startCount == 0 && endCount == 0)
+ {
+ // 濡傛灉 startCount 鍜� endCount 閮戒负 0锛岃〃绀哄畬鍏ㄥ尮閰嶏紝缁欎簣鏈�澶ф潈閲�
+ dict[item] += diameterWeight * 100;
+ }
+ else
+ {
+ // 鍚﹀垯锛屽垎鍒绠楁潈閲�
+ if (startCount != 0)
+ {
+ dict[item] += (1.0 / startCount) * diameterWeight;
+ }
+ if (endCount != 0)
+ {
+ dict[item] += (1.0 / endCount) * diameterWeight;
+ }
+ }
+ }
+ }
+ }
//鏉愯川
int materialWeight = 5;
if (!string.IsNullOrEmpty(input.Material))
@@ -1931,7 +1995,7 @@
}
//鏍囩
- int flagWeight = 1;
+ int flagWeight = 1000;
foreach (var item in translationVmos)
{
if (item.Flags != null && item.Flags.Count > 0)
@@ -2057,7 +2121,7 @@
}
//鏍囩
- int flagWeight = 1;
+ int flagWeight = 1000;
foreach (var item in allCoolingList)
{
if (item.Flags != null && item.Flags.Count > 0)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/00-core/02-enum/ePressType.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/00-core/02-enum/ePressType.cs
new file mode 100644
index 0000000..4c0b52c
--- /dev/null
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/00-core/02-enum/ePressType.cs
@@ -0,0 +1,18 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Yw.WinFrmUI
+{
+ /// <summary>
+ /// 鍘嬪姏绫诲瀷
+ /// </summary>
+ public enum ePressType
+ {
+
+
+ }
+
+}
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/00-core/05-extensions/HydroModelInfoExtensions.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/00-core/05-extensions/HydroModelInfoExtensions.cs
index 8d5ffd0..0cedecf 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/00-core/05-extensions/HydroModelInfoExtensions.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/00-core/05-extensions/HydroModelInfoExtensions.cs
@@ -575,5 +575,11 @@
#endregion
+ #region 璁＄畻缁撴灉
+
+
+
+ #endregion
+
}
}
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/14-matching/00-core/HydroMatchingHelper.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/14-matching/00-core/HydroMatchingHelper.cs
index d8f6f14..4158f0a 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/14-matching/00-core/HydroMatchingHelper.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/14-matching/00-core/HydroMatchingHelper.cs
@@ -2742,6 +2742,9 @@
}
hydroInfo.Curves.Add(curveqh);
visual.CurveQH = curveqh.Code;
+ changeHelper?.Append(curveqh, eChangeType.Add);
+ changeHelper?.Append(visual, eChangeType.Update);
+ propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.CurveQH), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}閫氳繃浜у搧閰嶇疆鍖归厤淇敼");
result = true;
}
else
@@ -2750,6 +2753,7 @@
{
curveqh.DbId = matching.MatchingCurveDbId;
curveqh.CurveData = matching.MatchingCurveQH?.Select(x => new Yw.Model.Hydro.CurvePoint(x.X, x.Y)).ToList();
+ changeHelper?.Append(curveqh, eChangeType.Update);
result = true;
}
}
@@ -2773,6 +2777,9 @@
}
hydroInfo.Curves.Add(curveqp);
visual.CurveQP = curveqp.Code;
+ changeHelper?.Append(curveqp, eChangeType.Add);
+ changeHelper?.Append(visual, eChangeType.Update);
+ propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.CurveQP), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}閫氳繃浜у搧閰嶇疆鍖归厤淇敼");
result = true;
}
else
@@ -2781,6 +2788,7 @@
{
curveqp.DbId = matching.MatchingCurveDbId;
curveqp.CurveData = matching.MatchingCurveQP?.Select(x => new Yw.Model.Hydro.CurvePoint(x.X, x.Y)).ToList();
+ changeHelper?.Append(curveqp, eChangeType.Update);
result = true;
}
}
@@ -2804,6 +2812,9 @@
}
hydroInfo.Curves.Add(curveqe);
visual.CurveQE = curveqe.Code;
+ changeHelper?.Append(curveqe, eChangeType.Add);
+ changeHelper?.Append(visual, eChangeType.Update);
+ propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.CurveQE), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}閫氳繃浜у搧閰嶇疆鍖归厤淇敼");
result = true;
}
else
@@ -2812,6 +2823,7 @@
{
curveqe.DbId = matching.MatchingCurveDbId;
curveqe.CurveData = matching.MatchingCurveQE?.Select(x => new Yw.Model.Hydro.CurvePoint(x.X, x.Y)).ToList();
+ changeHelper?.Append(curveqe, eChangeType.Update);
result = true;
}
}
--
Gitblit v1.9.3