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

1 feat: 实现触发器-菜单联动功能和事件系统

Browse Source 
2
    3 - 实现触发器与菜单联动功能，现在可以同时创建触发器及其关联的菜单项
    4 - 添加触发器更改事件系统，用于通知UI和其他组件触发器状态的变化
    5 - 优化触发器管理服务，改进了添加、修改和删除触发器的逻辑
    6 - 将CreateTriggerAsync方法重命名为AddTriggerAsync，使其语义更准确
    7 - 修改UpdateTriggerAsync方法的参数和返回值类型，提高一致性
    8 - 添加CreateTriggerWithMenuAsync方法用于同时创建触发器和菜单
    9 - 在应用层重构触发器管理逻辑，增加事务支持确保数据一致性
   10 - 更新菜单管理服务，改进并发安全处理
   11 - 调整数据存储服务，使其同步触发器和菜单更新
   12 - 更新触发器对话框和列表视图模型，提升用户体验
   13 - 在依赖注入容器中注册触发器服务
   14 - 修复设备数据服务中的异步调用问题，确保菜单项的正确处理
   15 - 添加缺失的触发器项映射配置
   16 - 创建TriggerChangedEventArgs类处理触发器更改事件
This commit is contained in:
David P.G
2025-10-19 20:34:20 +08:00
parent 0007235171
commit 958593b35d
17 changed files with 362 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
DMS.WPF/App.xaml.cs
View File

@@ -268,6 +268,7 @@ public partial class App : System.Windows.Application
services.AddSingleton<IMqttAliasAppService, MqttAliasAppService>();
services.AddSingleton<IMqttAliasManagementService, MqttAliasManagementService>();
services.AddSingleton<ILogManagementService, LogManagementService>();
services.AddSingleton<ITriggerAppService, TriggerAppService>(); // 注册触发器应用服务
services.AddSingleton<ITriggerManagementService, TriggerManagementService>(); // 注册触发器管理服务
services.AddSingleton<ITriggerEvaluationService, TriggerEvaluationService>(); // 注册触发器评估服务
services.AddSingleton<ITriggerActionExecutor, TriggerActionExecutor>(); // 注册触发器动作执行器

2
DMS.WPF/Interfaces/IMenuDataService.cs
View File

@@ -21,5 +21,5 @@ public interface IMenuDataService
Task DeleteMenuItem(MenuItem? MenuItem);
void LoadAllMenus();
Task UpdateMenuItem(MenuItem MenuItem);
}

2
DMS.WPF/Interfaces/ITriggerDataService.cs
View File

@@ -22,7 +22,7 @@ public interface ITriggerDataService
/// <summary>
/// 添加触发器及其关联菜单。
/// </summary>
Task<CreateTriggerWithMenuDto> AddTriggerWithMenu(CreateTriggerWithMenuDto dto);
Task<CreateTriggerWithMenuDto> CreateTriggerWithMenu(CreateTriggerWithMenuDto dto);
/// <summary>
/// 删除触发器。

1
DMS.WPF/Profiles/MappingProfile.cs
View File

@@ -38,6 +38,7 @@ namespace DMS.WPF.Profiles
CreateMap<Variable, VariableItem>()
.ReverseMap();
CreateMap<NlogDto, NlogItem>().ReverseMap();
CreateMap<TriggerItem, TriggerItem>().ReverseMap();
// 添加触发器相关映射
CreateMap<TriggerItem, Core.Models.Triggers.Trigger>()

6
DMS.WPF/Services/DeviceDataService.cs
View File

