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

重构了代码

Browse Source
This commit is contained in:
David P.G
2025-07-02 22:07:16 +08:00
parent 31f6cf64f4
commit b6519ae0b1
16 changed files with 326 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

136
ViewModels/DevicesViewModel.cs
View File

@@ -2,6 +2,7 @@
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using Microsoft.Extensions.Logging;
using PMSWPF.Data;
using PMSWPF.Data.Repositories;
using PMSWPF.Enums;
using PMSWPF.Helper;
@@ -21,12 +22,14 @@ public partial class DevicesViewModel : ViewModelBase
[ObservableProperty] private ObservableCollection<Device> _devices;
[ObservableProperty] private Device _selectedDevice;
private readonly MenuRepository _menuRepository;
private readonly VarTableRepository _varTableRepository;
public DevicesViewModel(
ILogger<DevicesViewModel> logger, IDialogService dialogService, DataServices dataServices
)
{
_deviceRepository = new DeviceRepository();
_varTableRepository = new VarTableRepository();
_menuRepository = new MenuRepository();
_logger = logger;
_dialogService = dialogService;
@@ -36,89 +39,13 @@ public partial class DevicesViewModel : ViewModelBase
_dataServices.OnDeviceListChanged += (devices) => { Devices = new ObservableCollection<Device>(devices); };
}
// /// <summary>
// /// 添加设备
// /// </summary>
// [RelayCommand]
// public async void AddDevice()
// {
// Device device = null;
// try
// {
// device = await _dialogService.ShowAddDeviceDialog();
// if (device != null)
// {
// device = await _deviceRepository.Add(device);
// if (device != null)
// {
// var msg = $"添加设备成功：{device.Name}";
// _logger.LogInformation(msg);
//
// bool addMenuRes = await _menuRepository.AddDeviceMenu(device);
// if (addMenuRes)
// {
// // 通知更新菜单
// MessageHelper.SendLoadMessage(LoadTypes.Menu);
// MessageHelper.SendLoadMessage(LoadTypes.Devices);
// NotificationHelper.ShowMessage(msg, NotificationType.Success);
// }
// else
// {
// var msgerr = $"给设备添加菜单失败：{device.Name}";
// _logger.LogInformation(msgerr);
// NotificationHelper.ShowMessage(msgerr, NotificationType.Error);
// }
// }
// else
// {
// var msg = $"添加设备失败：{device.Name}";
// _logger.LogInformation(msg);
// NotificationHelper.ShowMessage(msg, NotificationType.Error);
// }
// }
// }
// catch (Exception e)
// {
// var msg = $"添加设备失败：{e.Message}";
// _logger.LogError(msg);
// NotificationHelper.ShowMessage(msg, NotificationType.Error);
// }
// }
/// <summary>
/// 辅助方法：处理成功通知和日志
/// </summary>
private void HandleOperationSuccess(string entityType, string operation, string entityName)
{
var message = $"{entityType}{operation}成功：{entityName}";
_logger.LogInformation(message);
NotificationHelper.ShowMessage(message, NotificationType.Success);
}
/// <summary>
/// 辅助方法：处理失败通知和日志
/// </summary>
private void HandleOperationFailure(string entityType, string operation, string entityName, Exception ex = null)
{
var message = $"{entityType}{operation}失败：{entityName}";
if (ex != null)
{
_logger.LogError(ex, message);
}
else
{
_logger.LogError(message);
}
NotificationHelper.ShowMessage(message, NotificationType.Error);
}
/// <summary>
/// 添加设备
/// </summary>
[RelayCommand]
public async void AddDevice()
{
try
/// 添加设备
/// </summary>
[RelayCommand]
public async void AddDevice()
{
// 1. 显示添加设备对话框
var device = await _dialogService.ShowAddDeviceDialog();
@@ -128,43 +55,8 @@ public async void AddDevice()
_logger.LogInformation("用户取消了添加设备操作。");
return;
}
// 2. 将设备添加到数据库
var addedDevice = await _deviceRepository.Add(device);
// 如果数据库添加失败
if (addedDevice == null)
{
HandleOperationFailure("设备", "添加", device.Name);
return; // 提前返回
}
// 3. 设备成功添加到数据库，进行菜单添加
// 这里立即发出成功的通知和日志
HandleOperationSuccess("设备", "添加", addedDevice.Name);
// 4. 为新设备添加菜单
bool menuAddedSuccessfully = await _menuRepository.AddDeviceMenu(addedDevice);
if (menuAddedSuccessfully)
{
// 菜单也添加成功，通知 UI 更新
MessageHelper.SendLoadMessage(LoadTypes.Menu);
MessageHelper.SendLoadMessage(LoadTypes.Devices);
}
else
{
// 菜单添加失败，通知用户并记录日志
HandleOperationFailure("设备", "添加菜单", addedDevice.Name);
// 考虑：如果菜单添加失败，是否需要回滚设备添加？
// 例如：await _deviceRepository.Delete(addedDevice.Id);
}
await _deviceRepository.AddDeviceAndMenu(device);
}
catch (Exception e)
{
// 捕获并记录所有未预期的异常
_logger.LogError(e, "在添加设备过程中发生未预期错误。");
NotificationHelper.ShowMessage($"添加设备失败：{e.Message}", NotificationType.Error);
}
}
/// <summary>
@@ -183,12 +75,12 @@ public async void AddDevice()
var editDievce = await _dialogService.ShowEditDeviceDialog(SelectedDevice);
if (editDievce != null)
{
{
// 更新菜单
var res = await _deviceRepository.Edit(editDievce);
var menu = DataServicesHelper.FindMenusForDevice(editDievce, _dataServices.MenuTrees);
if (menu != null)
await _menuRepository.Edit(menu);
await _menuRepository.Edit(menu);
MessageHelper.SendLoadMessage(LoadTypes.Menu);
MessageHelper.SendLoadMessage(LoadTypes.Devices);
@@ -222,7 +114,7 @@ public async void AddDevice()
var menu = DataServicesHelper.FindMenusForDevice(SelectedDevice, _dataServices.MenuTrees);
if (menu != null)
await _menuRepository.DeleteMenu(menu);
MessageHelper.SendLoadMessage(LoadTypes.Menu);
MessageHelper.SendLoadMessage(LoadTypes.Devices);
NotificationHelper.ShowMessage($"删除设备成功,设备名：{SelectedDevice.Name}", NotificationType.Success);
@@ -234,8 +126,4 @@ public async void AddDevice()
_logger.LogError($"删除设备的过程中发生错误：{e}");
}
}
}

1
ViewModels/MainViewModel.cs
View File

@@ -77,6 +77,7 @@ public partial class MainViewModel : ViewModelBase
break;
case MenuType.AddVariableTableMenu:
await AddVariableTable(menu);
break;
}

4
ViewModels/VariableTableViewModel.cs
View File

@@ -12,7 +12,7 @@ partial class VariableTableViewModel : ViewModelBase
{
// private readonly ILogger<VariableTableViewModel> _logger;
[ObservableProperty] private VariableTable variableTable;
[ObservableProperty] private ObservableCollection<DataVariable> _dataVariables;
[ObservableProperty] private ObservableCollection<VariableData> _dataVariables;
/// <summary>
/// 是否是第一次加载,防止ToggleSwitch第一次加载触发改变事件
@@ -35,7 +35,7 @@ partial class VariableTableViewModel : ViewModelBase
if (VariableTable.DataVariables != null)
{
DataVariables = new ObservableCollection<DataVariable>(VariableTable.DataVariables);
DataVariables = new ObservableCollection<VariableData>(VariableTable.DataVariables);
}
IsLoadCompletion = true;
}