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

18
DMS.Application/Interfaces/IEventService.cs
View File

@@ -12,16 +12,16 @@ public interface IEventService
#region 设备事件
/// <summary>
/// 设备状态改变事件
/// 设备状态改变事件（统一事件，处理激活状态和连接状态变化）
/// </summary>
event EventHandler<DeviceActiveChangedEventArgs> OnDeviceActiveChanged;
event EventHandler<DeviceStateChangedEventArgs> OnDeviceStateChanged;
/// <summary>
/// 触发设备状态改变事件
/// </summary>
/// <param name="sender">事件发送者</param>
/// <param name="e">设备状态改变事件参数</param>
void RaiseDeviceActiveChanged(object sender, DeviceActiveChangedEventArgs e);
void RaiseDeviceStateChanged(object sender, DeviceStateChangedEventArgs e);
/// <summary>
/// 设备添加事件
@@ -69,17 +69,7 @@ public interface IEventService
#endregion
/// <summary>
/// 设备运行改变事件
/// </summary>
event EventHandler<DeviceConnectChangedEventArgs> OnDeviceConnectChanged;
/// <summary>
/// 触发设备状态改变事件
/// </summary>
/// <param name="sender">事件发送者</param>
/// <param name="e">设备状态改变事件参数</param>
void RaiseDeviceConnectChanged(object sender, DeviceConnectChangedEventArgs e);
/// <summary>
/// 变量值改变事件

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;
}
}

18
DMS.Core/Enums/DeviceStateType.cs Normal file
View File

@@ -0,0 +1,18 @@
namespace DMS.Core.Enums
{
/// <summary>
/// 设备状态类型枚举
/// </summary>
public enum DeviceStateType
{
/// <summary>
/// 激活状态
/// </summary>
Active,
/// <summary>
/// 连接状态
/// </summary>
Connection
}
}

2
DMS.Core/Events/DeviceActiveChangedEventArgs.cs
View File

@@ -2,7 +2,9 @@ namespace DMS.Core.Events;
/// <summary>
/// 设备状态改变事件参数
/// 已弃用：请使用 DeviceStateChangedEventArgs 替代
/// </summary>
[Obsolete("Use DeviceStateChangedEventArgs instead")]
public class DeviceActiveChangedEventArgs : EventArgs
{
/// <summary>

4
DMS.Core/Events/DeviceConnectChangedEventArgs.cs
View File

@@ -1,5 +1,9 @@
namespace DMS.Core.Events;
/// <summary>
/// 已弃用：请使用 DeviceStateChangedEventArgs 替代
/// </summary>
[Obsolete("Use DeviceStateChangedEventArgs instead")]
public class DeviceConnectChangedEventArgs
{
/// <summary>

52
DMS.Core/Events/DeviceStateChangedEventArgs.cs Normal file
View File

@@ -0,0 +1,52 @@
using DMS.Core.Enums;
namespace DMS.Core.Events
{
/// <summary>
/// 设备状态改变事件参数
/// 统一处理设备激活状态和连接状态的变更
/// </summary>
public class DeviceStateChangedEventArgs : System.EventArgs
{
/// <summary>
/// 设备ID
/// </summary>
public int DeviceId { get; }
/// <summary>
/// 设备名称
/// </summary>
public string DeviceName { get; }
/// <summary>
/// 状态值
/// </summary>
public bool StateValue { get; }
/// <summary>
/// 状态类型 (激活状态或连接状态)
/// </summary>
public DeviceStateType StateType { get; }
/// <summary>
/// 状态改变时间
/// </summary>
public DateTime ChangeTime { get; }
/// <summary>
/// 初始化DeviceStateChangedEventArgs类的新实例
/// </summary>
/// <param name="deviceId">设备ID</param>
/// <param name="deviceName">设备名称</param>
/// <param name="stateValue">状态值</param>
/// <param name="stateType">状态类型</param>
public DeviceStateChangedEventArgs(int deviceId, string deviceName, bool stateValue, DeviceStateType stateType)
{
DeviceId = deviceId;
DeviceName = deviceName ?? string.Empty;
StateValue = stateValue;
StateType = stateType;
ChangeTime = DateTime.Now;
}
}
}

39
DMS.Infrastructure/Services/OpcUa/OpcUaServiceManager.cs
View File

@@ -45,19 +45,30 @@ namespace DMS.Infrastructure.Services.OpcUa
_deviceContexts = new ConcurrentDictionary<int, DeviceContext>();
_semaphore = new SemaphoreSlim(_options.MaxConcurrentConnections, _options.MaxConcurrentConnections);
_eventService.OnDeviceActiveChanged += OnDeviceActiveChanged;
_eventService.OnDeviceStateChanged += OnDeviceStateChanged;
_eventService.OnDeviceChanged += OnDeviceChanged;
}
private async void OnDeviceActiveChanged(object? sender, DeviceActiveChangedEventArgs e)
private async void OnDeviceStateChanged(object? sender, DeviceStateChangedEventArgs e)
{
if (e.NewStatus)
switch (e.StateType)
{
await ConnectDeviceAsync(e.DeviceId, CancellationToken.None);
}
else
{
await DisconnectDeviceAsync(e.DeviceId, CancellationToken.None);
case Core.Enums.DeviceStateType.Active:
// 处理激活状态变化
if (e.StateValue)
{
await ConnectDeviceAsync(e.DeviceId, CancellationToken.None);
}
else
{
await DisconnectDeviceAsync(e.DeviceId, CancellationToken.None);
}
break;
case Core.Enums.DeviceStateType.Connection:
// 处理连接状态变化（通常由底层连接过程触发）
// 在OPC UA服务中，这可能是内部状态更新
break;
}
}
@@ -359,8 +370,8 @@ namespace DMS.Infrastructure.Services.OpcUa
_logger.LogWarning("设备 {DeviceName} 连接失败", context.Device.Name);
}
_eventService.RaiseDeviceConnectChanged(
this, new DeviceConnectChangedEventArgs(context.Device.Id, context.Device.Name, context.IsConnected));
_eventService.RaiseDeviceStateChanged(
this, new DeviceStateChangedEventArgs(context.Device.Id, context.Device.Name, context.IsConnected, Core.Enums.DeviceStateType.Connection));
}
catch (Exception ex)
{
@@ -368,8 +379,8 @@ namespace DMS.Infrastructure.Services.OpcUa
context.Device.Name, ex.Message);
context.IsConnected = false;
context.Device.IsRunning = false;
_eventService.RaiseDeviceConnectChanged(
this, new DeviceConnectChangedEventArgs(context.Device.Id, context.Device.Name, false));
_eventService.RaiseDeviceStateChanged(
this, new DeviceStateChangedEventArgs(context.Device.Id, context.Device.Name, false, Core.Enums.DeviceStateType.Connection));
}
finally
{
@@ -391,8 +402,8 @@ namespace DMS.Infrastructure.Services.OpcUa
await context.OpcUaService.DisconnectAsync();
context.IsConnected = false;
context.Device.IsRunning = false;
_eventService.RaiseDeviceConnectChanged(
this, new DeviceConnectChangedEventArgs(context.Device.Id, context.Device.Name, false));
_eventService.RaiseDeviceStateChanged(
this, new DeviceStateChangedEventArgs(context.Device.Id, context.Device.Name, false, Core.Enums.DeviceStateType.Connection));
_logger.LogInformation("设备 {DeviceName} 连接已断开", context.Device.Name);
}
catch (Exception ex)