@@ -111,7 +111,7 @@ public class DeviceDataService : IDeviceDataService
// 给界面添加设备菜单
if (addDto.DeviceMenu != null)
{
_menuDataService.AddMenuItem(_mapper.Map<MenuItem>(addDto.DeviceMenu));
await _menuDataService.AddMenuItem(_mapper.Map<MenuItem>(addDto.DeviceMenu));
}
@@ -124,7 +124,7 @@ public class DeviceDataService : IDeviceDataService
if (addDto.VariableTable != null && addDto.VariableTableMenu != null)
{
_menuDataService.AddMenuItem(_mapper.Map<MenuItem>(addDto.VariableTableMenu));
await _menuDataService.AddMenuItem(_mapper.Map<MenuItem>(addDto.VariableTableMenu));
}
@@ -158,7 +158,7 @@ public class DeviceDataService : IDeviceDataService
var deviceMenu= _dataStorageService.Menus.FirstOrDefault(m => m.MenuType == MenuType.DeviceMenu && m.TargetId == device.Id);
if (deviceMenu != null)
{
_menuDataService.DeleteMenuItem(deviceMenu);
await _menuDataService.DeleteMenuItem(deviceMenu);
}
_dataStorageService.Devices.Remove(device.Id);

32
DMS.WPF/Services/MenuDataService.cs
View File

