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

refactor:完成重构设备的添加，删除，更新。

Browse Source
This commit is contained in:
David P.G
2025-10-22 14:06:16 +08:00
parent e995ec7207
commit 54d040b45f
76 changed files with 1028 additions and 1161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,7 +14,7 @@ namespace DMS.Application.Services.Management;
public class VariableTableManagementService : IVariableTableManagementService
{
private readonly IVariableTableAppService _variableTableAppService;
private readonly IAppStorageService _appStorageService;
private readonly IAppDataService _appDataService;
private readonly IEventService _eventService;
/// <summary>
@@ -23,11 +23,11 @@ public class VariableTableManagementService : IVariableTableManagementService
public event EventHandler<VariableTableChangedEventArgs> OnVariableTableChanged;
public VariableTableManagementService(IVariableTableAppService variableTableAppService,
IAppStorageService appStorageService,
IAppDataService appStorageService,
IEventService eventService)
{
_variableTableAppService = variableTableAppService;
_appStorageService = appStorageService;
_appDataService = appStorageService;
_eventService = eventService;
}
@@ -58,8 +58,8 @@ public class VariableTableManagementService : IVariableTableManagementService
if (result?.VariableTable != null)
{
// 添加null检查
if (_appStorageService.Devices != null &&
_appStorageService.Devices.TryGetValue(result.VariableTable.DeviceId, out var device))
if (_appDataService.Devices != null &&
_appDataService.Devices.TryGetValue(result.VariableTable.DeviceId, out var device))
{
// 确保VariableTables不为null
if (device.VariableTables == null)
@@ -73,7 +73,7 @@ public class VariableTableManagementService : IVariableTableManagementService
}
// 确保_variableTables和result.VariableTable不为null
if (_appStorageService.VariableTables.TryAdd(result.VariableTable.Id, result.VariableTable))
if (_appDataService.VariableTables.TryAdd(result.VariableTable.Id, result.VariableTable))
{
_eventService.RaiseVariableTableChanged(this, new VariableTableChangedEventArgs(
DataChangeType.Added,
@@ -94,7 +94,7 @@ public class VariableTableManagementService : IVariableTableManagementService
// 更新成功后，更新内存中的变量表
if (result > 0 && variableTable != null)
{
_appStorageService.VariableTables.AddOrUpdate(variableTable.Id, variableTable, (key, oldValue) => variableTable);
_appDataService.VariableTables.AddOrUpdate(variableTable.Id, variableTable, (key, oldValue) => variableTable);
_eventService.RaiseVariableTableChanged(this, new VariableTableChangedEventArgs(
DataChangeType.Updated,
variableTable));
@@ -113,9 +113,9 @@ public class VariableTableManagementService : IVariableTableManagementService
// 删除成功后，从内存中移除变量表
if (result )
{
if (_appStorageService.VariableTables.TryRemove(id, out var variableTable))
if (_appDataService.VariableTables.TryRemove(id, out var variableTable))
{
if (variableTable != null && _appStorageService.Devices.TryGetValue(variableTable.DeviceId, out var device))
if (variableTable != null && _appDataService.Devices.TryGetValue(variableTable.DeviceId, out var device))
{
if (device.VariableTables != null)
device.VariableTables.Remove(variableTable);
@@ -136,12 +136,12 @@ public class VariableTableManagementService : IVariableTableManagementService
/// </summary>
public async Task LoadAllVariableTablesAsync()
{
_appStorageService.VariableTables.Clear();
_appDataService.VariableTables.Clear();
var variableTables = await _variableTableAppService.GetAllVariableTablesAsync();
// 建立变量表与变量的关联
foreach (var variableTable in variableTables)
{
if (_appStorageService.Devices.TryGetValue(variableTable.DeviceId, out var device))
if (_appDataService.Devices.TryGetValue(variableTable.DeviceId, out var device))
{
variableTable.Device = device;
if (device.VariableTables == null)
@@ -150,7 +150,7 @@ public class VariableTableManagementService : IVariableTableManagementService
}
// 将变量表添加到安全字典
_appStorageService.VariableTables.TryAdd(variableTable.Id, variableTable);
_appDataService.VariableTables.TryAdd(variableTable.Id, variableTable);
}
}