1 feat: 重构触发器定义模型并完善触发器-变量关联功能

2
    3 - 重命名TriggerDefinition类为Trigger,移除冗余的Definition后缀
    4 - 更新所有相关接口和实现类以使用新的Trigger类名
    5 - 在Variable模型中添加Triggers集合,实现变量到触发器的反向关联
    6 - 在TriggerVariableManagementService中完善触发器与变量的双向关联逻辑
    7 - 将触发器-变量关联数据加载集成到DataLoaderService中
    8 - 在依赖注入容器中注册ITriggerVariableManagementService和ITriggerVariableAppService
    9 - 更新触发器相关的DTO映射配置
   10 - 修复触发器评估服务中的类型引用问题
   11
   12 此更改统一了触发器模型命名,完善了触发器与变量的双向关联关系,提高了代码的一致性和可维护性。
This commit is contained in:
2025-10-18 18:23:14 +08:00
parent 740688d575
commit cb984b1b91
19 changed files with 66 additions and 53 deletions

View File

@@ -271,6 +271,8 @@ public partial class App : System.Windows.Application
services.AddSingleton<ITriggerManagementService, TriggerManagementService>(); // 注册触发器管理服务
services.AddSingleton<ITriggerEvaluationService, TriggerEvaluationService>(); // 注册触发器评估服务
services.AddSingleton<ITriggerActionExecutor, TriggerActionExecutor>(); // 注册触发器动作执行器
services.AddSingleton<ITriggerVariableManagementService, TriggerVariableManagementService>(); // 注册触发器变量管理服务
services.AddSingleton<ITriggerVariableAppService, TriggerVariableAppService>(); // 注册触发器变量应用服务
services.AddSingleton<IDataLoaderService, DataLoaderService>();
services.AddSingleton<INlogAppService, NlogAppService>();

View File

@@ -17,7 +17,7 @@ public interface ITriggerDataService
/// <summary>
/// 添加触发器。
/// </summary>
Task<TriggerItem> AddTrigger(TriggerItem dto);
Task<TriggerItem> AddTrigger(TriggerItem triggerItem);
/// <summary>
/// 删除触发器。

View File

@@ -59,15 +59,15 @@ public class TriggerDataService : ITriggerDataService
/// <summary>
/// 添加触发器。
/// </summary>
public async Task<TriggerItem> AddTrigger(TriggerItem dto)
public async Task<TriggerItem> AddTrigger(TriggerItem triggerItem)
{
// 添加null检查
if (dto == null)
if (triggerItem == null)
return null;
var addDto
= await _appCenterService.TriggerManagementService.CreateTriggerAsync(
_mapper.Map<TriggerDefinition>(dto));
_mapper.Map<Trigger>(triggerItem));
// 添加null检查
if (addDto == null)

View File

@@ -105,7 +105,7 @@ namespace DMS.WPF.ViewModels
}
// 传递副本以避免直接修改原始对象
var triggerToEdit = _mapper.Map<TriggerDefinition>(SelectedTrigger);
var triggerToEdit = _mapper.Map<Trigger>(SelectedTrigger);
TriggerDialogViewModel viewModel = App.Current.Services.GetRequiredService<TriggerDialogViewModel>();
await viewModel.OnInitializedAsync(triggerToEdit);