@@ -27,7 +27,7 @@ public class MenuDataService : IMenuDataService
/// </summary>
/// <param name="mapper">AutoMapper 实例。</param>
/// <param name="appStorageService">数据服务中心实例。</param>
public MenuDataService(IMapper mapper,IDataStorageService dataStorageService, IAppStorageService appStorageService,IMenuManagementService menuManagementService)
public MenuDataService(IMapper mapper, IDataStorageService dataStorageService, IAppStorageService appStorageService, IMenuManagementService menuManagementService)
{
_mapper = mapper;
_dataStorageService = dataStorageService;
@@ -79,15 +79,35 @@ public class MenuDataService : IMenuDataService
if (deviceMenu is not null)
{
var menuId= await _menuManagementService.CreateMenuAsync(_mapper.Map<MenuBean>(MenuItem));
if (menuId>0)
var menuId = await _menuManagementService.CreateMenuAsync(_mapper.Map<MenuBean>(MenuItem));
if (menuId > 0)
{
MenuItem.Id = menuId;
deviceMenu.Children.Add(MenuItem);
_dataStorageService.Menus.Add(MenuItem);
BuildMenuTrees();
}
}
}
/// <summary>
/// 更新菜单项。
/// </summary>
public async Task UpdateMenuItem(MenuItem MenuItem)
{
if (MenuItem is null) return;
var menu = _dataStorageService.Menus.FirstOrDefault(m => m.Id == MenuItem.Id);
if (menu is not null)
{
var res = await _menuManagementService.UpdateMenuAsync(_mapper.Map<MenuBean>(MenuItem));
if (res > 0)
{
menu.Header = MenuItem.Header;
}
}
}
@@ -99,8 +119,8 @@ public class MenuDataService : IMenuDataService
{
if (MenuItem is null) return;
await _menuManagementService.DeleteMenuAsync(MenuItem.Id);
await _menuManagementService.DeleteMenuAsync(MenuItem.Id);
// 从扁平菜单列表中移除
_dataStorageService.Menus.Remove(MenuItem);

119
DMS.WPF/Services/TriggerDataService.cs
View File

@@ -4,10 +4,15 @@ using DMS.Application.Interfaces;
using DMS.Application.Services;
using DMS.Core.Enums;
using DMS.Core.Events;
using DMS.Core.Models;
using DMS.Core.Models.Triggers;
using DMS.WPF.Interfaces;
using DMS.WPF.ItemViewModel;
using DMS.WPF.ViewModels;
using HandyControl.Data;
using Opc.Ua;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Threading;
namespace DMS.WPF.Services;
@@ -19,6 +24,7 @@ public class TriggerDataService : ITriggerDataService
{
private readonly IMapper _mapper;
private readonly IAppCenterService _appCenterService;
private readonly IMenuDataService _menuDataService;
private readonly IAppStorageService _appStorageService;
private readonly IDataStorageService _dataStorageService;
private readonly IEventService _eventService;
@@ -35,11 +41,13 @@ public class TriggerDataService : ITriggerDataService
/// <param name="eventService">事件服务实例。</param>
/// <param name="notificationService">通知服务实例。</param>
public TriggerDataService(IMapper mapper, IAppCenterService appCenterService,
IMenuDataService menuDataService,
IAppStorageService appStorageService, IDataStorageService dataStorageService,
IEventService eventService, INotificationService notificationService)
{
_mapper = mapper;
_appCenterService = appCenterService;
_menuDataService = menuDataService;
_appStorageService = appStorageService;
_dataStorageService = dataStorageService;
_eventService = eventService;
@@ -65,22 +73,39 @@ public class TriggerDataService : ITriggerDataService
public async Task<TriggerItem> AddTrigger(TriggerItem triggerItem)
{
// 添加null检查
if (triggerItem == null)
return null;
if (triggerItem is null) return null;
var addDto
= await _appCenterService.TriggerManagementService.CreateTriggerAsync(
_mapper.Map<Trigger>(triggerItem));
= await _appCenterService.TriggerManagementService.AddTriggerAsync(
_mapper.Map<Core.Models.Triggers.Trigger>(triggerItem));
// 添加null检查
if (addDto == null)
{
return null;
}
if (addDto is null) return null;
// 给界面添加触发器
var addItem = _mapper.Map<TriggerItem>(addDto);
_dataStorageService.Triggers.Add(addDto.Id, addItem);
var addItem = _mapper.Map(addDto, triggerItem);
_dataStorageService.Triggers.Add(triggerItem.Id, triggerItem);
//添加菜单
var parentMenu=_dataStorageService.Menus.FirstOrDefault(m => m.TargetViewKey == nameof(TriggersViewModel) && m.TargetId == 0);
if (parentMenu is not null)
{
var menuItem = new ItemViewModel.MenuItem()
{
Header = triggerItem.Name,
ParentId=parentMenu.Id,
MenuType=MenuType.TriggerMenu,
TargetId=addItem.Id,
Icon = "\uE945", // 使用触发器图标
TargetViewKey = nameof(TriggerDetailViewModel),
};
await _menuDataService.AddMenuItem(menuItem);
}
return addItem;
}
@@ -91,21 +116,27 @@ public class TriggerDataService : ITriggerDataService
public async Task<bool> DeleteTrigger(TriggerItem trigger)
{
// 从数据库删除触发器数据
if (!await _appCenterService.TriggerManagementService.DeleteTriggerAsync(trigger.Id))
if (await _appCenterService.TriggerManagementService.DeleteTriggerAsync(trigger.Id))
{
return false;
//删除菜单
var menu=_dataStorageService.Menus.FirstOrDefault(m => m.MenuType == MenuType.TriggerMenu && m.TargetId == trigger.Id);
if (menu is not null)
{
await _menuDataService.DeleteMenuItem(menu);
}
// 从界面删除触发器
_dataStorageService.Triggers.Remove(trigger.Id);
return true;
}
// 从界面删除触发器
_dataStorageService.Triggers.Remove(trigger.Id);
return true;
return false;
}
/// <summary>
/// 添加触发器及其关联菜单。
/// </summary>
public async Task<CreateTriggerWithMenuDto> AddTriggerWithMenu(CreateTriggerWithMenuDto dto)
public async Task<CreateTriggerWithMenuDto> CreateTriggerWithMenu(CreateTriggerWithMenuDto dto)
{
// 添加null检查
if (dto == null || dto.Trigger == null)
@@ -114,26 +145,16 @@ public class TriggerDataService : ITriggerDataService
try
{
// 首先添加触发器
var createdTrigger = await _appCenterService.TriggerManagementService.CreateTriggerAsync(dto.Trigger);
var createdTrigger = await _appCenterService.TriggerManagementService.CreateTriggerWithMenuAsync(dto);
if (createdTrigger == null)
return null;
var parentMenu=_appStorageService.Menus.Values.OrderBy(m=>m.Id).FirstOrDefault(m=>m.MenuType==MenuType.TriggerMenu);
if (parentMenu is not null)
{
// 将菜单关联到触发器
dto.TriggerMenu.TargetId = createdTrigger.Id;
dto.TriggerMenu.MenuType = MenuType.TriggerMenu;
}
// 添加到UI数据存储
var addItem = _mapper.Map<TriggerItem>(createdTrigger);
_dataStorageService.Triggers.Add(createdTrigger.Id, addItem);
var addItem = _mapper.Map<TriggerItem>(createdTrigger.Trigger);
_dataStorageService.Triggers.Add(addItem.Id, addItem);
return dto;
}
@@ -147,18 +168,34 @@ public class TriggerDataService : ITriggerDataService
/// <summary>
/// 更新触发器。
/// </summary>
public async Task<bool> UpdateTrigger(TriggerItem trigger)
public async Task<bool> UpdateTrigger(TriggerItem triggerItem)
{
if (!_appStorageService.Triggers.TryGetValue(trigger.Id, out var triggerDto))
if (_appStorageService.Triggers.TryGetValue(triggerItem.Id, out var triggerDto))
{
return false;
_mapper.Map(triggerItem, triggerDto);
if (await _appCenterService.TriggerManagementService.UpdateTriggerAsync(triggerDto) > 0)
{
if (_dataStorageService.Triggers.TryGetValue(triggerItem.Id,out var mTrigger))
{
_mapper.Map(triggerItem,mTrigger);
//菜单
var menuItem = _dataStorageService.Menus.FirstOrDefault(m => m.MenuType == MenuType.TriggerMenu && m.TargetId == triggerItem.Id);
if (menuItem is not null)
{
menuItem.Header = triggerItem.Name;
await _menuDataService.UpdateMenuItem(menuItem);
}
return true;
}
}
}
_mapper.Map(trigger, triggerDto);
if (await _appCenterService.TriggerManagementService.UpdateTriggerAsync(trigger.Id, triggerDto) != null)
{
return true;
}
return false;
}

4
DMS.WPF/ViewModels/Dialogs/TriggerDialogViewModel.cs
View File

@@ -145,10 +145,10 @@ namespace DMS.WPF.ViewModels.Dialogs
}
// Set timestamps
Trigger.UpdatedAt = DateTime.UtcNow;
Trigger.UpdatedAt = DateTime.Now;
if (Trigger.Id == default(int))
{
Trigger.CreatedAt = DateTime.UtcNow;
Trigger.CreatedAt = DateTime.Now;
Trigger.Id = 0; // 对于自增ID，设置为0让数据库自动生成
}

86
DMS.WPF/ViewModels/TriggersViewModel.cs
View File

@@ -30,7 +30,7 @@ namespace DMS.WPF.ViewModels
public NotifyCollectionChangedSynchronizedViewList<TriggerItem> TriggerItemListView { get; }
[ObservableProperty]
private ObservableDictionary<int, TriggerItem> _triggers ;
private ObservableDictionary<int, TriggerItem> _triggers;
[ObservableProperty]
private TriggerItem? _selectedTrigger;
@@ -51,14 +51,14 @@ namespace DMS.WPF.ViewModels
_navigationService = navigationService ?? throw new ArgumentNullException(nameof(navigationService));
// 初始化时加载触发器数据
_synchronizedView = _dataStorageService.Triggers.CreateView(v=>v.Value);
TriggerItemListView= _synchronizedView.ToNotifyCollectionChanged();
_synchronizedView = _dataStorageService.Triggers.CreateView(v => v.Value);
TriggerItemListView = _synchronizedView.ToNotifyCollectionChanged();
}
/// <summary>
/// 添加新触发器
@@ -67,59 +67,40 @@ namespace DMS.WPF.ViewModels
private async Task AddTriggerAsync()
{
var newTrigger = new TriggerItem()
{
IsActive = true,
Action = Core.Models.Triggers.ActionType.SendEmail,
Description = "新建触发器",
CreatedAt = DateTime.Now,
UpdatedAt = DateTime.Now
{
IsActive = true,
Action = Core.Models.Triggers.ActionType.SendEmail,
Name = "新建触发器",
Description = "新建触发器",
CreatedAt = DateTime.Now,
UpdatedAt = DateTime.Now
};
TriggerDialogViewModel viewModel = App.Current.Services.GetRequiredService<TriggerDialogViewModel>();
await viewModel.OnInitializedAsync(newTrigger);
var result = await _dialogService.ShowDialogAsync(viewModel);
if (result != null)
if (result is null) return;
try
{
try
{
// 创建包含菜单信息的 DTO
CreateTriggerWithMenuDto dto = new CreateTriggerWithMenuDto();
if (_mapper != null)
{
dto.Trigger = _mapper.Map<Trigger>(result);
}
else
{
_notificationService?.ShowError("映射服务未初始化");
return;
}
// 创建菜单项
dto.TriggerMenu = new MenuBean()
{
Header = result.Name ?? result.Description,
Icon = "\uE945", // 使用触发器图标
TargetViewKey = nameof(TriggerDetailViewModel),
};
// 使用TriggerDataService添加触发器和菜单
var resTriggerItem = await _triggerDataService.AddTrigger(result);
// 使用TriggerDataService添加触发器和菜单
var createdTriggerDto = await _triggerDataService.AddTriggerWithMenu(dto);
if (createdTriggerDto != null && createdTriggerDto.Trigger != null)
{
// 更新UI显示
_notificationService.ShowSuccess($"触发器创建成功：{createdTriggerDto.Trigger.Name ?? createdTriggerDto.Trigger.Description}");
}
else
{
_notificationService.ShowError("触发器创建失败");
}
}
catch (Exception ex)
if (resTriggerItem is not null)
{
_notificationService.ShowError($"创建触发器失败: {ex.Message}");
// 更新UI显示
_notificationService.ShowSuccess($"触发器创建成功：{resTriggerItem.Name}");
}
else
{
_notificationService.ShowError("触发器创建失败");
}
}
catch (Exception ex)
{
_notificationService.ShowError($"创建触发器失败: {ex.Message},");
}
}
@@ -136,10 +117,11 @@ namespace DMS.WPF.ViewModels
}
// 传递副本以避免直接修改原始对象
var triggerToEdit = _mapper.Map<Trigger>(SelectedTrigger);
TriggerItem triggerItemToEdit = new TriggerItem();
_mapper.Map(SelectedTrigger, triggerItemToEdit);
TriggerDialogViewModel viewModel = App.Current.Services.GetRequiredService<TriggerDialogViewModel>();
await viewModel.OnInitializedAsync(triggerToEdit);
await viewModel.OnInitializedAsync(triggerItemToEdit);
var result = await _dialogService.ShowDialogAsync(viewModel);
if (result != null)
@@ -147,7 +129,7 @@ namespace DMS.WPF.ViewModels
try
{
// 使用TriggerDataService更新触发器
var updatedTrigger = await _triggerDataService.UpdateTrigger(SelectedTrigger);
var updatedTrigger = await _triggerDataService.UpdateTrigger(result);
if (updatedTrigger)
{
_notificationService.ShowSuccess("触发器更新成功");
@@ -176,7 +158,7 @@ namespace DMS.WPF.ViewModels
return;
}
var confirm = await _dialogService.ShowDialogAsync(new ConfirmDialogViewModel("确认删除", $"确定要删除触发器 '{SelectedTrigger.Description}' 吗？","删除"));
var confirm = await _dialogService.ShowDialogAsync(new ConfirmDialogViewModel("确认删除", $"确定要删除触发器 '{SelectedTrigger.Description}' 吗？", "删除"));
if (confirm)
{
try