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

修改画面

Browse Source
This commit is contained in:
David P.G
2025-09-19 07:27:56 +08:00
parent ed4f9b1a0c
commit bcdb119d11
12 changed files with 354 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DMS.Application/Services/Database/DeviceAppService.cs
View File

@@ -188,6 +188,8 @@ public class DeviceAppService : IDeviceAppService
// 删除关联的变量表
await _repoManager.VariableTables.DeleteByDeviceIdAsync(deviceId);
// 删除关联的变量
await _repoManager.Variables.DeleteByVariableTableIdAsync(deviceId);
// 删除关联的菜单树
await _repoManager.Menus.DeleteMenuTreeByTargetIdAsync(MenuType.DeviceMenu,deviceId);

2
DMS.Application/Services/Database/VariableTableAppService.cs
View File

@@ -153,7 +153,7 @@ namespace DMS.Application.Services.Database
}
// 删除关联的变量
await _repositoryManager.Variables.DeleteByIdAsync(id);
await _repositoryManager.Variables.DeleteByVariableTableIdAsync(id);
// 删除关联的MQTT别名
// await _repositoryManager.VariableMqttAlias.DeleteByVariableTableIdAsync(id);

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

@@ -15,7 +15,6 @@ public class VariableTableManagementService : IVariableTableManagementService
{
private readonly IVariableTableAppService _variableTableAppService;
private readonly IAppDataStorageService _appDataStorageService;
private readonly ConcurrentDictionary<int, VariableTableDto> _variableTables;
/// <summary>
/// 当变量表数据发生变化时触发
@@ -95,16 +94,13 @@ public class VariableTableManagementService : IVariableTableManagementService
}
// 确保_variableTables和variableTableDto不为null
if (_variableTables != null && variableTableDto != null)
{
if (_variableTables.TryAdd(variableTableDto.Id, variableTableDto))
if (_appDataStorageService.VariableTables.TryAdd(variableTableDto.Id, variableTableDto))
{
OnVariableTableChanged?.Invoke(this, new VariableTableChangedEventArgs(
DataChangeType.Added,
variableTableDto,
deviceDto));
}
}
}
/// <summary>
@@ -118,7 +114,7 @@ public class VariableTableManagementService : IVariableTableManagementService
deviceDto = device;
}
_variableTables.AddOrUpdate(variableTableDto.Id, variableTableDto, (key, oldValue) => variableTableDto);
_appDataStorageService.VariableTables.AddOrUpdate(variableTableDto.Id, variableTableDto, (key, oldValue) => variableTableDto);
OnVariableTableChanged?.Invoke(this,new VariableTableChangedEventArgs(
DataChangeType.Updated,
variableTableDto,
@@ -130,7 +126,7 @@ public class VariableTableManagementService : IVariableTableManagementService
/// </summary>
public void RemoveVariableTableFromMemory(int variableTableId)
{
if (_variableTables.TryRemove(variableTableId, out var variableTableDto))
if (_appDataStorageService.VariableTables.TryRemove(variableTableId, out var variableTableDto))
{
DeviceDto deviceDto = null;
if (variableTableDto != null && _appDataStorageService.Devices.TryGetValue(variableTableDto.DeviceId, out var device))