主要变更:

1. 将内存操作和事件触发逻辑合并到数据库操作方法中
   2. 删除了独立的内存操作方法(AddVariableToMemory、UpdateVariableInMemory、RemoveVariableFromMemory)
   3. 更新了接口定义,移除了内存操作方法
   4. 确保了数据库操作和内存状态保持同步
This commit is contained in:
2025-10-01 19:21:48 +08:00
parent e43c0df1cf
commit 226c6c7387
2 changed files with 100 additions and 72 deletions

View File

@@ -39,19 +39,4 @@ public interface IVariableManagementService
/// 异步批量删除变量。 /// 异步批量删除变量。
/// </summary> /// </summary>
Task<bool> DeleteVariablesAsync(List<int> ids); Task<bool> DeleteVariablesAsync(List<int> ids);
/// <summary>
/// 在内存中添加变量
/// </summary>
void AddVariableToMemory(VariableDto variableDto, ConcurrentDictionary<int, VariableTableDto> variableTables);
/// <summary>
/// 在内存中更新变量
/// </summary>
void UpdateVariableInMemory(VariableDto variableDto, ConcurrentDictionary<int, VariableTableDto> variableTables);
/// <summary>
/// 在内存中删除变量
/// </summary>
void RemoveVariableFromMemory(int variableId, ConcurrentDictionary<int, VariableTableDto> variableTables);
} }

View File

