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

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

Browse Source 
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:
David P.G
2025-10-18 18:23:14 +08:00
parent 740688d575
commit cb984b1b91
19 changed files with 66 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
DMS.Application/Interfaces/Database/ITriggerAppService.cs
View File

@@ -14,27 +14,27 @@ namespace DMS.Application.Interfaces.Database
/// </summary>
/// <param name="id">触发器ID。</param>
/// <returns>触发器定义实体。</returns>
Task<TriggerDefinition> GetTriggerByIdAsync(int id);
Task<Trigger> GetTriggerByIdAsync(int id);
/// <summary>
/// 异步获取所有触发器定义。
/// </summary>
/// <returns>触发器定义实体列表。</returns>
Task<List<TriggerDefinition>> GetAllTriggersAsync();
Task<List<Trigger>> GetAllTriggersAsync();
/// <summary>
/// 异步创建一个新触发器定义及其关联的变量ID。
/// </summary>
/// <param name="trigger">要创建的触发器定义。</param>
/// <returns>新创建的触发器定义。</returns>
Task<TriggerDefinition> CreateTriggerAsync(TriggerDefinition trigger);
Task<Trigger> CreateTriggerAsync(Trigger trigger);
/// <summary>
/// 异步更新一个已存在的触发器定义及其关联的变量ID。
/// </summary>
/// <param name="trigger">要更新的触发器定义。</param>
/// <returns>受影响的行数。</returns>
Task<int> UpdateTriggerAsync(TriggerDefinition trigger);
Task<int> UpdateTriggerAsync(Trigger trigger);
/// <summary>
/// 异步删除一个触发器定义及其关联的变量关系。
@@ -48,6 +48,6 @@ namespace DMS.Application.Interfaces.Database
/// </summary>
/// <param name="variableId">变量ID。</param>
/// <returns>与指定变量关联的触发器定义实体列表。</returns>
Task<IEnumerable<TriggerDefinition>> GetTriggersByVariableIdAsync(int variableId);
Task<IEnumerable<Trigger>> GetTriggersByVariableIdAsync(int variableId);
}
}

2
DMS.Application/Interfaces/IAppStorageService.cs
View File

@@ -49,7 +49,7 @@ public interface IAppStorageService
/// <summary>
/// 安全字典，用于存储所有触发器定义数据
/// </summary>
ConcurrentDictionary<int, TriggerDefinition> Triggers { get; }
ConcurrentDictionary<int, Trigger> Triggers { get; }
/// <summary>
/// 安全字典，用于存储所有触发器与变量关联数据

10
DMS.Application/Interfaces/Management/ITriggerManagementService.cs
View File

@@ -12,21 +12,21 @@ namespace DMS.Application.Interfaces.Management
/// 获取所有触发器定义
/// </summary>
/// <returns>触发器定义列表</returns>
List<TriggerDefinition> GetAllTriggersAsync();
List<Trigger> GetAllTriggersAsync();
/// <summary>
/// 根据 ID 获取触发器定义
/// </summary>
/// <param name="id">触发器 ID</param>
/// <returns>触发器定义 DTO，如果未找到则返回 null</returns>
Task<TriggerDefinition> GetTriggerByIdAsync(int id);
Task<Trigger> GetTriggerByIdAsync(int id);
/// <summary>
/// 创建一个新的触发器定义
/// </summary>
/// <param name="triggerDto">要创建的触发器定义 DTO</param>
/// <returns>创建成功的触发器定义 DTO</returns>
Task<TriggerDefinition> CreateTriggerAsync(TriggerDefinition triggerDto);
Task<Trigger> CreateTriggerAsync(Trigger triggerDto);
/// <summary>
/// 更新一个已存在的触发器定义
@@ -34,7 +34,7 @@ namespace DMS.Application.Interfaces.Management
/// <param name="id">要更新的触发器 ID</param>
/// <param name="triggerDto">包含更新信息的触发器定义 DTO</param>
/// <returns>更新后的触发器定义 DTO，如果未找到则返回 null</returns>
Task<TriggerDefinition?> UpdateTriggerAsync(int id, TriggerDefinition triggerDto);
Task<Trigger?> UpdateTriggerAsync(int id, Trigger triggerDto);
/// <summary>
/// 删除一个触发器定义
@@ -48,7 +48,7 @@ namespace DMS.Application.Interfaces.Management
/// </summary>
/// <param name="variableId">变量 ID</param>
/// <returns>该变量关联的触发器定义列表</returns>
Task<List<TriggerDefinition>> GetTriggersForVariableAsync(int variableId);
Task<List<Trigger>> GetTriggersForVariableAsync(int variableId);
/// <summary>
/// 异步加载所有触发器数据