8
DMS.Infrastructure/Services/S7/S7ServiceManager.cs
View File

@@ -224,9 +224,9 @@ namespace DMS.Infrastructure.Services.S7
}
finally
{
_eventService.RaiseDeviceConnectChanged(
_eventService.RaiseDeviceStateChanged(
this,
new DeviceConnectChangedEventArgs(context.Device.Id, context.Device.Name, context.IsConnected));
new DeviceStateChangedEventArgs(context.Device.Id, context.Device.Name, context.IsConnected, Core.Enums.DeviceStateType.Connection));
_semaphore.Release();
}
}
@@ -245,9 +245,9 @@ namespace DMS.Infrastructure.Services.S7
await context.S7Service.DisconnectAsync();
context.IsConnected = false;
_eventService.RaiseDeviceConnectChanged(
_eventService.RaiseDeviceStateChanged(
this,
new DeviceConnectChangedEventArgs(context.Device.Id, context.Device.Name, context.IsConnected));
new DeviceStateChangedEventArgs(context.Device.Id, context.Device.Name, context.IsConnected, Core.Enums.DeviceStateType.Connection));
_logger.LogInformation("设备 {DeviceName} 连接已断开", context.Device.Name);
}
catch (Exception ex)

32
DMS.WPF/Services/DeviceDataService.cs
View File

@@ -49,28 +49,32 @@ public class DeviceDataService : IDeviceDataService
_variableDataService = variableDataService;
_uiDispatcher = Dispatcher.CurrentDispatcher;
_eventService.OnDeviceConnectChanged += OnDeviceConnectChanged;
_eventService.OnDeviceStateChanged += OnDeviceStateChanged;
}
private void OnDeviceConnectChanged(object? sender, DeviceConnectChangedEventArgs e)
private void OnDeviceStateChanged(object? sender, DeviceStateChangedEventArgs e)
{
_uiDispatcher.Invoke(() =>
// 只处理连接状态变化
if (e.StateType == Core.Enums.DeviceStateType.Connection)
{
if (_dataStorageService.Devices.TryGetValue(e.DeviceId, out DeviceItemViewModel device))
_uiDispatcher.Invoke(() =>
{
device.IsRunning = e.NewStatus;
if (device.IsRunning)
if (_dataStorageService.Devices.TryGetValue(e.DeviceId, out DeviceItemViewModel device))
{
_notificationService.ShowSuccess($"设备：{device.Name},连接成功。");
device.IsRunning = e.StateValue;
if (device.IsRunning)
{
_notificationService.ShowSuccess($"设备：{device.Name},连接成功。");
}
else
{
_notificationService.ShowSuccess($"设备：{device.Name},已断开连接。");
}
}
else
{
_notificationService.ShowSuccess($"设备：{device.Name},已断开连接。");
}
}
});
});
}
}
/// <summary>

4
DMS.WPF/ViewModels/Items/DeviceItemViewModel.cs
View File

@@ -91,8 +91,8 @@ public partial class DeviceItemViewModel : ObservableObject
// 只有当设备ID有效且事件服务已初始化时才发布事件
if (Id > 0 && EventService != null )
{
// 发布设备状态改变事件
EventService.RaiseDeviceActiveChanged(this, new DeviceActiveChangedEventArgs(Id, Name, newValue));
// 发布设备状态改变事件（使用统一的事件类型）
EventService.RaiseDeviceStateChanged(this, new DeviceStateChangedEventArgs(Id, Name, newValue, Core.Enums.DeviceStateType.Active));
}
}