@@ -51,7 +51,27 @@ public class VariableManagementService : IVariableManagementService
/// </summary> /// </summary>
public async Task<VariableDto> CreateVariableAsync(VariableDto variableDto) public async Task<VariableDto> CreateVariableAsync(VariableDto variableDto)
{ {
return await _variableAppService.CreateVariableAsync(variableDto); var result = await _variableAppService.CreateVariableAsync(variableDto);
// 创建成功后,将变量添加到内存中
if (result != null)
{
VariableTableDto variableTableDto = null;
if (_appDataStorageService.VariableTables.TryGetValue(result.VariableTableId, out var variableTable))
{
variableTableDto = variableTable;
result.VariableTable = variableTableDto;
variableTable.Variables.Add(result);
}
if (_appDataStorageService.Variables.TryAdd(result.Id, result))
{
_eventService.RaiseVariableChanged(
this, new VariableChangedEventArgs(DataChangeType.Added, result, variableTableDto));
}
}
return result;
} }
/// <summary> /// <summary>
@@ -59,61 +79,13 @@ public class VariableManagementService : IVariableManagementService
/// </summary> /// </summary>
public async Task<int> UpdateVariableAsync(VariableDto variableDto) public async Task<int> UpdateVariableAsync(VariableDto variableDto)
{ {
return await _variableAppService.UpdateVariableAsync(variableDto); var result = await _variableAppService.UpdateVariableAsync(variableDto);
}
/// <summary> // 更新成功后,更新内存中的变量
/// 异步批量更新变量。 if (result > 0 && variableDto != null)
/// </summary>
public async Task<int> UpdateVariablesAsync(List<VariableDto> variableDtos)
{
return await _variableAppService.UpdateVariablesAsync(variableDtos);
}
/// <summary>
/// 异步删除一个变量。
/// </summary>
public async Task<bool> DeleteVariableAsync(int id)
{
return await _variableAppService.DeleteVariableAsync(id);
}
/// <summary>
/// 异步批量删除变量。
/// </summary>
public async Task<bool> DeleteVariablesAsync(List<int> ids)
{
return await _variableAppService.DeleteVariablesAsync(ids);
}
/// <summary>
/// 在内存中添加变量
/// </summary>
public void AddVariableToMemory(VariableDto variableDto, ConcurrentDictionary<int, VariableTableDto> variableTables)
{ {
VariableTableDto variableTableDto = null; VariableTableDto variableTableDto = null;
if (variableTables.TryGetValue(variableDto.VariableTableId, out var variableTable)) if (_appDataStorageService.VariableTables.TryGetValue(variableDto.VariableTableId, out var variableTable))
{
variableTableDto = variableTable;
variableDto.VariableTable = variableTableDto;
variableTable.Variables.Add(variableDto);
}
if (_appDataStorageService.Variables.TryAdd(variableDto.Id, variableDto))
{
_eventService.RaiseVariableChanged(
this, new VariableChangedEventArgs(DataChangeType.Added, variableDto, variableTableDto));
}
}
/// <summary>
/// 在内存中更新变量
/// </summary>
public void UpdateVariableInMemory(VariableDto variableDto,
ConcurrentDictionary<int, VariableTableDto> variableTables)
{
VariableTableDto variableTableDto = null;
if (variableTables.TryGetValue(variableDto.VariableTableId, out var variableTable))
{ {
variableTableDto = variableTable; variableTableDto = variableTable;
} }
@@ -123,15 +95,51 @@ public class VariableManagementService : IVariableManagementService
this, new VariableChangedEventArgs(DataChangeType.Updated, variableDto, variableTableDto)); this, new VariableChangedEventArgs(DataChangeType.Updated, variableDto, variableTableDto));
} }
return result;
}
/// <summary> /// <summary>
/// 在内存中删除变量 /// 异步批量更新变量
/// </summary> /// </summary>
public void RemoveVariableFromMemory(int variableId, ConcurrentDictionary<int, VariableTableDto> variableTables) public async Task<int> UpdateVariablesAsync(List<VariableDto> variableDtos)
{ {
if (_appDataStorageService.Variables.TryRemove(variableId, out var variableDto)) var result = await _variableAppService.UpdateVariablesAsync(variableDtos);
// 批量更新成功后,更新内存中的变量
if (result > 0 && variableDtos != null)
{
foreach (var variableDto in variableDtos)
{ {
VariableTableDto variableTableDto = null; VariableTableDto variableTableDto = null;
if (variableDto != null && variableTables.TryGetValue(variableDto.VariableTableId, out var variableTable)) if (_appDataStorageService.VariableTables.TryGetValue(variableDto.VariableTableId, out var variableTable))
{
variableTableDto = variableTable;
}
_appDataStorageService.Variables.AddOrUpdate(variableDto.Id, variableDto, (key, oldValue) => variableDto);
_eventService.RaiseVariableChanged(
this, new VariableChangedEventArgs(DataChangeType.Updated, variableDto, variableTableDto));
}
}
return result;
}
/// <summary>
/// 异步删除一个变量。
/// </summary>
public async Task<bool> DeleteVariableAsync(int id)
{
var variable = await _variableAppService.GetVariableByIdAsync(id); // 获取变量信息用于内存删除
var result = await _variableAppService.DeleteVariableAsync(id);
// 删除成功后,从内存中移除变量
if (result && variable != null)
{
if (_appDataStorageService.Variables.TryRemove(id, out var variableDto))
{
VariableTableDto variableTableDto = null;
if (variableDto != null && _appDataStorageService.VariableTables.TryGetValue(variableDto.VariableTableId, out var variableTable))
{ {
variableTableDto = variableTable; variableTableDto = variableTable;
variableTable.Variables.Remove(variableDto); variableTable.Variables.Remove(variableDto);
@@ -141,4 +149,39 @@ public class VariableManagementService : IVariableManagementService
this, new VariableChangedEventArgs(DataChangeType.Deleted, variableDto, variableTableDto)); this, new VariableChangedEventArgs(DataChangeType.Deleted, variableDto, variableTableDto));
} }
} }
return result;
}
/// <summary>
/// 异步批量删除变量。
/// </summary>
public async Task<bool> DeleteVariablesAsync(List<int> ids)
{
var result = await _variableAppService.DeleteVariablesAsync(ids);
// 批量删除成功后,从内存中移除变量
if (result && ids != null)
{
foreach (var id in ids)
{
if (_appDataStorageService.Variables.TryRemove(id, out var variableDto))
{
VariableTableDto variableTableDto = null;
if (variableDto != null && _appDataStorageService.VariableTables.TryGetValue(variableDto.VariableTableId, out var variableTable))
{
variableTableDto = variableTable;
variableTable.Variables.Remove(variableDto);
}
_eventService.RaiseVariableChanged(
this, new VariableChangedEventArgs(DataChangeType.Deleted, variableDto, variableTableDto));
}
}
}
return result;
}
} }