2
DMS.Application/Services/AppStorageService.cs
View File

@@ -58,7 +58,7 @@ public class AppStorageService : IAppStorageService
/// <summary>
/// 安全字典，用于存储所有触发器定义数据
/// </summary>
public ConcurrentDictionary<int, TriggerDefinition> Triggers { get; } = new();
public ConcurrentDictionary<int, Trigger> Triggers { get; } = new();
/// <summary>
/// 安全字典，用于存储所有触发器与变量关联数据

5
DMS.Application/Services/DataLoaderService.cs
View File

@@ -16,6 +16,7 @@ public class DataLoaderService : IDataLoaderService
{
private readonly IMqttManagementService _mqttManagementService;
private readonly IMqttAliasManagementService _mqttAliasManagementService;
private readonly ITriggerVariableManagementService _triggerVariableManagementService;
private readonly ITriggerManagementService _triggerManagementService; // 添加触发器管理服务
private readonly IEventService _eventService; // 添加事件服务
private readonly IDeviceManagementService _deviceManagementService; // 添加设备管理服务
@@ -29,6 +30,7 @@ public class DataLoaderService : IDataLoaderService
public const int LoadLogCount =100;
public DataLoaderService(IMqttManagementService mqttManagementService,
IMqttAliasManagementService mqttAliasManagementService,
ITriggerVariableManagementService triggerVariableManagementService,
ITriggerManagementService triggerManagementService, // 添加触发器管理服务参数
IEventService eventService, // 添加事件服务参数
IDeviceManagementService deviceManagementService, // 添加设备管理服务参数
@@ -39,6 +41,7 @@ public class DataLoaderService : IDataLoaderService
{
_mqttManagementService = mqttManagementService;
_mqttAliasManagementService = mqttAliasManagementService;
_triggerVariableManagementService = triggerVariableManagementService;
_triggerManagementService = triggerManagementService; // 初始化触发器管理服务
_eventService = eventService; // 初始化事件服务
_deviceManagementService = deviceManagementService; // 初始化设备管理服务
@@ -74,6 +77,8 @@ public class DataLoaderService : IDataLoaderService
// 加载所有触发器
await _triggerManagementService.LoadAllTriggersAsync();
// 加载触发器和变量的关联
await _triggerVariableManagementService.LoadAllTriggerVariablesAsync();
_eventService.RaiseLoadDataCompleted(this, new DataLoadCompletedEventArgs(true, "数据加载成功"));
}

12
DMS.Application/Services/Database/TriggerAppService.cs
View File

@@ -33,7 +33,7 @@ namespace DMS.Application.Services.Database
/// </summary>
/// <param name="id">触发器ID。</param>
/// <returns>触发器定义实体。</returns>
public async Task<TriggerDefinition> GetTriggerByIdAsync(int id)
public async Task<Trigger> GetTriggerByIdAsync(int id)
{
var dbTrigger = await _repositoryManager.Triggers.GetByIdAsync(id);
return dbTrigger;
@@ -43,7 +43,7 @@ namespace DMS.Application.Services.Database
/// 异步获取所有触发器定义。
/// </summary>
/// <returns>触发器定义实体列表。</returns>
public async Task<List<TriggerDefinition>> GetAllTriggersAsync()
public async Task<List<Trigger>> GetAllTriggersAsync()
{
var triggers = await _repositoryManager.Triggers.GetAllAsync();
var triggerVariables = await _repositoryManager.TriggerVariables.GetAllAsync();
@@ -62,7 +62,7 @@ namespace DMS.Application.Services.Database
/// </summary>
/// <param name="trigger">要创建的触发器定义。</param>
/// <returns>新创建的触发器定义。</returns>
public async Task<TriggerDefinition> CreateTriggerAsync(TriggerDefinition trigger)
public async Task<Trigger> CreateTriggerAsync(Trigger trigger)
{
try
{
@@ -99,7 +99,7 @@ namespace DMS.Application.Services.Database
/// </summary>
/// <param name="trigger">要更新的触发器定义。</param>
/// <returns>受影响的行数。</returns>
public async Task<int> UpdateTriggerAsync(TriggerDefinition trigger)
public async Task<int> UpdateTriggerAsync(Trigger trigger)
{
try
{
@@ -169,7 +169,7 @@ namespace DMS.Application.Services.Database
/// </summary>
/// <param name="variableId">变量ID。</param>
/// <returns>与指定变量关联的触发器定义实体列表。</returns>
public async Task<IEnumerable<TriggerDefinition>> GetTriggersByVariableIdAsync(int variableId)
public async Task<IEnumerable<Trigger>> GetTriggersByVariableIdAsync(int variableId)
{
var stopwatch = new Stopwatch();
stopwatch.Start();
@@ -177,7 +177,7 @@ namespace DMS.Application.Services.Database
// // 获取关联的触发器ID列表
// var triggerIds = await _repositoryManager.GetTriggerIdsByVariableIdAsync(variableId);
// var triggers = new List<TriggerDefinition>();
// var triggers = new List<Trigger>();
// if (triggerIds.Any())
// {
// // 获取所有关联的触发器

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

@@ -27,16 +27,16 @@ namespace DMS.Application.Services.Management
/// <summary>
/// 获取所有触发器定义
/// </summary>
public List<TriggerDefinition> GetAllTriggersAsync()
public List<Trigger> GetAllTriggersAsync()
{
var triggers = _appStorageService.Triggers.Values.ToList();
return _mapper.Map<List<TriggerDefinition>>(triggers);
return _mapper.Map<List<Trigger>>(triggers);
}
/// <summary>
/// 根据 ID 获取触发器定义
/// </summary>
public async Task<TriggerDefinition?> GetTriggerByIdAsync(int id)
public async Task<Trigger?> GetTriggerByIdAsync(int id)
{
_appStorageService.Triggers.TryGetValue(id, out var trigger);
return trigger;
@@ -46,13 +46,13 @@ namespace DMS.Application.Services.Management
/// <summary>
/// 创建一个新的触发器定义
/// </summary>
public async Task<TriggerDefinition> CreateTriggerAsync(TriggerDefinition triggerDto)
public async Task<Trigger> CreateTriggerAsync(Trigger triggerDto)
{
// 1. 验证 DTO (可以在应用层或领域层做)
ValidateTriggerDto(triggerDto);
// 2. 转换 DTO 到实体
var triggerEntity = _mapper.Map<TriggerDefinition>(triggerDto);
var triggerEntity = _mapper.Map<Trigger>(triggerDto);
triggerEntity.CreatedAt = DateTime.UtcNow;
triggerEntity.UpdatedAt = DateTime.UtcNow;
@@ -60,7 +60,7 @@ namespace DMS.Application.Services.Management
var createdTrigger = await _repositoryManager.Triggers.AddAsync(triggerEntity);
// 4. 转换回 DTO 并返回
var result = _mapper.Map<TriggerDefinition>(createdTrigger);
var result = _mapper.Map<Trigger>(createdTrigger);
// 5. 同步更新AppDataStorageService中的Triggers字典
_appStorageService.Triggers[result.Id] = result;
@@ -71,7 +71,7 @@ namespace DMS.Application.Services.Management
/// <summary>
/// 更新一个已存在的触发器定义
/// </summary>
public async Task<TriggerDefinition?> UpdateTriggerAsync(int id, TriggerDefinition triggerDto)
public async Task<Trigger?> UpdateTriggerAsync(int id, Trigger triggerDto)
{
// 1. 获取现有实体
var existingTrigger = await _repositoryManager.Triggers.GetByIdAsync(id);
@@ -91,7 +91,7 @@ namespace DMS.Application.Services.Management
return null;
// 5. 转换回 DTO 并返回
var result = _mapper.Map<TriggerDefinition>(updatedTrigger);
var result = _mapper.Map<Trigger>(updatedTrigger);
// 6. 同步更新AppDataStorageService中的Triggers字典
_appStorageService.Triggers[result.Id] = result;
@@ -119,10 +119,10 @@ namespace DMS.Application.Services.Management
/// <summary>
/// 获取与指定变量关联的所有触发器定义
/// </summary>
public async Task<List<TriggerDefinition>> GetTriggersForVariableAsync(int variableId)
public async Task<List<Trigger>> GetTriggersForVariableAsync(int variableId)
{
// var triggers = await _repositoryManager.Triggers.GetByVariableIdAsync(variableId);
// return _mapper.Map<List<TriggerDefinition>>(triggers);
// return _mapper.Map<List<Trigger>>(triggers);
return null;
}
@@ -141,9 +141,9 @@ namespace DMS.Application.Services.Management
}
/// <summary>
/// 内部方法：验证 TriggerDefinition 的有效性
/// 内部方法：验证 Trigger 的有效性
/// </summary>
private void ValidateTriggerDto(TriggerDefinition dto)
private void ValidateTriggerDto(Trigger dto)
{
// 检查是否至少关联了一个变量
if (dto.Variables == null || !dto.Variables.Any())

1
DMS.Application/Services/Management/TriggerVariableManagementService.cs
View File

@@ -50,6 +50,7 @@ public class TriggerVariableManagementService : ITriggerVariableManagementServic
if (_appStorageService.Variables.TryGetValue(triggerVariable.VariableId, out var variable))
{
trigger.Variables.Add(variable);
variable.Triggers.Add(trigger);
}
}

4
DMS.Application/Services/Triggers/Impl/TriggerEvaluationService.cs
View File

@@ -101,7 +101,7 @@ namespace DMS.Application.Services.Triggers.Impl
/// <summary>
/// 内部方法：评估单个触发器的条件
/// </summary>
private bool EvaluateCondition(TriggerDefinition trigger, object currentValueObj)
private bool EvaluateCondition(Trigger trigger, object currentValueObj)
{
if (currentValueObj == null)
{
@@ -139,7 +139,7 @@ namespace DMS.Application.Services.Triggers.Impl
/// <summary>
/// 内部方法：检查触发器是否处于抑制窗口期内
/// </summary>
private bool IsWithinSuppressionWindow(TriggerDefinition trigger)
private bool IsWithinSuppressionWindow(Trigger trigger)
{
if (!trigger.SuppressionDuration.HasValue || !trigger.LastTriggeredAt.HasValue)
return false;

2
DMS.Application/Services/Triggers/TriggerContext.cs
View File

@@ -11,5 +11,5 @@ namespace DMS.Application.Services.Triggers
/// <param name="Trigger">被触发的触发器定义</param>
/// <param name="CurrentValue">触发时变量的当前值</param>
/// <param name="Variable">关联的变量信息</param>
public record TriggerContext(TriggerDefinition Trigger, object CurrentValue, Variable Variable);
public record TriggerContext(Trigger Trigger, object CurrentValue, Variable Variable);
}

4
DMS.Core/Interfaces/Repositories/Triggers/ITriggerRepository.cs
View File

@@ -7,9 +7,9 @@ using DMS.Core.Interfaces.Repositories;
namespace DMS.Core.Interfaces.Repositories.Triggers
{
/// <summary>
/// 触发器仓储接口 (定义对 TriggerDefinition 实体的数据访问方法)
/// 触发器仓储接口 (定义对 Trigger 实体的数据访问方法)
/// </summary>
public interface ITriggerRepository : IBaseRepository<TriggerDefinition>
public interface ITriggerRepository : IBaseRepository<Trigger>
{
}
}

2
DMS.Core/Models/Triggers/TriggerDefinition.cs → DMS.Core/Models/Triggers/Trigger.cs
View File

@@ -30,7 +30,7 @@ namespace DMS.Core.Models.Triggers
/// <summary>
/// 触发器定义领域模型
/// </summary>
public class TriggerDefinition
public class Trigger
{
/// <summary>
/// 触发器唯一标识符

5
DMS.Core/Models/Variable.cs
View File

@@ -1,6 +1,7 @@
using DMS.Core.Enums;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations.Schema;
using DMS.Core.Models.Triggers;
namespace DMS.Core.Models;
@@ -58,6 +59,10 @@ public class Variable
/// 此变量的所有MQTT发布别名关联。一个变量可以关联多个MQTT服务器，每个关联可以有独立的别名。
/// </summary>
public List<MqttAlias> MqttAliases { get; set; } = new();
/// <summary>
/// 此变量的所有触发器关联。一个变量可以关联多个触发器
/// </summary>
public List<Trigger> Triggers { get; set; } = new();
/// <summary>
/// OPC UA NodeId (仅当 Protocol 为 OpcUa 时有效)。

2
DMS.Infrastructure/Profiles/MappingProfile.cs
View File

@@ -45,7 +45,7 @@ public class MappingProfile : Profile
CreateMap<DbEmailTemplate, EmailTemplate>().ReverseMap();
// --- 触发器映射 ---
CreateMap<DbTriggerDefinition, TriggerDefinition>()
CreateMap<DbTriggerDefinition, Trigger>()
.ReverseMap();
}
}

22
DMS.Infrastructure/Repositories/TriggerRepository.cs
View File

@@ -36,20 +36,20 @@ namespace DMS.Infrastructure.Repositories
/// </summary>
/// <param name="id">触发器定义的唯一标识符。</param>
/// <returns>对应的触发器定义实体，如果不存在则为null。</returns>
public async Task<TriggerDefinition> GetByIdAsync(int id)
public async Task<Trigger> GetByIdAsync(int id)
{
var dbTrigger = await base.GetByIdAsync(id);
return _mapper.Map<TriggerDefinition>(dbTrigger);
return _mapper.Map<Trigger>(dbTrigger);
}
/// <summary>
/// 异步获取所有触发器定义。
/// </summary>
/// <returns>包含所有触发器定义实体的列表。</returns>
public async Task<List<TriggerDefinition>> GetAllAsync()
public async Task<List<Trigger>> GetAllAsync()
{
var dbList = await base.GetAllAsync();
return _mapper.Map<List<TriggerDefinition>>(dbList);
return _mapper.Map<List<Trigger>>(dbList);
}
/// <summary>
@@ -57,7 +57,7 @@ namespace DMS.Infrastructure.Repositories
/// </summary>
/// <param name="entity">要添加的触发器定义实体。</param>
/// <returns>添加成功后的触发器定义实体（包含数据库生成的ID等信息）。</returns>
public async Task<TriggerDefinition> AddAsync(TriggerDefinition entity)
public async Task<Trigger> AddAsync(Trigger entity)
{
var dbTrigger = _mapper.Map<DbTriggerDefinition>(entity);
var addedDbTrigger = await base.AddAsync(dbTrigger);
@@ -69,7 +69,7 @@ namespace DMS.Infrastructure.Repositories
/// </summary>
/// <param name="entity">要更新的触发器定义实体。</param>
/// <returns>受影响的行数。</returns>
public async Task<int> UpdateAsync(TriggerDefinition entity)
public async Task<int> UpdateAsync(Trigger entity)
{
var dbTrigger = _mapper.Map<DbTriggerDefinition>(entity);
return await base.UpdateAsync(dbTrigger);
@@ -80,7 +80,7 @@ namespace DMS.Infrastructure.Repositories
/// </summary>
/// <param name="entity">要删除的触发器定义实体。</param>
/// <returns>受影响的行数。</returns>
public async Task<int> DeleteAsync(TriggerDefinition entity)
public async Task<int> DeleteAsync(Trigger entity)
{
return await base.DeleteAsync(_mapper.Map<DbTriggerDefinition>(entity));
}
@@ -106,17 +106,17 @@ namespace DMS.Infrastructure.Repositories
/// </summary>
/// <param name="number">要获取的触发器定义数量。</param>
/// <returns>包含指定数量触发器定义实体的列表。</returns>
public new async Task<List<TriggerDefinition>> TakeAsync(int number)
public new async Task<List<Trigger>> TakeAsync(int number)
{
var dbList = await base.TakeAsync(number);
return _mapper.Map<List<TriggerDefinition>>(dbList);
return _mapper.Map<List<Trigger>>(dbList);
}
public async Task<List<TriggerDefinition>> AddBatchAsync(List<TriggerDefinition> entities)
public async Task<List<Trigger>> AddBatchAsync(List<Trigger> entities)
{
var dbEntities = _mapper.Map<List<DbTriggerDefinition>>(entities);
var addedEntities = await base.AddBatchAsync(dbEntities);
return _mapper.Map<List<TriggerDefinition>>(addedEntities);
return _mapper.Map<List<Trigger>>(addedEntities);
}
}
}

2
DMS.WPF/App.xaml.cs
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>();

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

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

6
DMS.WPF/Services/TriggerDataService.cs
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)

2
DMS.WPF/ViewModels/TriggersViewModel.cs
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);