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

1. 已成功将内存操作直接合并到数据库操作方法中

Browse Source 
2. 已删除了独立的内存操作方法
   3. 已更新接口定义，去除了内存操作方法
   4. 保留了 IEventService 依赖，因为需要用于触发事件
This commit is contained in:
David P.G
2025-10-01 19:06:12 +08:00
parent e84a202438
commit 438ee0fe58
2 changed files with 26 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
DMS.Application/Interfaces/Management/IDeviceManagementService.cs
View File

@@ -37,23 +37,7 @@ public interface IDeviceManagementService
/// </summary> /// </summary>
Task ToggleDeviceActiveStateAsync(int id); Task ToggleDeviceActiveStateAsync(int id);
/// <summary>
/// 在内存中添加设备
/// 注意：此方法通常由其他操作（如CreateDeviceWithDetailsAsync）自动调用，一般不需要直接调用
/// </summary>
void AddDeviceToMemory(DeviceDto deviceDto);
/// <summary>
/// 在内存中更新设备
/// 注意：此方法通常由其他操作（如UpdateDeviceAsync）自动调用，一般不需要直接调用
/// </summary>
void UpdateDeviceInMemory(DeviceDto deviceDto);
/// <summary>
/// 在内存中删除设备
/// 注意：此方法通常由其他操作（如DeleteDeviceByIdAsync）自动调用，一般不需要直接调用
/// </summary>
void RemoveDeviceFromMemory(int deviceId);
} }

69
DMS.Application/Services/Management/DeviceManagementService.cs
View File

@@ -49,7 +49,10 @@ public class DeviceManagementService : IDeviceManagementService
// 创建成功后，将设备添加到内存中 // 创建成功后，将设备添加到内存中
if (result?.Device != null) if (result?.Device != null)
{ {
AddDeviceToMemory(result.Device); if (_appDataStorageService.Devices.TryAdd(result.Device.Id, result.Device))
{
_eventService.RaiseDeviceChanged(this, new DeviceChangedEventArgs(DataChangeType.Added, result.Device));
}
} }
return result; return result;
@@ -65,7 +68,8 @@ public class DeviceManagementService : IDeviceManagementService
// 更新成功后，更新内存中的设备 // 更新成功后，更新内存中的设备
if (result > 0 && deviceDto != null) if (result > 0 && deviceDto != null)
{ {
UpdateDeviceInMemory(deviceDto); _appDataStorageService.Devices.AddOrUpdate(deviceDto.Id, deviceDto, (key, oldValue) => deviceDto);
_eventService.RaiseDeviceChanged(this, new DeviceChangedEventArgs(DataChangeType.Updated, deviceDto));
} }
return result; return result;
@@ -82,7 +86,22 @@ public class DeviceManagementService : IDeviceManagementService
// 删除成功后，从内存中移除设备 // 删除成功后，从内存中移除设备
if (result && device != null) if (result && device != null)
{ {
RemoveDeviceFromMemory(deviceId); if (_appDataStorageService.Devices.TryGetValue(deviceId, out var deviceDto))
{
foreach (var variableTable in deviceDto.VariableTables)
{
foreach (var variable in variableTable.Variables)
{
_appDataStorageService.Variables.TryRemove(variable.Id, out _);
}
_appDataStorageService.VariableTables.TryRemove(variableTable.Id, out _);
}
_appDataStorageService.Devices.TryRemove(deviceId, out _);
_eventService.RaiseDeviceChanged(this, new DeviceChangedEventArgs(DataChangeType.Deleted, deviceDto));
}
} }
return result; return result;
@@ -99,52 +118,12 @@ public class DeviceManagementService : IDeviceManagementService
var device = await _deviceAppService.GetDeviceByIdAsync(id); var device = await _deviceAppService.GetDeviceByIdAsync(id);
if (device != null) if (device != null)
{ {
UpdateDeviceInMemory(device); _appDataStorageService.Devices.AddOrUpdate(device.Id, device, (key, oldValue) => device);
_eventService.RaiseDeviceChanged(this, new DeviceChangedEventArgs(DataChangeType.Updated, device));
} }
} }
/// <summary>
/// 在内存中添加设备
/// </summary>
public void AddDeviceToMemory(DeviceDto deviceDto)
{
if (_appDataStorageService.Devices.TryAdd(deviceDto.Id, deviceDto))
{
_eventService.RaiseDeviceChanged(this, new DeviceChangedEventArgs(DataChangeType.Added, deviceDto));
}
}
/// <summary>
/// 在内存中更新设备
/// </summary>
public void UpdateDeviceInMemory(DeviceDto deviceDto)
{
_appDataStorageService.Devices.AddOrUpdate(deviceDto.Id, deviceDto, (key, oldValue) => deviceDto);
_eventService.RaiseDeviceChanged(this, new DeviceChangedEventArgs(DataChangeType.Updated, deviceDto));
}
/// <summary>
/// 在内存中删除设备
/// </summary>
public void RemoveDeviceFromMemory(int deviceId)
{
if (_appDataStorageService.Devices.TryGetValue(deviceId, out var deviceDto))
{
foreach (var variableTable in deviceDto.VariableTables)
{
foreach (var variable in variableTable.Variables)
{
_appDataStorageService.Variables.TryRemove(variable.Id, out _);
}
_appDataStorageService.VariableTables.TryRemove(variableTable.Id, out _);
}
_appDataStorageService.Devices.TryRemove(deviceId, out _);
_eventService.RaiseDeviceChanged(this, new DeviceChangedEventArgs(DataChangeType.Deleted, deviceDto));
}
}
} }