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

145
DMS.Application/Services/Management/VariableManagementService.cs
View File

@@ -18,20 +18,20 @@ public class VariableManagementService : IVariableManagementService
private readonly IVariableAppService _variableAppService;
private readonly IEventService _eventService;
private readonly IMapper _mapper;
private readonly IAppStorageService _appStorageService;
private readonly IAppDataService _appDataService;
private readonly IDataProcessingService _dataProcessingService;
public VariableManagementService(IVariableAppService variableAppService,
IEventService eventService,
IMapper mapper,
IAppStorageService appStorageService,
IAppDataService appStorageService,
IDataProcessingService dataProcessingService)
{
_variableAppService = variableAppService;
_eventService = eventService;
_mapper = mapper;
_appStorageService = appStorageService;
_appDataService = appStorageService;
_dataProcessingService = dataProcessingService;
}
@@ -56,24 +56,24 @@ public class VariableManagementService : IVariableManagementService
/// </summary>
public async Task<Variable> CreateVariableAsync(Variable variable)
{
var result = await _variableAppService.CreateVariableAsync(variable);
var result = await _variableAppService.AddAsync(variable);
// 创建成功后，将变量添加到内存中
if (result != null)
{
if (_appStorageService.VariableTables.TryGetValue(result.VariableTableId, out var variableTable))
if (_appDataService.VariableTables.TryGetValue(result.VariableTableId, out var variableTable))
{
result.VariableTable = variableTable;
variableTable.Variables.Add(result);
}
if (_appStorageService.Variables.TryAdd(result.Id, result))
if (_appDataService.Variables.TryAdd(result.Id, result))
{
_eventService.RaiseVariableChanged(
this, new VariableChangedEventArgs(ActionChangeType.Added, result));
}
}
return result;
}
@@ -82,7 +82,7 @@ public class VariableManagementService : IVariableManagementService
/// </summary>
public async Task<int> UpdateVariableAsync(Variable variable)
{
return await UpdateVariablesAsync(new List<Variable>() { variable});
return await UpdateVariablesAsync(new List<Variable>() { variable });
}
/// <summary>
@@ -90,18 +90,18 @@ public class VariableManagementService : IVariableManagementService
/// </summary>
public async Task<int> UpdateVariablesAsync(List<Variable> variables)
{
var result = await _variableAppService.UpdateVariablesAsync(variables);
var result = await _variableAppService.UpdateAsync(variables);
// 批量更新成功后，更新内存中的变量
if (result > 0 && variables != null)
{
foreach (var variable in variables)
{
if (_appStorageService.Variables.TryGetValue(variable.Id, out var mVariable))
if (_appDataService.Variables.TryGetValue(variable.Id, out var mVariable))
{
// 比较旧值和新值，确定哪个属性发生了变化
var changedProperties = GetChangedProperties(mVariable, variable);
// 更新内存中的变量
_mapper.Map(variable, mVariable);
@@ -111,81 +111,75 @@ public class VariableManagementService : IVariableManagementService
_eventService.RaiseVariableChanged(
this, new VariableChangedEventArgs(ActionChangeType.Updated, variable, property));
}
// 如果没有任何属性发生变化，至少触发一次更新事件
if (changedProperties.Count == 0)
{
_eventService.RaiseVariableChanged(
this, new VariableChangedEventArgs(ActionChangeType.Updated, variable, VariablePropertyType.All));
this,
new VariableChangedEventArgs(ActionChangeType.Updated, variable, VariablePropertyType.All));
}
}
else
{
// 如果内存中不存在该变量，则直接添加
_appStorageService.Variables.TryAdd(variable.Id, variable);
_appDataService.Variables.TryAdd(variable.Id, variable);
_eventService.RaiseVariableChanged(
this, new VariableChangedEventArgs(ActionChangeType.Added, variable, VariablePropertyType.All));
}
}
}
return result;
}
/// <summary>
/// 异步删除一个变量。
/// </summary>
public async Task<bool> DeleteVariableAsync(int id)
public async Task<bool> DeleteAsync(Variable variable)
{
var result = await _variableAppService.DeleteVariableAsync(id);
var result = await _variableAppService.DeleteAsync(variable);
// 删除成功后，从内存中移除变量
if (result)
{
if (_appStorageService.Variables.TryRemove(id, out var variable))
if (_appDataService.Variables.TryRemove(variable.Id, out var mVariable))
{
if (variable != null && _appStorageService.VariableTables.TryGetValue(variable.VariableTableId, out var variableTable))
if (variable != null &&
_appDataService.VariableTables.TryGetValue(variable.VariableTableId, out var variableTable))
{
variableTable.Variables.Remove(variable);
}
_eventService.RaiseVariableChanged(
this, new VariableChangedEventArgs(ActionChangeType.Deleted, variable));
this, new VariableChangedEventArgs(ActionChangeType.Deleted, variable));
}
}
return result;
}
/// <summary>
/// 异步批量导入变量。
/// </summary>
public async Task<List<Variable>> BatchImportVariablesAsync(List<Variable> variables)
public async Task<List<Variable>> AddAsync(List<Variable> variables)
{
var result = await _variableAppService.BatchImportVariablesAsync(variables);
foreach (var variable in result)
{
if (_appStorageService.VariableTables.TryGetValue(variable.VariableTableId ,out var variableTable))
{
variable.VariableTable = variableTable;
}
}
var result = await _variableAppService.AddAsync(variables);
// 批量导入成功后，触发批量导入事件
if (result != null && result.Any())
{
foreach (var variable in result)
{
if (_appDataService.VariableTables.TryGetValue(variable.VariableTableId, out var variableTable))
{
variable.VariableTable = variableTable;
variableTable.Variables.Add(variable);
}
}
_eventService.RaiseBatchImportVariables(this, new BatchImportVariablesEventArgs(result));
}
return result;
}
public async Task<List<Variable>> FindExistingVariablesAsync(IEnumerable<Variable> variablesToCheck)
{
return await _variableAppService.FindExistingVariablesAsync(variablesToCheck);
return result;
}
/// <summary>
@@ -200,45 +194,45 @@ public class VariableManagementService : IVariableManagementService
if (oldVariable.Name != newVariable.Name)
changedProperties.Add(VariablePropertyType.Name);
if (oldVariable.S7Address != newVariable.S7Address)
changedProperties.Add(VariablePropertyType.S7Address);
if (oldVariable.DataType != newVariable.DataType)
changedProperties.Add(VariablePropertyType.DataType);
if (oldVariable.ConversionFormula != newVariable.ConversionFormula)
changedProperties.Add(VariablePropertyType.ConversionFormula);
if (oldVariable.OpcUaUpdateType != newVariable.OpcUaUpdateType)
changedProperties.Add(VariablePropertyType.OpcUaUpdateType);
if (oldVariable.MqttAliases != newVariable.MqttAliases)
changedProperties.Add(VariablePropertyType.MqttAlias);
if (oldVariable.Description != newVariable.Description)
changedProperties.Add(VariablePropertyType.Description);
if (oldVariable.VariableTableId != newVariable.VariableTableId)
changedProperties.Add(VariablePropertyType.VariableTableId);
if (oldVariable.DataValue != newVariable.DataValue)
changedProperties.Add(VariablePropertyType.Value);
if (oldVariable.IsActive != newVariable.IsActive)
changedProperties.Add(VariablePropertyType.IsActive);
if (oldVariable.IsHistoryEnabled != newVariable.IsHistoryEnabled)
changedProperties.Add(VariablePropertyType.IsHistoryEnabled);
if (oldVariable.OpcUaNodeId != newVariable.OpcUaNodeId)
changedProperties.Add(VariablePropertyType.OpcUaNodeId);
if (oldVariable.PollingInterval != newVariable.PollingInterval)
changedProperties.Add(VariablePropertyType.PollingInterval);
if (oldVariable.SignalType != newVariable.SignalType)
changedProperties.Add(VariablePropertyType.SignalType);
if (oldVariable.Protocol != newVariable.Protocol)
changedProperties.Add(VariablePropertyType.Protocol);
@@ -249,52 +243,45 @@ public class VariableManagementService : IVariableManagementService
/// <summary>
/// 异步批量删除变量。
/// </summary>
public async Task<bool> DeleteVariablesAsync(List<int> ids)
public async Task<bool> DeleteAsync(List<Variable> variables)
{
var result = await _variableAppService.DeleteVariablesAsync(ids);
// 批量删除成功后，从内存中移除变量
if (result && ids != null)
{
foreach (var id in ids)
{
if (_appStorageService.Variables.TryRemove(id, out var variable))
{
if (variable != null && _appStorageService.VariableTables.TryGetValue(variable.VariableTableId, out var variableTable))
{
variableTable.Variables.Remove(variable);
}
var result = await _variableAppService.DeleteAsync(variables);
_eventService.RaiseVariableChanged(
this, new VariableChangedEventArgs(ActionChangeType.Deleted, variable));
}
// 批量删除成功后，从内存中移除变量
if (result)
{
foreach (var variable in variables)
{
variable.VariableTable.Variables.Remove(variable);
_appDataService.Variables.TryRemove(variable.Id, out _);
_eventService.RaiseVariableChanged(
this, new VariableChangedEventArgs(ActionChangeType.Deleted, variable));
}
}
return result;
}
/// <summary>
/// 异步加载所有变量数据到内存中。
/// </summary>
public async Task LoadAllVariablesAsync()
{
_appStorageService.Variables.Clear();
_appDataService.Variables.Clear();
var variables = await _variableAppService.GetAllVariablesAsync();
// 将变量添加到安全字典
foreach (var variable in variables)
{
if (_appStorageService.VariableTables.TryGetValue(variable.VariableTableId,
out var variableTable))
if (_appDataService.VariableTables.TryGetValue(variable.VariableTableId,
out var variableTable))
{
variable.VariableTable = variableTable;
variableTable.Variables.Add(variable);
}
_appStorageService.Variables.TryAdd(variable.Id, variable);
_appDataService.Variables.TryAdd(variable.Id, variable);
}
}
}