1 feat: 触发器功能增强及菜单集成
2
3 - 添加 CreateTriggerWithMenuDto 数据传输对象,用于同时创建触发器及关联菜单
4 - 在 TriggerDataService 中新增 AddTriggerWithMenu 方法,实现触发器与菜单的同时创建
5 - 更新 TriggersViewModel 以使用新的触发器和菜单创建流程
6 - 在 MenuType 枚举中添加 TriggerMenu 类型
7 - 调整 InitializeRepository 中触发器菜单的图标
8 - 更新相关服务中的注释,将 Trigger 替换为 TriggerMenu 以保持一致
9 - 修改时间记录方式,使用 DateTime.Now 替代 DateTime.UtcNow
10 - 优化 TriggerManagementService 中的触发器创建与存储流程
11 - 更新触发器评估和管理服务中的日志文本,统一使用 TriggerMenu 术语
This commit is contained in:
@@ -19,6 +19,11 @@ public interface ITriggerDataService
|
||||
/// </summary>
|
||||
Task<TriggerItem> AddTrigger(TriggerItem triggerItem);
|
||||
|
||||
/// <summary>
|
||||
/// 添加触发器及其关联菜单。
|
||||
/// </summary>
|
||||
Task<CreateTriggerWithMenuDto> AddTriggerWithMenu(CreateTriggerWithMenuDto dto);
|
||||
|
||||
/// <summary>
|
||||
/// 删除触发器。
|
||||
/// </summary>
|
||||
|
||||
@@ -1,12 +1,14 @@
|
||||
using System.Windows.Threading;
|
||||
using AutoMapper;
|
||||
using DMS.Application.DTOs;
|
||||
using DMS.Application.Interfaces;
|
||||
using DMS.Application.Services;
|
||||
using DMS.Core.Enums;
|
||||
using DMS.Core.Events;
|
||||
using DMS.Core.Models.Triggers;
|
||||
using DMS.WPF.Interfaces;
|
||||
using DMS.WPF.ItemViewModel;
|
||||
using Opc.Ua;
|
||||
using System.Windows.Threading;
|
||||
|
||||
namespace DMS.WPF.Services;
|
||||
|
||||
@@ -100,6 +102,48 @@ public class TriggerDataService : ITriggerDataService
|
||||
return true;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 添加触发器及其关联菜单。
|
||||
/// </summary>
|
||||
public async Task<CreateTriggerWithMenuDto> AddTriggerWithMenu(CreateTriggerWithMenuDto dto)
|
||||
{
|
||||
// 添加null检查
|
||||
if (dto == null || dto.Trigger == null)
|
||||
return null;
|
||||
|
||||
try
|
||||
{
|
||||
// 首先添加触发器
|
||||
var createdTrigger = await _appCenterService.TriggerManagementService.CreateTriggerAsync(dto.Trigger);
|
||||
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);
|
||||
|
||||
return dto;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_notificationService?.ShowError($"添加触发器及菜单时发生错误:{ex.Message}", ex);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 更新触发器。
|
||||
/// </summary>
|
||||
|
||||
@@ -71,8 +71,8 @@ namespace DMS.WPF.ViewModels
|
||||
IsActive = true,
|
||||
Action = Core.Models.Triggers.ActionType.SendEmail,
|
||||
Description = "新建触发器",
|
||||
CreatedAt = DateTime.UtcNow,
|
||||
UpdatedAt = DateTime.UtcNow
|
||||
CreatedAt = DateTime.Now,
|
||||
UpdatedAt = DateTime.Now
|
||||
};
|
||||
|
||||
TriggerDialogViewModel viewModel = App.Current.Services.GetRequiredService<TriggerDialogViewModel>();
|
||||
@@ -83,13 +83,33 @@ namespace DMS.WPF.ViewModels
|
||||
{
|
||||
try
|
||||
{
|
||||
// 使用TriggerDataService添加触发器
|
||||
var createdTrigger = await _triggerDataService.AddTrigger(newTrigger);
|
||||
|
||||
if (createdTrigger != null )
|
||||
// 创建包含菜单信息的 DTO
|
||||
CreateTriggerWithMenuDto dto = new CreateTriggerWithMenuDto();
|
||||
if (_mapper != null)
|
||||
{
|
||||
// 触发器已添加到数据存储中,只需更新本地集合
|
||||
_notificationService.ShowSuccess("触发器创建成功");
|
||||
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 createdTriggerDto = await _triggerDataService.AddTriggerWithMenu(dto);
|
||||
|
||||
if (createdTriggerDto != null && createdTriggerDto.Trigger != null)
|
||||
{
|
||||
// 更新UI显示
|
||||
_notificationService.ShowSuccess($"触发器创建成功:{createdTriggerDto.Trigger.Name ?? createdTriggerDto.Trigger.Description}");
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user