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

refactor: 移除MenuBeanDto，直接使用MenuBean模型

Browse Source 
- 删除了 DMS.Application/DTOs/MenuBeanDto.cs 文件
- 在DTOs中将MenuBeanDto类型替换为MenuBean类型
- 更新了IMenuAppService和IMenuManagementService接口中相关方法的参数和返回值类型
- 修改了MenuAppService、MenuManagementService等服务类的实现
- 在DMS.Core/Models/MenuBean.cs中添加了Children属性以支持菜单树结构
- 更新了WPF层相关的菜单处理逻辑
- 修改了映射配置和视图模型中的菜单对象创建方式
- 这一更改简化了数据模型，消除了DTO与模型之间的重复定义，直接在各层之间使用MenuBean实体。
This commit is contained in:
David P.G
2025-10-13 20:20:09 +08:00
parent e78a7981e1
commit 816827e5e9
21 changed files with 95 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
DMS.WPF/Services/MenuDataService.cs
View File

@@ -1,8 +1,8 @@
using AutoMapper;
using DMS.Application.DTOs;
using DMS.Application.Interfaces;
using DMS.Application.Interfaces.Management;
using DMS.Application.Services.Management;
using DMS.Core.Models;
using DMS.WPF.Interfaces;
using DMS.WPF.ItemViewModel;
using System.Collections.ObjectModel;
@@ -79,7 +79,7 @@ public class MenuDataService : IMenuDataService
if (deviceMenu is not null)
{
var menuId= await _menuManagementService.CreateMenuAsync(_mapper.Map<MenuBeanDto>(MenuItem));
var menuId= await _menuManagementService.CreateMenuAsync(_mapper.Map<MenuBean>(MenuItem));
if (menuId>0)
{
MenuItem.Id = menuId;

4
DMS.WPF/Services/MqttDataService.cs
View File

@@ -78,7 +78,7 @@ public class MqttDataService : IMqttDataService
if (mqttRootMenu is not null)
{
var mqttServerMenu = new MenuBeanDto()
var mqttServerMenu = new MenuBean()
{
Header = mqttServerItem.ServerName,
TargetId = mqttServerItem.Id,
@@ -111,7 +111,7 @@ public class MqttDataService : IMqttDataService
menu.Header = mqttServer.ServerName;
// 使用菜单管理服务更新菜单
var menuDto = _mapper.Map<MenuBeanDto>(menu);
var menuDto = _mapper.Map<MenuBean>(menu);
await _menuManagementServiceImpl.UpdateMenuAsync(menuDto);
}
}

6
DMS.WPF/Services/VariableTableDataService.cs
View File

@@ -40,7 +40,7 @@ public class VariableTableDataService : IVariableTableDataService
}
public async Task<int> AddVariableTable(VariableTable variableTable,
MenuBeanDto menuDto = null, bool isAddDb = false)
MenuBean menuDto = null, bool isAddDb = false)
{
if (variableTable == null)
return 0;
@@ -53,7 +53,7 @@ public class VariableTableDataService : IVariableTableDataService
createDto.Menu = menuDto;
var resDto = await _appDataCenterService.VariableTableManagementService.CreateVariableTableAsync(createDto);
_menuDataService.AddMenuItem(_mapper.Map<MenuItem>(resDto.Menu));
await _menuDataService.AddMenuItem(_mapper.Map<MenuItem>(resDto.Menu));
return resDto.VariableTable.Id;
}
@@ -114,7 +114,7 @@ public class VariableTableDataService : IVariableTableDataService
var variableTableMenu
=_dataStorageService.Menus.FirstOrDefault(m => m.MenuType == MenuType.VariableTableMenu && m.TargetId == variableTable.Id);
_menuDataService.DeleteMenuItem(variableTableMenu);
await _menuDataService.DeleteMenuItem(variableTableMenu);
// 删除变量表
_dataStorageService.VariableTables.Remove(variableTable.Id);
variableTable.Device.VariableTables.Remove(variableTable);