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-23 16:25:22 +08:00
parent 54d040b45f
commit 125348486a
15 changed files with 329 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,8 +49,6 @@ public class DeviceManagementService : IDeviceManagementService
public async Task<CreateDeviceWithDetailsDto> CreateDeviceWithDetailsAsync(CreateDeviceWithDetailsDto dto)
{
var result = await _deviceAppService.CreateDeviceWithDetailsAsync(dto);
// 创建成功后，将设备添加到内存中
@@ -71,29 +69,31 @@ public class DeviceManagementService : IDeviceManagementService
}
}
//关联菜单
if (result.DeviceMenu is not null)
{
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);
}
}
}
_eventService.RaiseDeviceChanged(this, new DeviceChangedEventArgs(DataChangeType.Added, result.Device));
}
//关联菜单
if (result.DeviceMenu is not null)
{
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);
}
}
}

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

@@ -56,7 +56,7 @@ public class MenuManagementService : IMenuManagementService
if (_appDataService.Menus.TryAdd(resMenu.Id, resMenu))
{
MenuBean parentMenu = null;
if (resMenu.ParentId > 0 && _appDataService.Menus.TryGetValue(resMenu.ParentId.Value, out var parent))
if (resMenu.ParentId > 0 && _appDataService.Menus.TryGetValue(resMenu.ParentId, out var parent))
{
parentMenu = parent;
parent.Children.Add(resMenu);
@@ -103,7 +103,7 @@ public class MenuManagementService : IMenuManagementService
if (_appDataService.Menus.TryRemove(menu.Id, out var menuData))
{
// 从父菜单中移除子菜单
if (menuData.ParentId > 0 && _appDataService.Menus.TryGetValue(menuData.ParentId.Value, out var parentMenu))
if (menuData.ParentId > 0 && _appDataService.Menus.TryGetValue(menuData.ParentId, out var parentMenu))
{
parentMenu.Children.Remove(menuData);
}

93
DMS.Application/Services/Management/VariableTableManagementService.cs
View File

@@ -50,36 +50,49 @@ public class VariableTableManagementService : IVariableTableManagementService
/// <summary>
/// 异步创建一个新变量表及其关联菜单（事务性操作）。
/// </summary>
public async Task<CreateVariableTableWithMenuDto> CreateVariableTableAsync(CreateVariableTableWithMenuDto dto)
public async Task<CreateVariableTableWithMenuDto> AddAsync(CreateVariableTableWithMenuDto dto)
{
var result = await _variableTableAppService.CreateVariableTableAsync(dto);
// 创建成功后，将变量表添加到内存中
if (result?.VariableTable != null)
var result = await _variableTableAppService.AddAsync(dto);
// 检查结果是否为空
if (result?.VariableTable is null)
{
// 添加null检查
if (_appDataService.Devices != null &&
_appDataService.Devices.TryGetValue(result.VariableTable.DeviceId, out var device))
{
// 确保VariableTables不为null
if (device.VariableTables == null)
device.VariableTables = new List<VariableTable>();
return null;
}
device.VariableTables.Add(result.VariableTable);
// 获取设备对象
if (!_appDataService.Devices.TryGetValue(result.VariableTable.DeviceId, out var device))
{
return null;
}
// 确保Device属性不为null
if (result.VariableTable != null)
result.VariableTable.Device = device;
}
// 将变量表添加到设备列表并设置设备引用
device.VariableTables.Add(result.VariableTable);
result.VariableTable.Device = device;
// 确保_variableTables和result.VariableTable不为null
if (_appDataService.VariableTables.TryAdd(result.VariableTable.Id, result.VariableTable))
{
_eventService.RaiseVariableTableChanged(this, new VariableTableChangedEventArgs(
// 尝试将变量表添加到内存中
if (!_appDataService.VariableTables.TryAdd(result.VariableTable.Id, result.VariableTable))
{
return null;
}
// 如果有菜单对象，则处理菜单相关逻辑
if (result.Menu is null) return null;
var deviceMenu = _appDataService.Menus.Values.FirstOrDefault(m => m.MenuType == MenuType.DeviceMenu && m.TargetId == device.Id);
if (deviceMenu is not null)
{
_appDataService.Menus.TryAdd(result.Menu.Id, result.Menu);
//将设备菜单添加到根菜单中
deviceMenu.Children.Add(result.Menu);
}
// 触发变量表变化事件
_eventService.RaiseVariableTableChanged(this, new VariableTableChangedEventArgs(
DataChangeType.Added,
result.VariableTable));
}
}
return result;
}
@@ -87,9 +100,9 @@ public class VariableTableManagementService : IVariableTableManagementService
/// <summary>
/// 异步更新一个已存在的变量表。
/// </summary>
public async Task<int> UpdateVariableTableAsync(VariableTable variableTable)
public async Task<int> UpdateAsync(VariableTable variableTable)
{
var result = await _variableTableAppService.UpdateVariableTableAsync(variableTable);
var result = await _variableTableAppService.UpdateAsync(variableTable);
// 更新成功后，更新内存中的变量表
if (result > 0 && variableTable != null)
@@ -106,25 +119,37 @@ public class VariableTableManagementService : IVariableTableManagementService
/// <summary>
/// 异步删除一个变量表。
/// </summary>
public async Task<bool> DeleteVariableTableAsync(int id)
public async Task<bool> DeleteAsync(VariableTable variableTable)
{
var result = await _variableTableAppService.DeleteVariableTableAsync(id);
var result = await _variableTableAppService.DeleteAsync(variableTable);
// 删除成功后，从内存中移除变量表
if (result )
if (result)
{
if (_appDataService.VariableTables.TryRemove(id, out var variableTable))
if (_appDataService.Devices.TryGetValue(variableTable.DeviceId, out var device))
{
if (variableTable != null && _appDataService.Devices.TryGetValue(variableTable.DeviceId, out var device))
device.VariableTables.Remove(variableTable);
_appDataService.VariableTables.TryRemove(variableTable.Id, out _);
//删除菜单
var variableTableMenu = _appDataService.Menus.Values.FirstOrDefault(m => m.MenuType == MenuType.VariableTableMenu && m.TargetId == variableTable.Id);
if (variableTableMenu is not null)
{
if (device.VariableTables != null)
device.VariableTables.Remove(variableTable);
if (_appDataService.Menus.TryGetValue(variableTableMenu.ParentId, out var deviceMenu))
{
deviceMenu.Children.Remove(variableTableMenu);
}
_appDataService.Menus.TryRemove(variableTableMenu.Id, out _);
}
_eventService.RaiseVariableTableChanged(this, new VariableTableChangedEventArgs(
DataChangeType.Deleted,
variableTable));
}
_eventService.RaiseVariableTableChanged(this, new VariableTableChangedEventArgs(
DataChangeType.Deleted,
variableTable));
}
return result;