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

8
DMS.Core/Interfaces/Repositories/IVariableMqttAliasRepository.cs
View File

@@ -4,22 +4,22 @@ using System.Threading.Tasks;
namespace DMS.Core.Interfaces.Repositories
{
public interface IVariableMqttAliasRepository : IBaseRepository<VariableMqttAlias>
public interface IVariableMqttAliasRepository : IBaseRepository<MqttAlias>
{
/// <summary>
/// 异步获取指定变量的所有MQTT别名关联。
/// </summary>
Task<List<VariableMqttAlias>> GetAliasesForVariableAsync(int variableId);
Task<List<MqttAlias>> GetAliasesForVariableAsync(int variableId);
/// <summary>
/// 异步根据变量和服务器获取别名关联。
/// </summary>
Task<VariableMqttAlias> GetByVariableAndServerAsync(int variableId, int mqttServerId);
Task<MqttAlias> GetByVariableAndServerAsync(int variableId, int mqttServerId);
/// <summary>
/// 异步获取所有变量与MQTT别名关联。
/// </summary>
/// <returns>包含所有变量与MQTT别名关联实体的列表。</returns>
Task<List<VariableMqttAlias>> GetAllAsync();
Task<List<MqttAlias>> GetAllAsync();
}
}

4
DMS.Core/Interfaces/Services/IMqttServiceManager.cs
View File

@@ -25,7 +25,7 @@ namespace DMS.Core.Interfaces.Services
/// <summary>
/// 更新MQTT服务器变量别名
/// </summary>
void UpdateVariableMqttAliases(int mqttServerId, List<VariableMqttAlias> variableMqttAliases);
void UpdateVariableMqttAliases(int mqttServerId, List<MqttAlias> variableMqttAliases);
/// <summary>
/// 获取MQTT服务器连接状态
@@ -55,7 +55,7 @@ namespace DMS.Core.Interfaces.Services
/// <summary>
/// 发布变量数据到MQTT服务器
/// </summary>
Task PublishVariableDataAsync(VariableMqttAlias variableMqtt, CancellationToken cancellationToken = default);
Task PublishVariableDataAsync(MqttAlias variableMqtt, CancellationToken cancellationToken = default);
/// <summary>
/// 发布批量变量数据到MQTT服务器

2
DMS.Core/Models/VariableMqttAlias.cs → DMS.Core/Models/MqttAlias.cs
View File

@@ -4,7 +4,7 @@ using DMS.Core.Models;
/// 领域模型：代表一个变量到一个MQTT服务器的特定关联，包含专属别名。
/// 这是一个关联实体，用于解决多对多关系中需要额外属性（别名）的问题。
/// </summary>
public class VariableMqttAlias
public class MqttAlias
{
/// <summary>
/// 唯一标识符。

2
DMS.Core/Models/MqttServer.cs
View File

@@ -68,5 +68,5 @@ public class MqttServer
/// <summary>
/// 与此服务器关联的所有变量别名。通过此集合可以反向查找关联的变量。
/// </summary>
public List<VariableMqttAlias> VariableAliases { get; set; } = new();
public List<MqttAlias> VariableAliases { get; set; } = new();
}

2
DMS.Core/Models/Variable.cs
View File

@@ -57,7 +57,7 @@ public class Variable
/// <summary>
/// 此变量的所有MQTT发布别名关联。一个变量可以关联多个MQTT服务器，每个关联可以有独立的别名。
/// </summary>
public List<VariableMqttAlias> MqttAliases { get; set; } = new();
public List<MqttAlias> MqttAliases { get; set; } = new();
/// <summary>
/// OPC UA NodeId (仅当 Protocol 为 OpcUa 时有效)。