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

112
DMS.WPF/ViewModels/DeviceDetailViewModel.cs
View File

@@ -22,6 +22,7 @@ public partial class DeviceDetailViewModel : ViewModelBase
private readonly IDialogService _dialogService;
private readonly IViewDataService _viewDataService;
private readonly INavigationService _navigationService;
private readonly IVariableTableViewService _variableTableViewService;
private readonly IViewCenterService _wpfDataService;
[ObservableProperty]
@@ -38,57 +39,49 @@ public partial class DeviceDetailViewModel : ViewModelBase
public DeviceDetailViewModel(IMapper mapper, IDialogService dialogService, IViewDataService dataStorageService,
INavigationService navigationService,
IViewCenterService wpfDataService, INotificationService notificationService)
IVariableTableViewService variableTableViewService, INotificationService notificationService)
{
_mapper = mapper;
_dialogService = dialogService;
_viewDataService = dataStorageService;
_navigationService = navigationService;
_variableTableViewService = variableTableViewService;
_notificationService = notificationService;
_wpfDataService = wpfDataService;
}
[RelayCommand]
private async Task AddVariableTable()
private async Task AddVariableTable(DeviceItem deviceItem = null)
{
if (IsBusy) return;
IsBusy = true;
try
{
VariableTableDialogViewModel variableTableDialogViewModel = new VariableTableDialogViewModel()
{
PrimaryButText = "添加变量表"
};
// 1. 显示添加设备对话框
var VariableTableItem = await _dialogService.ShowDialogAsync(variableTableDialogViewModel);
// 如果用户取消或对话框未返回设备，则直接返回
if (VariableTableItem == null)
if (deviceItem is null)
{
return;
deviceItem = CurrentDevice;
}
VariableTableItem.DeviceId = CurrentDevice.Id;
var tableMenu = new MenuBean()
{
Header = VariableTableItem.Name,
Icon = SegoeFluentIcons.DataSense.Glyph,
TargetViewKey = nameof(VariableTableViewModel)
};
int addVarTableId = await _wpfDataService.VariableTableDataService.AddVariableTable(
_mapper.Map<VariableTable>(VariableTableItem),
tableMenu, true);
if (addVarTableId > 0)
VariableTableDialogViewModel variableTableDialogViewModel = new VariableTableDialogViewModel()
{
VariableTableItem.Id = addVarTableId;
VariableTableItem.Device = CurrentDevice;
CurrentDevice.VariableTables.Add(VariableTableItem);
_viewDataService.VariableTables.Add(VariableTableItem.Id, VariableTableItem);
_notificationService.ShowSuccess($"添加变量表成功：{VariableTableItem.Name}");
PrimaryButText = "添加变量表"
};
// 1. 显示添加设备对话框
var variableTableItem = await _dialogService.ShowDialogAsync(variableTableDialogViewModel);
// 如果用户取消或对话框未返回设备，则直接返回
if (variableTableItem is null) return;
variableTableItem.DeviceId = deviceItem.Id;
variableTableItem.Device = deviceItem;
variableTableItem.Protocol = deviceItem.Protocol;
var res = await _variableTableViewService.AddAsync(variableTableItem);
if (res)
{
_notificationService.ShowSuccess($"添加变量表成功：{variableTableItem.Name}");
}
else
{
_notificationService.ShowError($"添加变量表失败：{VariableTableItem.Name}！！");
_notificationService.ShowError($"添加变量表失败：{variableTableItem.Name}！！");
}
}
catch (Exception ex)
@@ -116,19 +109,16 @@ public partial class DeviceDetailViewModel : ViewModelBase
VariableTableDialogViewModel variableTableDialogViewModel
= new VariableTableDialogViewModel(SelectedVariableTable)
{
PrimaryButText = "编辑变量表"
};
{
PrimaryButText = "编辑变量表"
};
// 1. 显示变量表对话框
VariableTableItem variableTable
= await _dialogService.ShowDialogAsync(variableTableDialogViewModel);
// 如果用户取消或对话框未返回变量表，则直接返回
if (variableTable == null)
{
return;
}
if (variableTable is null) return;
if (await _wpfDataService.VariableDataService.UpdateVariableTable(variableTable))
if (await _variableTableViewService.UpdateAsync(variableTable))
{
_notificationService.ShowSuccess($"编辑变量表成功：{variableTable.Name}");
}
@@ -148,40 +138,35 @@ public partial class DeviceDetailViewModel : ViewModelBase
}
[RelayCommand]
private async Task DeleteVariableTable()
private async Task DeleteVariableTable(VariableTableItem variableTableItem=null)
{
if (IsBusy) return;
IsBusy = true;
try
{
if (SelectedVariableTable == null)
if (variableTableItem is null)
{
_notificationService.ShowError("你没有选择任何变量表，请选择变量表后再点击删除变量表");
return;
if (SelectedVariableTable is null)
{
_notificationService.ShowError("你没有选择任何变量表，请选择变量表后再点击删除变量表");
return;
}
variableTableItem = SelectedVariableTable;
}
string message = $"确认要删除变量表名为:{SelectedVariableTable.Name} \n\n此操作将同时删除该变量表下的所有变量数据，且无法恢复！";
string message = $"确认要删除变量表名为:{variableTableItem.Name} \n\n此操作将同时删除该变量表下的所有变量数据，且无法恢复！";
ConfirmDialogViewModel viewModel = new ConfirmDialogViewModel("删除变量表", message, "删除");
if (await _dialogService.ShowDialogAsync(viewModel))
bool confirmRes = await _dialogService.ShowDialogAsync(viewModel);
if (!confirmRes) return;
var tableName = variableTableItem.Name;
if (await _variableTableViewService.DeleteAsync(variableTableItem))
{
var tableName = SelectedVariableTable.Name;
if (await _wpfDataService.VariableDataService.DeleteVariableTable(SelectedVariableTable, true))
{
if (SelectedVariableTable.Device != null)
{
if (_viewDataService.Devices.TryGetValue(SelectedVariableTable.DeviceId ,out var device))
{
device.VariableTables.Remove(SelectedVariableTable);
}
_viewDataService.VariableTables.Remove(SelectedVariableTable.Id);
SelectedVariableTable.Device.VariableTables.Remove(SelectedVariableTable);
}
_notificationService.ShowSuccess($"变量表：{tableName},删除成功。");
}
else
{
_notificationService.ShowError($"变量表：{tableName},删除失败!!!");
}
_notificationService.ShowSuccess($"变量表：{tableName},删除成功。");
}
else
{
_notificationService.ShowError($"变量表：{tableName},删除失败!!!");
}
}
catch (Exception e)
@@ -207,9 +192,6 @@ public partial class DeviceDetailViewModel : ViewModelBase
public void NavigateToVariableTable()
{
if (SelectedVariableTable == null) return;
// var menu = _viewCenterService.Menus.FirstOrDefault(m => m.MenuType == MenuType.VariableTableMenu &&
// m.TargetId == SelectedVariableTable.Id);
// if (menu == null) return;
_navigationService.NavigateToAsync(
this,
new NavigationParameter(nameof(VariableTableViewModel), SelectedVariableTable.Id,

166
DMS.WPF/ViewModels/DevicesViewModel.cs
View File

@@ -1,5 +1,4 @@
using System.Collections.ObjectModel;
using AutoMapper;
using AutoMapper;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using DMS.Application.DTOs;
@@ -7,12 +6,15 @@ using DMS.Application.Interfaces;
using DMS.Application.Interfaces.Database;
using DMS.Core.Enums;
using DMS.Core.Models;
using DMS.Infrastructure.Entities;
using DMS.WPF.Interfaces;
using DMS.WPF.ItemViewModel;
using DMS.WPF.Services;
using DMS.WPF.ViewModels.Dialogs;
using DMS.WPF.ItemViewModel;
using iNKORE.UI.WPF.Modern.Common.IconKeys;
using Microsoft.Extensions.DependencyInjection;
using ObservableCollections;
using System.Collections.ObjectModel;
namespace DMS.WPF.ViewModels;
@@ -80,10 +82,10 @@ public partial class DevicesViewModel : ViewModelBase, INavigatable
{
// 1. 显示添加设备对话框
DeviceItem device = await _dialogService.ShowDialogAsync(new DeviceDialogViewModel()
{
Title = "添加设备",
PrimaryButText = "添加设备"
});
{
Title = "添加设备",
PrimaryButText = "添加设备"
});
// 如果用户取消或对话框未返回设备，则直接返回
if (device == null)
{
@@ -105,26 +107,26 @@ public partial class DevicesViewModel : ViewModelBase, INavigatable
dto.DeviceMenu = new MenuBean()
{
Header = device.Name,
Icon = SegoeFluentIcons.Devices2.Glyph,
TargetViewKey = nameof(DeviceDetailViewModel),
};
{
Header = device.Name,
Icon = SegoeFluentIcons.Devices2.Glyph,
TargetViewKey = nameof(DeviceDetailViewModel),
};
if (device.IsAddDefVarTable)
{
dto.VariableTable = new VariableTable()
{
Name = "默认变量表",
Description = "默认变量表",
IsActive = true
};
{
Name = "默认变量表",
Description = "默认变量表",
IsActive = true
};
dto.VariableTableMenu = new MenuBean()
{
Header = dto.VariableTable.Name,
Icon = SegoeFluentIcons.DataSense.Glyph,
TargetViewKey = nameof(VariableTableViewModel)
};
{
Header = dto.VariableTable.Name,
Icon = SegoeFluentIcons.DataSense.Glyph,
TargetViewKey = nameof(VariableTableViewModel)
};
}
@@ -138,7 +140,7 @@ public partial class DevicesViewModel : ViewModelBase, INavigatable
if (addDto != null && addDto.Device != null && _notificationService != null)
{
_notificationService.ShowSuccess($"设备添加成功：{addDto.Device.Name}");
}
else if (_notificationService != null)
{
@@ -203,7 +205,7 @@ public partial class DevicesViewModel : ViewModelBase, INavigatable
{
try
{
if (SelectedDevice == null)
{
_notificationService.ShowError("你没有选择任何设备，请选择设备后再点击编辑设备");
@@ -211,9 +213,9 @@ public partial class DevicesViewModel : ViewModelBase, INavigatable
}
DeviceDialogViewModel deviceDialogViewModel = new DeviceDialogViewModel(SelectedDevice)
{
PrimaryButText = "编辑设备"
};
{
PrimaryButText = "编辑设备"
};
// 1. 显示设备对话框
DeviceItem device = await _dialogService.ShowDialogAsync(deviceDialogViewModel);
// 如果用户取消或对话框未返回设备，则直接返回
@@ -238,60 +240,26 @@ public partial class DevicesViewModel : ViewModelBase, INavigatable
{
if (SelectedDevice == null) return;
_navigationService.NavigateToAsync(this,new NavigationParameter(nameof(DeviceDetailViewModel),SelectedDevice.Id,NavigationType.Device));
_navigationService.NavigateToAsync(this, new NavigationParameter(nameof(DeviceDetailViewModel), SelectedDevice.Id, NavigationType.Device));
}
[RelayCommand]
private async Task AddVariableTable(DeviceItem device)
{
if (device == null) return;
try
{
VariableTableDialogViewModel variableTableDialogViewModel = new VariableTableDialogViewModel()
{
PrimaryButText = "添加变量表"
};
// 显示添加变量表对话框
var VariableTableItem = await _dialogService.ShowDialogAsync(variableTableDialogViewModel);
// 如果用户取消或对话框未返回变量表，则直接返回
if (VariableTableItem == null)
{
return;
}
if (device is null) return;
DeviceDetailViewModel deviceDetailViewModel = App.Current.Services.GetRequiredService<DeviceDetailViewModel>();
if (deviceDetailViewModel is null) return;
deviceDetailViewModel.AddVariableTableCommand.Execute(device);
VariableTableItem.DeviceId = device.Id;
var tableMenu = new MenuBean()
{
Header = VariableTableItem.Name,
Icon = SegoeFluentIcons.DataSense.Glyph,
TargetViewKey = nameof(VariableTableViewModel)
};
int addVarTableId = await _wpfDataService.VariableTableDataService.AddVariableTable(
_mapper.Map<VariableTable>(VariableTableItem),
tableMenu, true);
if (addVarTableId > 0)
{
VariableTableItem.Id = addVarTableId;
if (_viewDataService.Devices.TryGetValue(VariableTableItem.DeviceId, out var deviceModel))
{
VariableTableItem.Device = deviceModel;
deviceModel.VariableTables.Add(VariableTableItem);
_viewDataService.VariableTables.Add(VariableTableItem.Id, VariableTableItem);
}
_notificationService.ShowSuccess($"添加变量表成功：{VariableTableItem.Name}");
}
else
{
_notificationService.ShowError($"添加变量表失败：{VariableTableItem.Name}！！");
}
}
catch (Exception ex)
catch (Exception e)
{
_notificationService.ShowError($"添加变量表时发生错误: {ex.Message}", ex);
_notificationService.ShowError($"添加变量表的过程中发生错误：{e.Message}", e);
}
}
[RelayCommand]
@@ -305,33 +273,9 @@ public partial class DevicesViewModel : ViewModelBase, INavigatable
try
{
VariableTableDialogViewModel variableTableDialogViewModel
= new VariableTableDialogViewModel(variableTable)
{
PrimaryButText = "编辑变量表"
};
// 显示变量表对话框
VariableTableItem updatedVariableTable
= await _dialogService.ShowDialogAsync(variableTableDialogViewModel);
// 如果用户取消或对话框未返回变量表，则直接返回
if (updatedVariableTable == null)
{
return;
}
if (await _wpfDataService.VariableDataService.UpdateVariableTable(updatedVariableTable))
{
_notificationService.ShowSuccess($"编辑变量表成功：{updatedVariableTable.Name}");
// Update the properties in the original variable table
variableTable.Name = updatedVariableTable.Name;
variableTable.Description = updatedVariableTable.Description;
variableTable.IsActive = updatedVariableTable.IsActive;
}
else
{
_notificationService.ShowError($"编辑变量表失败：{updatedVariableTable.Name}");
}
DeviceDetailViewModel deviceDetailViewModel = App.Current.Services.GetRequiredService<DeviceDetailViewModel>();
if (deviceDetailViewModel is null) return;
deviceDetailViewModel.EditVariableTableCommand.Execute(variableTable);
}
catch (Exception e)
{
@@ -342,7 +286,7 @@ public partial class DevicesViewModel : ViewModelBase, INavigatable
[RelayCommand]
private async Task DeleteVariableTable(VariableTableItem variableTable)
{
if (variableTable == null)
if (variableTable is null)
{
_notificationService.ShowError("你没有选择任何变量表，请选择变量表后再点击删除变量表");
return;
@@ -350,31 +294,9 @@ public partial class DevicesViewModel : ViewModelBase, INavigatable
try
{
string message = $"确认要删除变量表名为:{variableTable.Name} \n\n此操作将同时删除该变量表下的所有变量数据，且无法恢复！";
ConfirmDialogViewModel viewModel = new ConfirmDialogViewModel("删除变量表", message, "删除");
if (await _dialogService.ShowDialogAsync(viewModel))
{
var tableName = variableTable.Name;
if (await _wpfDataService.VariableDataService.DeleteVariableTable(variableTable, true))
{
// Remove from parent device's collection
if (variableTable.Device != null)
{
if (_viewDataService.Devices.TryGetValue(variableTable.DeviceId ,out var device))
{
device.VariableTables.Remove(variableTable);
}
_viewDataService.VariableTables.Remove(variableTable.Id);
variableTable.Device.VariableTables.Remove(variableTable);
}
_notificationService.ShowSuccess($"变量表：{tableName},删除成功。");
}
else
{
_notificationService.ShowError($"变量表：{tableName},删除失败!!!");
}
}
DeviceDetailViewModel deviceDetailViewModel = App.Current.Services.GetRequiredService<DeviceDetailViewModel>();
if (deviceDetailViewModel is null) return;
deviceDetailViewModel.DeleteVariableTableCommand.Execute(variableTable);
}
catch (Exception e)
{