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

refactor: 将VariableMqttAlias改为MqttAlias,将VariableMqttAliasItemViewModel改为MqttAliasItem

Browse Source
This commit is contained in:
David P.G
2025-10-06 17:39:03 +08:00
parent a3af5dd0cc
commit 6cff70cd87
26 changed files with 50 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DMS.Application/DTOs/MqttServerDto.cs
View File

@@ -27,5 +27,5 @@ public class MqttServerDto
public string MessageHeader { get; set; }
public string MessageContent { get; set; }
public string MessageFooter { get; set; }
public List<VariableMqttAlias> VariableAliases { get; set; } = new();
public List<MqttAlias> VariableAliases { get; set; } = new();
}

2
DMS.Application/DTOs/VariableDto.cs
View File

@@ -17,7 +17,7 @@ public class VariableDto
public double NumericValue { get; set; }
public string DisplayValue { get; set; }
public VariableTableDto? VariableTable { get; set; }
public List<VariableMqttAlias>? MqttAliases { get; set; } = new List<VariableMqttAlias>();
public List<MqttAlias>? MqttAliases { get; set; } = new List<MqttAlias>();
public SignalType SignalType { get; set; }
public int PollingInterval { get; set; }
public bool IsActive { get; set; }

2
DMS.Application/Interfaces/Database/IMqttAliasAppService.cs
View File

@@ -12,7 +12,7 @@ public interface IMqttAliasAppService
/// <summary>
/// 异步获取指定变量的所有MQTT别名关联。
/// </summary>
Task<List<VariableMqttAlias>> GetAliasesForVariableAsync(int variableId);
Task<List<MqttAlias>> GetAliasesForVariableAsync(int variableId);
/// <summary>
/// 异步为变量分配或更新一个MQTT别名。

2
DMS.Application/Interfaces/IAppDataStorageService.cs
View File

@@ -44,7 +44,7 @@ public interface IAppDataStorageService
/// <summary>
/// 安全字典，用于存储所有MQTT变量别名的数据
/// </summary>
ConcurrentDictionary<int, VariableMqttAlias> VariableMqttAliases { get; }
ConcurrentDictionary<int, MqttAlias> VariableMqttAliases { get; }
/// <summary>
/// 安全字典，用于存储所有触发器定义数据

2
DMS.Application/Services/AppDataStorageService.cs
View File

@@ -41,7 +41,7 @@ public class AppDataStorageService : IAppDataStorageService
/// <summary>
/// 安全字典，用于存储所有MQTT变量别名的数据
/// </summary>
public ConcurrentDictionary<int, VariableMqttAlias> VariableMqttAliases { get; } = new();
public ConcurrentDictionary<int, MqttAlias> VariableMqttAliases { get; } = new();

4
DMS.Application/Services/Database/MqttAliasAppService.cs
View File

@@ -29,7 +29,7 @@ public class MqttAliasAppService : IMqttAliasAppService
/// <summary>
/// 异步获取指定变量的所有MQTT别名关联。
/// </summary>
public async Task<List<VariableMqttAlias>> GetAliasesForVariableAsync(int variableId)
public async Task<List<MqttAlias>> GetAliasesForVariableAsync(int variableId)
{
// 从仓储获取别名，并确保加载了关联的MqttServer信息
var aliases = await _repoManager.VariableMqttAliases.GetAliasesForVariableAsync(variableId);
@@ -61,7 +61,7 @@ public class MqttAliasAppService : IMqttAliasAppService
var variable = await _repoManager.Variables.GetByIdAsync(variableId);
var mqttServer = await _repoManager.MqttServers.GetByIdAsync(mqttServerId);
var newAlias = new VariableMqttAlias
var newAlias = new MqttAlias
{
VariableId = variableId,
MqttServerId = mqttServerId,

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

@@ -156,7 +156,7 @@ namespace DMS.Application.Services.Database
await _repositoryManager.Variables.DeleteByVariableTableIdAsync(id);
// 删除关联的MQTT别名
// await _repositoryManager.VariableMqttAlias.DeleteByVariableTableIdAsync(id);
// await _repositoryManager.MqttAlias.DeleteByVariableTableIdAsync(id);
// 删除关联的菜单树
await _repositoryManager.Menus.DeleteMenuTreeByTargetIdAsync(MenuType.VariableTableMenu, id);