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

124
DMS.Application/Services/Management/TriggerManagementService.cs
View File

@@ -1,8 +1,12 @@
using AutoMapper;
using DMS.Application.DTOs;
using DMS.Application.Events;
using DMS.Application.Interfaces;
using DMS.Application.Interfaces.Database;
using DMS.Application.Interfaces.Management;
using DMS.Application.Services.Triggers;
using DMS.Core.Enums;
using DMS.Core.Events;
using DMS.Core.Interfaces;
using DMS.Core.Models.Triggers;
@@ -14,22 +18,24 @@ namespace DMS.Application.Services.Management
public class TriggerManagementService : ITriggerManagementService
{
private readonly IAppStorageService _appStorageService;
private readonly IRepositoryManager _repositoryManager;
private readonly ITriggerAppService _triggerAppService;
private readonly IMapper _mapper;
private readonly IEventService _eventService;
public TriggerManagementService(IAppStorageService appStorageService,IRepositoryManager repositoryManager, IMapper mapper)
public TriggerManagementService(IAppStorageService appStorageService, ITriggerAppService triggerAppService, IMapper mapper, IEventService eventService)
{
_appStorageService = appStorageService;
_repositoryManager = repositoryManager;
_triggerAppService = triggerAppService;
_mapper = mapper ?? throw new ArgumentNullException(nameof(mapper));
_eventService = eventService;
}
/// <summary>
/// 获取所有触发器定义
/// </summary>
public List<Trigger> GetAllTriggersAsync()
public List<Trigger> GetAllTriggersAsync()
{
var triggers = _appStorageService.Triggers.Values.ToList();
var triggers = _appStorageService.Triggers.Values.ToList();
return _mapper.Map<List<Trigger>>(triggers);
}
@@ -41,76 +47,92 @@ namespace DMS.Application.Services.Management
_appStorageService.Triggers.TryGetValue(id, out var trigger);
return trigger;
}
/// <summary>
/// 创建一个新的触发器定义
/// </summary>
public async Task<Trigger> CreateTriggerAsync(Trigger triggerDto)
public async Task<Trigger> AddTriggerAsync(Trigger trigger)
{
// 1. 验证 DTO (可以在应用层或领域层做)
// ValidateTriggerDto(triggerDto);
var createdTrigger = await _triggerAppService.AddTriggerAsync(trigger);
// 2. 转换 DTO 到实体
var triggerEntity = _mapper.Map<Trigger>(triggerDto);
triggerEntity.CreatedAt = DateTime.UtcNow;
triggerEntity.UpdatedAt = DateTime.UtcNow;
// 3. 调用仓储保存实体
var createdTrigger = await _repositoryManager.Triggers.AddAsync(triggerEntity);
// 5. 同步更新AppDataStorageService中的Triggers字典
_appStorageService.Triggers[createdTrigger.Id] = createdTrigger;
// 创建成功后，将触发器添加到内存中
if (createdTrigger != null)
{
if (_appStorageService.Triggers.TryAdd(createdTrigger.Id, createdTrigger))
{
_eventService.RaiseTriggerChanged(this, new TriggerChangedEventArgs(DataChangeType.Added, createdTrigger));
}
}
return createdTrigger;
}
/// <summary>
/// 更新一个已存在的触发器定义
/// 创建触发器及其关联菜单
/// </summary>
public async Task<Trigger?> UpdateTriggerAsync(int id, Trigger triggerDto)
public async Task<CreateTriggerWithMenuDto> CreateTriggerWithMenuAsync(CreateTriggerWithMenuDto dto)
{
// 1. 获取现有实体
var existingTrigger = await _repositoryManager.Triggers.GetByIdAsync(id);
if (existingTrigger == null)
var result = await _triggerAppService.CreateTriggerWithMenuAsync(dto);
// 创建成功后，将触发器添加到内存中
if (result is null || result.Trigger is null)
{
return null;
}
// 2. 验证 DTO
ValidateTriggerDto(triggerDto);
if (_appStorageService.Triggers.TryAdd(result.Trigger.Id, result.Trigger))
{
_eventService.RaiseTriggerChanged(this, new TriggerChangedEventArgs(DataChangeType.Added, result.Trigger));
}
// 3. 将 DTO 映射到现有实体 (排除不可变字段如 Id, CreatedAt)
_mapper.Map(triggerDto, existingTrigger, opts => opts.Items["IgnoreIdAndCreatedAt"] = true);
existingTrigger.UpdatedAt = DateTime.UtcNow;
if (_appStorageService.Menus.TryAdd(result.TriggerMenu.Id, result.TriggerMenu))
{
_eventService.RaiseMenuChanged(this, new MenuChangedEventArgs(DataChangeType.Added, result.TriggerMenu));
}
// 4. 调用仓储更新实体
var updatedTrigger = await _repositoryManager.Triggers.UpdateAsync(existingTrigger);
if (updatedTrigger == null)
return null;
// 5. 转换回 DTO 并返回
var result = _mapper.Map<Trigger>(updatedTrigger);
// 6. 同步更新AppDataStorageService中的Triggers字典
_appStorageService.Triggers[result.Id] = result;
return result;
}
/// <summary>
/// 更新一个已存在的触发器定义
/// </summary>
public async Task<int> UpdateTriggerAsync(Trigger trigger)
{
// 4. 调用仓储更新实体
var res = await _triggerAppService.UpdateTriggerAsync(trigger);
if (res == 0)
return res;
// 6. 同步更新AppDataStorageService中的Triggers字典
if (_appStorageService.Triggers.TryGetValue(trigger.Id, out var memTrigger))
{
_mapper.Map(trigger, memTrigger);
}
return res;
}
/// <summary>
/// 删除一个触发器定义
/// </summary>
public async Task<bool> DeleteTriggerAsync(int id)
{
// var result = await _repositoryManager.Triggers.DeleteAsync(id);
//
// // 如果删除成功，也从AppDataStorageService中的Triggers字典中移除
// if (result)
// {
// _appStorageService.Triggers.TryRemove(id, out _);
// }
//
// return result;
return false;
// 如果删除成功，也从AppDataStorageService中的Triggers字典中移除
if (await _triggerAppService.DeleteTriggerByIdAsync(id))
{
_appStorageService.Triggers.TryRemove(id, out _);
return true;
}
else
{
return false;
}
}
/// <summary>
@@ -129,7 +151,7 @@ namespace DMS.Application.Services.Management
public async Task LoadAllTriggersAsync()
{
_appStorageService.Triggers.Clear();
var triggerDefinitions = await _repositoryManager.Triggers.GetAllAsync();
var triggerDefinitions = await _triggerAppService.GetAllTriggersAsync();
foreach (var triggerDefinition in triggerDefinitions)
{
_appStorageService.Triggers.TryAdd(triggerDefinition.Id, triggerDefinition);