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

完成的变更：

Browse Source 
1. 向 VariableTableManagementService 添加了 IEventService 依赖
   2. 将内存操作和事件触发逻辑合并到数据库操作方法中：
      - CreateVariableTableAsync 现在会在数据库创建后自动添加到内存并触发事件
      - UpdateVariableTableAsync 现在会在数据库更新后自动更新内存并触发事件
      - DeleteVariableTableAsync 现在会在数据库删除后自动从内存移除并触发事件
   3. 从类中删除了独立的内存操作方法
   4. 从接口中移除了内存操作方法
   5. 更新了所有调用这些服务的代码，使它们不再调用已删除的内存方法
   6. 扩展了 IEventService 以支持 VariableTableChanged 事件
This commit is contained in:
David P.G
2025-10-01 19:16:47 +08:00
parent 438ee0fe58
commit e43c0df1cf
11 changed files with 116 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DMS.Core/Events/DeviceStateChangedEventArgs.cs → DMS.Application/Events/DeviceStateChangedEventArgs.cs
View File

@@ -1,6 +1,6 @@
using DMS.Core.Enums;
namespace DMS.Core.Events
namespace DMS.Application.Events
{
/// <summary>
/// 设备状态改变事件参数

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

@@ -71,6 +71,18 @@ public interface IEventService
/// <summary>
/// 变量表改变事件
/// </summary>
event EventHandler<VariableTableChangedEventArgs> OnVariableTableChanged;
/// <summary>
/// 触发变量表改变事件
/// </summary>
/// <param name="sender">事件发送者</param>
/// <param name="e">变量表改变事件参数</param>
void RaiseVariableTableChanged(object sender, VariableTableChangedEventArgs e);
/// <summary>
/// 变量值改变事件
/// </summary>

20
DMS.Application/Interfaces/Management/IVariableTableManagementService.cs
View File

@@ -5,11 +5,6 @@ namespace DMS.Application.Interfaces.Management;
public interface IVariableTableManagementService
{
/// <summary>
/// 当变量表数据发生变化时触发
/// </summary>
event EventHandler<VariableTableChangedEventArgs> OnVariableTableChanged;
/// <summary>
/// 异步根据ID获取变量表DTO。
/// </summary>
@@ -34,19 +29,4 @@ public interface IVariableTableManagementService
/// 异步删除一个变量表。
/// </summary>
Task<bool> DeleteVariableTableAsync(int id);
/// <summary>
/// 在内存中添加变量表
/// </summary>
void AddVariableTableToMemory(VariableTableDto variableTableDto);
/// <summary>
/// 在内存中更新变量表
/// </summary>
void UpdateVariableTableInMemory(VariableTableDto variableTableDto);
/// <summary>
/// 在内存中删除变量表
/// </summary>
void RemoveVariableTableFromMemory(int variableTableId);
}

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

@@ -84,6 +84,21 @@ public class EventService : IEventService
#endregion
#region 变量事件
/// <summary>
/// 变量表改变事件
/// </summary>
public event EventHandler<VariableTableChangedEventArgs> OnVariableTableChanged;
/// <summary>
/// 触发变量表改变事件
/// </summary>
/// <param name="sender">事件发送者</param>
/// <param name="e">变量表改变事件参数</param>
public void RaiseVariableTableChanged(object sender, VariableTableChangedEventArgs e)
{
OnVariableTableChanged?.Invoke(sender, e);
}
/// <summary>
/// 变量值改变事件
/// </summary>

155
DMS.Application/Services/Management/VariableTableManagementService.cs
View File

@@ -15,17 +15,20 @@ public class VariableTableManagementService : IVariableTableManagementService
{
private readonly IVariableTableAppService _variableTableAppService;
private readonly IAppDataStorageService _appDataStorageService;
private readonly IEventService _eventService;
/// <summary>
/// 当变量表数据发生变化时触发
/// </summary>
public event EventHandler<VariableTableChangedEventArgs> OnVariableTableChanged;
public VariableTableManagementService(IVariableTableAppService variableTableAppService,IAppDataStorageService appDataStorageService
)
public VariableTableManagementService(IVariableTableAppService variableTableAppService,
IAppDataStorageService appDataStorageService,
IEventService eventService)
{
_variableTableAppService = variableTableAppService;
_appDataStorageService = appDataStorageService;
_eventService = eventService;
}
/// <summary>
@@ -49,7 +52,42 @@ public class VariableTableManagementService : IVariableTableManagementService
/// </summary>
public async Task<CreateVariableTableWithMenuDto> CreateVariableTableAsync(CreateVariableTableWithMenuDto dto)
{
return await _variableTableAppService.CreateVariableTableAsync(dto);
var result = await _variableTableAppService.CreateVariableTableAsync(dto);
// 创建成功后，将变量表添加到内存中
if (result?.VariableTable != null)
{
// 添加null检查
if (result.VariableTable == null)
return result;
DeviceDto deviceDto = null;
if (_appDataStorageService.Devices != null &&
_appDataStorageService.Devices.TryGetValue(result.VariableTable.DeviceId, out var device))
{
deviceDto = device;
// 确保VariableTables不为null
if (device.VariableTables == null)
device.VariableTables = new List<VariableTableDto>();
device.VariableTables.Add(result.VariableTable);
// 确保Device属性不为null
if (result.VariableTable != null)
result.VariableTable.Device = device;
}
// 确保_variableTables和result.VariableTable不为null
if (_appDataStorageService.VariableTables.TryAdd(result.VariableTable.Id, result.VariableTable))
{
_eventService.RaiseVariableTableChanged(this, new VariableTableChangedEventArgs(
DataChangeType.Added,
result.VariableTable,
deviceDto));
}
}
return result;
}
/// <summary>
@@ -57,7 +95,25 @@ public class VariableTableManagementService : IVariableTableManagementService
/// </summary>
public async Task<int> UpdateVariableTableAsync(VariableTableDto variableTableDto)
{
return await _variableTableAppService.UpdateVariableTableAsync(variableTableDto);
var result = await _variableTableAppService.UpdateVariableTableAsync(variableTableDto);
// 更新成功后，更新内存中的变量表
if (result > 0 && variableTableDto != null)
{
DeviceDto deviceDto = null;
if (_appDataStorageService.Devices.TryGetValue(variableTableDto.DeviceId, out var device))
{
deviceDto = device;
}
_appDataStorageService.VariableTables.AddOrUpdate(variableTableDto.Id, variableTableDto, (key, oldValue) => variableTableDto);
_eventService.RaiseVariableTableChanged(this, new VariableTableChangedEventArgs(
DataChangeType.Updated,
variableTableDto,
deviceDto));
}
return result;
}
/// <summary>
@@ -65,82 +121,33 @@ public class VariableTableManagementService : IVariableTableManagementService
/// </summary>
public async Task<bool> DeleteVariableTableAsync(int id)
{
return await _variableTableAppService.DeleteVariableTableAsync(id);
}
/// <summary>
/// 在内存中添加变量表
/// </summary>
public void AddVariableTableToMemory(VariableTableDto variableTableDto)
{
// 添加null检查
if (variableTableDto == null)
return;
DeviceDto deviceDto = null;
if (_appDataStorageService.Devices != null &&
_appDataStorageService.Devices.TryGetValue(variableTableDto.DeviceId, out var device))
var variableTable = await _variableTableAppService.GetVariableTableByIdAsync(id); // 获取变量表信息用于内存删除
var result = await _variableTableAppService.DeleteVariableTableAsync(id);
// 删除成功后，从内存中移除变量表
if (result && variableTable != null)
{
deviceDto = device;
// 确保VariableTables不为null
if (device.VariableTables == null)
device.VariableTables = new List<VariableTableDto>();
device.VariableTables.Add(variableTableDto);
// 确保Device属性不为null
if (variableTableDto != null)
variableTableDto.Device = device;
}
// 确保_variableTables和variableTableDto不为null
if (_appDataStorageService.VariableTables.TryAdd(variableTableDto.Id, variableTableDto))
if (_appDataStorageService.VariableTables.TryRemove(id, out var variableTableDto))
{
OnVariableTableChanged?.Invoke(this, new VariableTableChangedEventArgs(
DataChangeType.Added,
variableTableDto,
deviceDto));
DeviceDto deviceDto = null;
if (variableTableDto != null && _appDataStorageService.Devices.TryGetValue(variableTableDto.DeviceId, out var device))
{
deviceDto = device;
if (device.VariableTables != null)
device.VariableTables.Remove(variableTableDto);
}
_eventService.RaiseVariableTableChanged(this, new VariableTableChangedEventArgs(
DataChangeType.Deleted,
variableTableDto,
deviceDto));
}
}
/// <summary>
/// 在内存中更新变量表
/// </summary>
public void UpdateVariableTableInMemory(VariableTableDto variableTableDto)
{
DeviceDto deviceDto = null;
if (_appDataStorageService.Devices.TryGetValue(variableTableDto.DeviceId, out var device))
{
deviceDto = device;
}
_appDataStorageService.VariableTables.AddOrUpdate(variableTableDto.Id, variableTableDto, (key, oldValue) => variableTableDto);
OnVariableTableChanged?.Invoke(this,new VariableTableChangedEventArgs(
DataChangeType.Updated,
variableTableDto,
deviceDto));
return result;
}
/// <summary>
/// 在内存中删除变量表
/// </summary>
public void RemoveVariableTableFromMemory(int variableTableId)
{
if (_appDataStorageService.VariableTables.TryRemove(variableTableId, out var variableTableDto))
{
DeviceDto deviceDto = null;
if (variableTableDto != null && _appDataStorageService.Devices.TryGetValue(variableTableDto.DeviceId, out var device))
{
deviceDto = device;
device.VariableTables.Remove(variableTableDto);
}
OnVariableTableChanged?.Invoke(this,new VariableTableChangedEventArgs(
DataChangeType.Deleted,
variableTableDto,
deviceDto));
}
}
}

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

@@ -2,6 +2,7 @@ using System;
using System.Collections.Concurrent;
using System.Threading;
using System.Threading.Tasks;
using DMS.Application.Events;
using DMS.Application.Interfaces;
using DMS.Core.Events;
using DMS.Core.Models;

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

@@ -1,6 +1,7 @@
using System.Collections.Concurrent;
using System.Diagnostics;
using DMS.Application.DTOs;
using DMS.Application.Events;
using DMS.Application.Interfaces;
using DMS.Core.Enums;
using DMS.Core.Events;

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

@@ -121,7 +121,7 @@ public class DeviceDataService : IDeviceDataService
if (addDto.VariableTable != null)
{
await _variableDataService.AddVariableTableToView(addDto.VariableTable);
_appDataCenterService.VariableTableManagementService.AddVariableTableToMemory(addDto.VariableTable);
// 添加变量表到内存的操作现在在服务内部完成，无需额外调用
if (addDto.VariableTable != null && addDto.VariableTableMenu != null)
{

5
DMS.WPF/Services/VariableDataService.cs
View File

@@ -79,8 +79,7 @@ public class VariableDataService : IVariableDataService
var variableTableDto = _mapper.Map<VariableTableDto>(variableTable);
if (await _appDataCenterService.VariableTableManagementService.UpdateVariableTableAsync(variableTableDto) > 0)
{
_appDataCenterService.VariableTableManagementService.UpdateVariableTableInMemory(variableTableDto);
// 更新数据库后会自动更新内存，无需额外操作
return true;
}
@@ -111,8 +110,6 @@ public class VariableDataService : IVariableDataService
_dataStorageService.Variables.Remove(variable.Id);
}
_appDataCenterService.VariableTableManagementService.RemoveVariableTableFromMemory(variableTable.Id);
// 删除变量表
_dataStorageService.VariableTables.Remove(variableTable.Id);
variableTable.Device.VariableTables.Remove(variableTable);

5
DMS.WPF/Services/VariableTableDataService.cs
View File

@@ -57,7 +57,7 @@ public class VariableTableDataService : IVariableTableDataService
_menuDataService.AddMenuItem(_mapper.Map<MenuItemViewModel>(resDto.Menu));
}
_appDataCenterService.VariableTableManagementService.AddVariableTableToMemory(variableTableDto);
// 添加变量表到内存的操作现在在服务内部完成，无需额外调用
// var device = _deviceDataService.Devices.FirstOrDefault(d => d.Id == variableTableDto.DeviceId);
// if (device != null)
@@ -82,7 +82,7 @@ public class VariableTableDataService : IVariableTableDataService
var variableTableDto = _mapper.Map<VariableTableDto>(variableTable);
if (await _appDataCenterService.VariableTableManagementService.UpdateVariableTableAsync(variableTableDto) > 0)
{
_appDataCenterService.VariableTableManagementService.UpdateVariableTableInMemory(variableTableDto);
// 更新数据库后会自动更新内存，无需额外操作
var menu = _dataStorageService.Menus.FirstOrDefault(m =>
m.MenuType == MenuType.VariableTableMenu &&
@@ -119,7 +119,6 @@ public class VariableTableDataService : IVariableTableDataService
_dataStorageService.Variables.Remove(variable.Id);
}
_appDataCenterService.VariableTableManagementService.RemoveVariableTableFromMemory(variableTable.Id);
// 删除变量表界面相关的菜单
var variableTableMenu

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

@@ -2,6 +2,7 @@
using System.Collections.ObjectModel;
using CommunityToolkit.Mvvm.ComponentModel;
using DMS.Application.Events;
using DMS.Application.Interfaces;
using DMS.Core.Enums;
using DMS.Core.Events;