1 feat: 重构数据加载完成事件的处理机制
2
3 - 从IDataLoaderService接口中移除OnLoadDataCompleted事件
4 - 在IEventService接口中新增OnLoadDataCompleted事件和RaiseLoadDataCompleted方法
5 - 在EventService实现类中实现数据加载完成事件的触发功能
6 - 修改DataLoaderService不再直接触发事件,而是通过IEventService来触发
7 - 更新MQTT、OPC UA和S7后台服务以订阅事件服务中的数据加载完成事件
8 - 修改数据加载完成事件的监听方式,统一使用事件服务进行管理
9
10 此重构改进了事件处理的架构设计,使事件管理更加集中和一致。
This commit is contained in:
@@ -28,11 +28,9 @@ public class DataLoaderService : IDataLoaderService
|
||||
private readonly IMqttAppService _mqttAppService;
|
||||
private readonly INlogAppService _nlogAppService;
|
||||
private readonly ITriggerManagementService _triggerManagementService; // 添加触发器管理服务
|
||||
private readonly IEventService _eventService; // 添加事件服务
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 当数据加载完成时触发
|
||||
/// </summary>
|
||||
public event EventHandler<DataLoadCompletedEventArgs> OnLoadDataCompleted;
|
||||
|
||||
public const int LoadLogCount =100;
|
||||
public DataLoaderService(
|
||||
@@ -45,7 +43,8 @@ public class DataLoaderService : IDataLoaderService
|
||||
IMenuService menuService,
|
||||
IMqttAppService mqttAppService,
|
||||
INlogAppService nlogAppService,
|
||||
ITriggerManagementService triggerManagementService) // 添加触发器管理服务参数
|
||||
ITriggerManagementService triggerManagementService, // 添加触发器管理服务参数
|
||||
IEventService eventService) // 添加事件服务参数
|
||||
{
|
||||
_repositoryManager = repositoryManager;
|
||||
_mapper = mapper;
|
||||
@@ -57,6 +56,7 @@ public class DataLoaderService : IDataLoaderService
|
||||
_mqttAppService = mqttAppService;
|
||||
_nlogAppService = nlogAppService;
|
||||
_triggerManagementService = triggerManagementService; // 初始化触发器管理服务
|
||||
_eventService = eventService; // 初始化事件服务
|
||||
}
|
||||
|
||||
|
||||
@@ -86,7 +86,7 @@ public class DataLoaderService : IDataLoaderService
|
||||
// 加载所有触发器
|
||||
await LoadAllTriggersAsync();
|
||||
|
||||
OnLoadDataCompleted?.Invoke(this, new DataLoadCompletedEventArgs(true, "数据加载成功"));
|
||||
_eventService.RaiseLoadDataCompleted(this, new DataLoadCompletedEventArgs(true, "数据加载成功"));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
@@ -161,4 +161,23 @@ public class EventService : IEventService
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region 数据加载事件
|
||||
|
||||
/// <summary>
|
||||
/// 数据加载完成事件
|
||||
/// </summary>
|
||||
public event EventHandler<DataLoadCompletedEventArgs> OnLoadDataCompleted;
|
||||
|
||||
/// <summary>
|
||||
/// 触发数据加载完成事件
|
||||
/// </summary>
|
||||
/// <param name="sender">事件发送者</param>
|
||||
/// <param name="e">数据加载完成事件参数</param>
|
||||
public void RaiseLoadDataCompleted(object sender, DataLoadCompletedEventArgs e)
|
||||
{
|
||||
OnLoadDataCompleted?.Invoke(sender, e);
|
||||
}
|
||||
|
||||
#endregion
|
||||
}
|
||||
Reference in New Issue
Block a user