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

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

@@ -17,11 +17,11 @@ namespace DMS.WPF.Services;
public class MqttDataService : IMqttDataService
{
private readonly IMapper _mapper;
private readonly IAppStorageService _appStorageService;
private readonly IAppDataService _appDataService;
private readonly IMqttManagementService _mqttManagementService;
private readonly IMenuViewService _menuDataService;
private readonly IMenuManagementService _menuManagementServiceImpl;
private readonly IWpfDataService _dataStorageService;
private readonly IViewDataService _viewDataService;
/// <summary>
@@ -29,14 +29,14 @@ public class MqttDataService : IMqttDataService
/// </summary>
/// <param name="mapper">AutoMapper 实例。</param>
/// <param name="mqttAppService">MQTT应用服务实例。</param>
public MqttDataService(IMapper mapper, IAppStorageService appStorageService, IMqttManagementService mqttManagementService, IMenuViewService menuDataService, IMenuManagementService menuManagementServiceImpl, IWpfDataService dataStorageService)
public MqttDataService(IMapper mapper, IAppDataService appStorageService, IMqttManagementService mqttManagementService, IMenuViewService menuDataService, IMenuManagementService menuManagementServiceImpl, IViewDataService dataStorageService)
{
_mapper = mapper;
_appStorageService = appStorageService;
_appDataService = appStorageService;
_mqttManagementService = mqttManagementService;
_menuDataService = menuDataService;
_menuManagementServiceImpl = menuManagementServiceImpl;
_dataStorageService = dataStorageService;
_viewDataService = dataStorageService;
}
/// <summary>
@@ -47,9 +47,9 @@ public class MqttDataService : IMqttDataService
try
{
// 加载MQTT服务器数据
foreach (var mqttServer in _appStorageService.MqttServers.Values)
foreach (var mqttServer in _appDataService.MqttServers.Values)
{
_dataStorageService.MqttServers.TryAdd(mqttServer.Id, _mapper.Map<MqttServerItem>(mqttServer));
_viewDataService.MqttServers.TryAdd(mqttServer.Id, _mapper.Map<MqttServerItem>(mqttServer));
}
}
@@ -71,10 +71,10 @@ public class MqttDataService : IMqttDataService
MqttServerItem mqttServerItem = _mapper.Map<MqttServerItem>(addMqttServer);
_dataStorageService.MqttServers.Add(mqttServerItem.Id, mqttServerItem);
_viewDataService.MqttServers.Add(mqttServerItem.Id, mqttServerItem);
var mqttRootMenu = _dataStorageService.Menus.FirstOrDefault(m => m.Header == "Mqtt服务器");
var mqttRootMenu = _viewDataService.Menus.FirstOrDefault(m => m.Header == "Mqtt服务器");
if (mqttRootMenu is not null)
{
@@ -104,7 +104,7 @@ public class MqttDataService : IMqttDataService
if (result > 0)
{
// 更新菜单项
var menu = _dataStorageService.Menus.FirstOrDefault(m => m.MenuType == MenuType.MqttServerMenu && m.TargetId == mqttServer.Id);
var menu = _viewDataService.Menus.FirstOrDefault(m => m.MenuType == MenuType.MqttServerMenu && m.TargetId == mqttServer.Id);
if (menu != null)
{
// 更新菜单标题
@@ -112,7 +112,7 @@ public class MqttDataService : IMqttDataService
// 使用菜单管理服务更新菜单
var menuDto = _mapper.Map<MenuBean>(menu);
await _menuManagementServiceImpl.UpdateMenuAsync(menuDto);
await _menuManagementServiceImpl.UpdateAsync(menuDto);
}
}
@@ -130,15 +130,15 @@ public class MqttDataService : IMqttDataService
if (result)
{
// 从界面删除MQTT服务器菜单
var mqttServerMenu = _dataStorageService.Menus.FirstOrDefault(m => m.MenuType == MenuType.MqttServerMenu && m.TargetId == mqttServer.Id);
var mqttServerMenu = _viewDataService.Menus.FirstOrDefault(m => m.MenuType == MenuType.MqttServerMenu && m.TargetId == mqttServer.Id);
if (mqttServerMenu != null)
{
await _menuDataService.DeleteMenuItem(mqttServerMenu);
_menuDataService.DeleteMenuToView(mqttServerMenu);
}
// 从界面删除MQTT服务器
_dataStorageService.MqttServers.Remove(mqttServer.Id);
_viewDataService.MqttServers.Remove(mqttServer.Id);
}
return result;