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

主要变更：

Browse Source 
1. 创建了 DeviceStateType 枚举来区分状态类型（激活/连接）
   2. 创建了 DeviceStateChangedEventArgs 统一事件类
   3. 更新了 IEventService 接口，将两个事件合并为一个
   4. 更新了 EventService 实现以支持新事件
   5. 更新了所有相关服务（DeviceMonitoringService, OpcUaServiceManager, S7ServiceManager, DeviceDataService, DeviceItemViewModel）

  关键优点：
   - 减少了事件类型的数量，简化了事件系统
   - 为设备状态变化提供了一致的处理方式
   - 保持了向后兼容性，将旧类标记为 [Obsolete]
This commit is contained in:
David P.G
2025-10-01 18:41:05 +08:00
parent c0223b083a
commit e84a202438
11 changed files with 159 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
DMS.Application/Services/EventService.cs
View File

@@ -20,14 +20,9 @@ public class EventService : IEventService
#region 设备事件
/// <summary>
/// 设备状态改变事件
/// 设备状态改变事件（统一事件，处理激活状态和连接状态变化）
/// </summary>
public event EventHandler<DeviceActiveChangedEventArgs> OnDeviceActiveChanged;
/// <summary>
/// 设备运行改变事件
/// </summary>
public event EventHandler<DeviceConnectChangedEventArgs> OnDeviceConnectChanged;
public event EventHandler<DeviceStateChangedEventArgs> OnDeviceStateChanged;
/// <summary>
/// 设备添加事件
@@ -47,20 +42,33 @@ public class EventService : IEventService
if (device.IsActive != e.NewStatus)
{
device.IsActive = e.NewStatus;
OnDeviceActiveChanged?.Invoke(sender, e);
// 转发到统一的设备状态事件
var unifiedEvent = new DeviceStateChangedEventArgs(e.DeviceId, e.DeviceName, e.NewStatus, Core.Enums.DeviceStateType.Active);
OnDeviceStateChanged?.Invoke(sender, unifiedEvent);
}
}
}
/// <summary>
/// 触发设备状态改变事件
/// 触发设备连接状态改变事件
/// </summary>
/// <param name="sender">事件发送者</param>
/// <param name="e">设备状态改变事件参数</param>
public void RaiseDeviceConnectChanged(object sender, DeviceConnectChangedEventArgs e)
{
OnDeviceConnectChanged?.Invoke(sender, e);
// 转发到统一的设备状态事件
var unifiedEvent = new DeviceStateChangedEventArgs(e.DeviceId, e.DeviceName, e.NewStatus, Core.Enums.DeviceStateType.Connection);
OnDeviceStateChanged?.Invoke(sender, unifiedEvent);
}
/// <summary>
/// 触发设备状态改变事件（统一事件）
/// </summary>
/// <param name="sender">事件发送者</param>
/// <param name="e">设备状态改变事件参数</param>
public void RaiseDeviceStateChanged(object sender, DeviceStateChangedEventArgs e)
{
OnDeviceStateChanged?.Invoke(sender, e);
}
/// <summary>

20
DMS.Application/Services/Monitoring/DeviceMonitoringService.cs
View File

@@ -33,23 +33,27 @@ public class DeviceMonitoringService : IDeviceMonitoringService, IDisposable
_eventService = eventService;
_appDataStorageService = appDataStorageService;
_appDataCenterService = appDataCenterService;
_eventService.OnDeviceActiveChanged += OnDeviceActiveChanged;
_eventService.OnDeviceStateChanged += OnDeviceStateChanged;
}
private void OnDeviceActiveChanged(object? sender, DeviceActiveChangedEventArgs e)
private void OnDeviceStateChanged(object? sender, DeviceStateChangedEventArgs e)
{
if (_appDataStorageService.Devices.TryGetValue(e.DeviceId, out var device))
// 只处理激活状态变化事件
if (e.StateType == Core.Enums.DeviceStateType.Active)
{
// 更新设备激活状态 - 同时更新数据库和内存
_ = Task.Run(async () =>
if (_appDataStorageService.Devices.TryGetValue(e.DeviceId, out var device))
{
await _appDataCenterService.DeviceManagementService.UpdateDeviceAsync(device);
});
// 更新设备激活状态 - 同时更新数据库和内存
_ = Task.Run(async () =>
{
await _appDataCenterService.DeviceManagementService.UpdateDeviceAsync(device);
});
}
}
}
public void Dispose()
{
_eventService.OnDeviceActiveChanged -= OnDeviceActiveChanged;
_eventService.OnDeviceStateChanged -= OnDeviceStateChanged;
}
}