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

114
DMS.Application/Services/Management/DeviceManagementService.cs
View File

@@ -1,3 +1,4 @@
using AutoMapper;
using DMS.Application.DTOs;
using DMS.Application.Events;
using DMS.Application.Interfaces;
@@ -13,14 +14,16 @@ namespace DMS.Application.Services.Management;
/// </summary>
public class DeviceManagementService : IDeviceManagementService
{
private readonly IMapper _mapper;
private readonly IDeviceAppService _deviceAppService;
private readonly IAppStorageService _appStorageService;
private readonly IAppDataService _appDataService;
private readonly IEventService _eventService;
public DeviceManagementService(IDeviceAppService deviceAppService, IAppStorageService appStorageService, IEventService eventService)
public DeviceManagementService(IMapper mapper, IDeviceAppService deviceAppService, IAppDataService appStorageService, IEventService eventService)
{
_mapper = mapper;
_deviceAppService = deviceAppService;
_appStorageService = appStorageService;
_appDataService = appStorageService;
_eventService = eventService;
}
@@ -45,39 +48,58 @@ public class DeviceManagementService : IDeviceManagementService
/// </summary>
public async Task<CreateDeviceWithDetailsDto> CreateDeviceWithDetailsAsync(CreateDeviceWithDetailsDto dto)
{
var result = await _deviceAppService.CreateDeviceWithDetailsAsync(dto);
// 创建成功后，将设备添加到内存中
if (result?.Device != null)
{
if (_appStorageService.Devices.TryAdd(result.Device.Id, result.Device))
if (_appDataService.Devices.TryAdd(result.Device.Id, result.Device))
{
if (result.VariableTable is not null)
{
if (_appDataService.VariableTables.TryAdd(result.VariableTable.Id, result.VariableTable))
{
result.VariableTable.Device = result.Device;
//将默认变量表添加到设备中
result.Device.VariableTables.Add(result.VariableTable);
_eventService.RaiseVariableTableChanged(this, new VariableTableChangedEventArgs(DataChangeType.Added, result.VariableTable));
}
}
_eventService.RaiseDeviceChanged(this, new DeviceChangedEventArgs(DataChangeType.Added, result.Device));
}
if (result.VariableTable is not null)
{
if (_appStorageService.VariableTables.TryAdd(result.VariableTable.Id, result.VariableTable))
{
_eventService.RaiseVariableTableChanged(this, new VariableTableChangedEventArgs(DataChangeType.Added, result.VariableTable));
}
}
//关联菜单
if (result.DeviceMenu is not null)
{
_appStorageService.Menus.TryAdd(result.DeviceMenu.Id, result.DeviceMenu);
var deviceRootMenu = _appDataService.Menus.Values.FirstOrDefault(m => m.TargetViewKey == "DevicesViewModel" && m.TargetId == 0);
if (deviceRootMenu is not null)
{
_appDataService.Menus.TryAdd(result.DeviceMenu.Id, result.DeviceMenu);
//将设备菜单添加到根菜单中
deviceRootMenu.Children.Add(result.DeviceMenu);
if (result.VariableTableMenu is not null)
{
_appDataService.Menus.TryAdd(result.VariableTableMenu.Id, result.VariableTableMenu);
//将变量表菜单添加到设备菜单中
result.DeviceMenu.Children.Add(result.VariableTableMenu);
}
}
}
if (result.VariableTableMenu is not null)
{
_appStorageService.Menus.TryAdd(result.VariableTableMenu.Id, result.VariableTableMenu);
}
}
return result;
}
@@ -87,14 +109,19 @@ public class DeviceManagementService : IDeviceManagementService
public async Task<int> UpdateDeviceAsync(Device device)
{
var result = await _deviceAppService.UpdateDeviceAsync(device);
// 更新成功后，更新内存中的设备
if (result > 0 && device != null)
if (result > 0)
{
_appStorageService.Devices.AddOrUpdate(device.Id, device, (key, oldValue) => device);
var deviceMenu = _appDataService.Menus.Values.FirstOrDefault(m => m.MenuType == MenuType.DeviceMenu && m.TargetId == device.Id);
if (deviceMenu is not null && deviceMenu.Header != device.Name)
{
deviceMenu.Header = device.Name;
}
_eventService.RaiseDeviceChanged(this, new DeviceChangedEventArgs(DataChangeType.Updated, device));
}
return result;
}
@@ -104,28 +131,41 @@ public class DeviceManagementService : IDeviceManagementService
public async Task<bool> DeleteAsync(Device device)
{
var result = await _deviceAppService.DeleteAsync(device);
// 删除成功后，从内存中移除设备
if (result )
if (result)
{
if (_appStorageService.Devices.TryGetValue(device.Id, out var deviceInStorage))
if (_appDataService.Devices.TryGetValue(device.Id, out var deviceInStorage))
{
//删除设备的所有变量表和变量
foreach (var variableTable in deviceInStorage.VariableTables)
{
foreach (var variable in variableTable.Variables)
{
_appStorageService.Variables.TryRemove(variable.Id, out _);
_appDataService.Variables.TryRemove(variable.Id, out _);
}
_appStorageService.VariableTables.TryRemove(variableTable.Id, out _);
_appDataService.VariableTables.TryRemove(variableTable.Id, out _);
}
//删除菜单
var deviceMenu = _appDataService.Menus.Values.FirstOrDefault(m => m.MenuType == MenuType.DeviceMenu && m.TargetId == device.Id);
if (deviceMenu is not null)
{
foreach (var menu in deviceMenu.Children)
{
_appDataService.Menus.TryRemove(menu.Id, out _);
}
_appDataService.Menus.TryRemove(deviceMenu.Id, out _);
}
_appStorageService.Devices.TryRemove(device.Id, out _);
//删除设备
_appDataService.Devices.TryRemove(device.Id, out _);
_eventService.RaiseDeviceChanged(this, new DeviceChangedEventArgs(DataChangeType.Deleted, deviceInStorage));
}
}
return result;
}
@@ -135,12 +175,12 @@ public class DeviceManagementService : IDeviceManagementService
public async Task ToggleDeviceActiveStateAsync(int id)
{
await _deviceAppService.ToggleDeviceActiveStateAsync(id);
// 更新内存中的设备状态
var device = await _deviceAppService.GetDeviceByIdAsync(id);
if (device != null)
{
_appStorageService.Devices.AddOrUpdate(device.Id, device, (key, oldValue) => device);
_appDataService.Devices.AddOrUpdate(device.Id, device, (key, oldValue) => device);
_eventService.RaiseDeviceChanged(this, new DeviceChangedEventArgs(DataChangeType.Updated, device));
}
}
@@ -150,14 +190,14 @@ public class DeviceManagementService : IDeviceManagementService
/// </summary>
public async Task LoadAllDevicesAsync()
{
_appStorageService.Devices.Clear();
_appDataService.Devices.Clear();
var devices = await _deviceAppService.GetAllDevicesAsync();
// 建立设备与变量表的关联
foreach (var device in devices)
{
// 将设备添加到安全字典
_appStorageService.Devices.TryAdd(device.Id, device);
_appDataService.Devices.TryAdd(device.Id, device);
}
}