xiaowei/DMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor:完成重构设备的添加，删除，更新。

Browse Source
This commit is contained in:
David P.G
2025-10-22 14:06:16 +08:00
parent e995ec7207
commit 54d040b45f
76 changed files with 1028 additions and 1161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
DMS.Application/Services/Management/MenuManagementService.cs
View File

@@ -12,7 +12,7 @@ namespace DMS.Application.Services.Management;
public class MenuManagementService : IMenuManagementService
{
private readonly IMenuAppService _menuService;
private readonly IAppStorageService _appStorageService;
private readonly IAppDataService _appDataService;
private readonly IEventService _eventService;
/// <summary>
@@ -20,10 +20,10 @@ public class MenuManagementService : IMenuManagementService
/// </summary>
public event EventHandler<MenuChangedEventArgs> MenuChanged;
public MenuManagementService(IMenuAppService menuService, IAppStorageService appStorageService, IEventService eventService)
public MenuManagementService(IMenuAppService menuService, IAppDataService appStorageService, IEventService eventService)
{
_menuService = menuService;
_appStorageService = appStorageService;
_appDataService = appStorageService;
_eventService = eventService;
}
@@ -46,41 +46,40 @@ public class MenuManagementService : IMenuManagementService
/// <summary>
/// 异步创建一个新菜单。
/// </summary>
public async Task<int> CreateMenuAsync(MenuBean menu)
public async Task<MenuBean> AddAsync(MenuBean menu)
{
var result = await _menuService.CreateMenuAsync(menu);
var resMenu = await _menuService.AddAsync(menu);
// 创建成功后，将菜单添加到内存中
if (result > 0)
if (resMenu is not null)
{
menu.Id = result; // 假设返回的ID是新创建的
if (_appStorageService.Menus.TryAdd(menu.Id, menu))
if (_appDataService.Menus.TryAdd(resMenu.Id, resMenu))
{
MenuBean parentMenu = null;
if (menu.ParentId > 0 && _appStorageService.Menus.TryGetValue(menu.ParentId.Value, out var parent))
if (resMenu.ParentId > 0 && _appDataService.Menus.TryGetValue(resMenu.ParentId.Value, out var parent))
{
parentMenu = parent;
parent.Children.Add(menu);
parent.Children.Add(resMenu);
}
_eventService.RaiseMenuChanged(this, new MenuChangedEventArgs(DataChangeType.Added, menu));
_eventService.RaiseMenuChanged(this, new MenuChangedEventArgs(DataChangeType.Added, resMenu));
}
}
return result;
return resMenu;
}
/// <summary>
/// 异步更新一个已存在的菜单。
/// </summary>
public async Task<int> UpdateMenuAsync(MenuBean menu)
public async Task<int> UpdateAsync(MenuBean menu)
{
var result = await _menuService.UpdateMenuAsync(menu);
var result = await _menuService.UpdateAsync(menu);
// 更新成功后，更新内存中的菜单
if (result > 0)
{
if (_appStorageService.Menus.TryGetValue(menu.Id,out var mMenu))
if (_appDataService.Menus.TryGetValue(menu.Id,out var mMenu))
{
mMenu.Header = menu.Header;
}
@@ -94,18 +93,17 @@ public class MenuManagementService : IMenuManagementService
/// <summary>
/// 异步删除一个菜单。
/// </summary>
public async Task<bool> DeleteMenuAsync(int id)
public async Task<bool> DeleteAsync(MenuBean menu)
{
var menu = await _menuService.GetMenuByIdAsync(id); // 获取菜单信息用于内存删除
var result = await _menuService.DeleteMenuAsync(id);
var result = await _menuService.DeleteAsync(menu);
// 删除成功后，从内存中移除菜单
if (result && menu != null)
{
if (_appStorageService.Menus.TryRemove(id, out var menuData))
if (_appDataService.Menus.TryRemove(menu.Id, out var menuData))
{
// 从父菜单中移除子菜单
if (menuData.ParentId > 0 && _appStorageService.Menus.TryGetValue(menuData.ParentId.Value, out var parentMenu))
if (menuData.ParentId > 0 && _appDataService.Menus.TryGetValue(menuData.ParentId.Value, out var parentMenu))
{
parentMenu.Children.Remove(menuData);
}
@@ -117,41 +115,49 @@ public class MenuManagementService : IMenuManagementService
return result;
}
/// <summary>
/// 获取根菜单列表
/// </summary>
public List<MenuBean> GetRootMenus()
{
return _appStorageService.Menus.Values.Where(m => m.ParentId == 0)
.ToList();
}
/// <summary>
/// 根据父级ID获取子菜单列表
/// 构建菜单树。
/// </summary>
/// <param name="parentId">父级菜单ID</param>
/// <returns>子菜单列表</returns>
public List<MenuBean> GetChildMenus(int parentId)
public void BuildMenuTrees()
{
return _appStorageService.Menus.Values.Where(m => m.ParentId == parentId)
.ToList();
}
// 创建一个新的临时列表来存储根菜单
var newRootMenus = new List<MenuBean>();
/// <summary>
/// 构建菜单树结构
/// </summary>
public void BuildMenuTree()
{
// 清空现有菜单树
_appStorageService.MenuTrees.Clear();
// 获取所有根菜单
var rootMenus = GetRootMenus();
// 将根菜单添加到菜单树中
foreach (var rootMenu in rootMenus)
// 首先，确保所有菜单项的Children集合是干净的
foreach (var menu in _appDataService.Menus.Values)
{
_appStorageService.MenuTrees.TryAdd(rootMenu.Id, rootMenu);
// 避免循环引用，清空Children集合
menu.Children.Clear();
}
// 遍历所有菜单项，构建树形结构
foreach (var menu in _appDataService.Menus.Values)
{
var parentMenu = _appDataService.Menus.Values.FirstOrDefault(m => m.Id == menu.ParentId);
// 检查是否有父ID，并且父ID不为0（通常0或null表示根节点）
if (parentMenu != null && menu.ParentId != 0)
{
// 将当前菜单添加到父菜单的Children列表中
if (!parentMenu.Children.Contains(menu))
{
parentMenu.Children.Add(menu);
}
}
else
{
// 如果没有父ID，则这是一个根菜单
newRootMenus.Add(menu);
}
}
// 在UI线程安全地更新MenuTrees集合
_appDataService.MenuTrees.Clear();
foreach (var rootMenu in newRootMenus)
{
_appDataService.MenuTrees.TryAdd(rootMenu.Id,rootMenu);
}
}
@@ -168,13 +174,15 @@ public class MenuManagementService : IMenuManagementService
/// </summary>
public async Task LoadAllMenusAsync()
{
_appStorageService.Menus.Clear();
_appStorageService.MenuTrees.Clear();
_appDataService.Menus.Clear();
_appDataService.MenuTrees.Clear();
var menus = await _menuService.GetAllMenusAsync();
// 将菜单添加到安全字典
foreach (var menuBean in menus)
{
_appStorageService.Menus.TryAdd(menuBean.Id, menuBean);
_appDataService.Menus.TryAdd(menuBean.Id, menuBean);
}
BuildMenuTrees();
}
}