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.Infrastructure/Interfaces/Services/IMqttBackgroundService.cs
View File

@@ -44,7 +44,7 @@ namespace DMS.Infrastructure.Interfaces.Services
/// <summary>
/// 发布变量数据到MQTT服务器
/// </summary>
Task PublishVariableDataAsync(VariableMqttAlias variableMqtt, CancellationToken cancellationToken = default);
Task PublishVariableDataAsync(MqttAlias variableMqtt, CancellationToken cancellationToken = default);
/// <summary>
/// 发布批量变量数据到MQTT服务器

2
DMS.Infrastructure/Profiles/MappingProfile.cs
View File

@@ -30,7 +30,7 @@ public class MappingProfile : Profile
CreateMap<DbMqttServer, MqttServer>()
.ForMember(dest => dest.VariableAliases, opt => opt.Ignore())
.ReverseMap();
CreateMap<DbVariableMqttAlias, VariableMqttAlias>()
CreateMap<DbVariableMqttAlias, MqttAlias>()
.ReverseMap();
CreateMap<DbMenu, MenuBean>().ReverseMap();

30
DMS.Infrastructure/Repositories/VariableMqttAliasRepository.cs
View File

@@ -36,20 +36,20 @@ public class VariableMqttAliasRepository : BaseRepository<DbVariableMqttAlias>,
/// </summary>
/// <param name="id">变量与MQTT别名关联的唯一标识符。</param>
/// <returns>对应的变量与MQTT别名关联实体，如果不存在则为null。</returns>
public async Task<VariableMqttAlias> GetByIdAsync(int id)
public async Task<MqttAlias> GetByIdAsync(int id)
{
var dbVariableMqttAlias = await base.GetByIdAsync(id);
return _mapper.Map<VariableMqttAlias>(dbVariableMqttAlias);
return _mapper.Map<MqttAlias>(dbVariableMqttAlias);
}
/// <summary>
/// 异步获取所有变量与MQTT别名关联。
/// </summary>
/// <returns>包含所有变量与MQTT别名关联实体的列表。</returns>
public async Task<List<VariableMqttAlias>> GetAllAsync()
public async Task<List<MqttAlias>> GetAllAsync()
{
var dbList = await base.GetAllAsync();
return _mapper.Map<List<VariableMqttAlias>>(dbList);
return _mapper.Map<List<MqttAlias>>(dbList);
}
/// <summary>
@@ -57,7 +57,7 @@ public class VariableMqttAliasRepository : BaseRepository<DbVariableMqttAlias>,
/// </summary>
/// <param name="entity">要添加的变量与MQTT别名关联实体。</param>
/// <returns>添加成功后的变量与MQTT别名关联实体（包含数据库生成的ID等信息）。</returns>
public async Task<VariableMqttAlias> AddAsync(VariableMqttAlias entity)
public async Task<MqttAlias> AddAsync(MqttAlias entity)
{
var dbVariableMqttAlias = await base.AddAsync(_mapper.Map<DbVariableMqttAlias>(entity));
return _mapper.Map(dbVariableMqttAlias, entity);
@@ -68,14 +68,14 @@ public class VariableMqttAliasRepository : BaseRepository<DbVariableMqttAlias>,
/// </summary>
/// <param name="entity">要更新的变量与MQTT别名关联实体。</param>
/// <returns>受影响的行数。</returns>
public async Task<int> UpdateAsync(VariableMqttAlias entity) => await base.UpdateAsync(_mapper.Map<DbVariableMqttAlias>(entity));
public async Task<int> UpdateAsync(MqttAlias entity) => await base.UpdateAsync(_mapper.Map<DbVariableMqttAlias>(entity));
/// <summary>
/// 异步删除变量与MQTT别名关联。
/// </summary>
/// <param name="entity">要删除的变量与MQTT别名关联实体。</param>
/// <returns>受影响的行数。</returns>
public async Task<int> DeleteAsync(VariableMqttAlias entity) => await base.DeleteAsync(_mapper.Map<DbVariableMqttAlias>(entity));
public async Task<int> DeleteAsync(MqttAlias entity) => await base.DeleteAsync(_mapper.Map<DbVariableMqttAlias>(entity));
/// <summary>
/// 异步根据ID删除变量与MQTT别名关联。
@@ -98,24 +98,24 @@ public class VariableMqttAliasRepository : BaseRepository<DbVariableMqttAlias>,
/// </summary>
/// <param name="number">要获取的变量与MQTT别名关联数量。</param>
/// <returns>包含指定数量变量与MQTT别名关联实体的列表。</returns>
public new async Task<List<VariableMqttAlias>> TakeAsync(int number)
public new async Task<List<MqttAlias>> TakeAsync(int number)
{
var dbList = await base.TakeAsync(number);
return _mapper.Map<List<VariableMqttAlias>>(dbList);
return _mapper.Map<List<MqttAlias>>(dbList);
}
public async Task<List<VariableMqttAlias>> AddBatchAsync(List<VariableMqttAlias> entities)
public async Task<List<MqttAlias>> AddBatchAsync(List<MqttAlias> entities)
{
var dbEntities = _mapper.Map<List<DbVariableMqttAlias>>(entities);
var addedEntities = await base.AddBatchAsync(dbEntities);
return _mapper.Map<List<VariableMqttAlias>>(addedEntities);
return _mapper.Map<List<MqttAlias>>(addedEntities);
}
/// <summary>
/// 异步获取指定变量的所有MQTT别名关联。
/// </summary>
public async Task<List<VariableMqttAlias>> GetAliasesForVariableAsync(int variableId)
public async Task<List<MqttAlias>> GetAliasesForVariableAsync(int variableId)
{
// 查询别名关联，并包含关联的Variable和MqttServer信息
var dbList = await _dbContext.GetInstance().Queryable<DbVariableMqttAlias>()
@@ -139,7 +139,7 @@ public class VariableMqttAliasRepository : BaseRepository<DbVariableMqttAlias>,
var mqttServerDict = mqttServers.ToDictionary(m => m.Id, m => _mapper.Map<MqttServer>(m));
// 映射主实体并设置导航属性
var result = _mapper.Map<List<VariableMqttAlias>>(dbList);
var result = _mapper.Map<List<MqttAlias>>(dbList);
foreach (var alias in result)
{
if (variableDict.TryGetValue(alias.VariableId, out var variable))
@@ -159,7 +159,7 @@ public class VariableMqttAliasRepository : BaseRepository<DbVariableMqttAlias>,
/// <summary>
/// 异步根据变量和服务器获取别名关联。
/// </summary>
public async Task<VariableMqttAlias> GetByVariableAndServerAsync(int variableId, int mqttServerId)
public async Task<MqttAlias> GetByVariableAndServerAsync(int variableId, int mqttServerId)
{
var dbAlias = await _dbContext.GetInstance().Queryable<DbVariableMqttAlias>()
.Where(x => x.VariableId == variableId && x.MqttServerId == mqttServerId)
@@ -178,7 +178,7 @@ public class VariableMqttAliasRepository : BaseRepository<DbVariableMqttAlias>,
.FirstAsync();
// 映射主实体并设置导航属性
var result = _mapper.Map<VariableMqttAlias>(dbAlias);
var result = _mapper.Map<MqttAlias>(dbAlias);
result.Variable = _mapper.Map<Variable>(variable);
result.MqttServer = _mapper.Map<MqttServer>(mqttServer);

2
DMS.Infrastructure/Services/Mqtt/MqttBackgroundService.cs
View File

@@ -115,7 +115,7 @@ namespace DMS.Infrastructure.Services.Mqtt
/// <summary>
/// 发布变量数据到MQTT服务器
/// </summary>
public async Task PublishVariableDataAsync(VariableMqttAlias variableMqtt, CancellationToken cancellationToken = default)
public async Task PublishVariableDataAsync(MqttAlias variableMqtt, CancellationToken cancellationToken = default)
{
await _mqttServiceManager.PublishVariableDataAsync(variableMqtt, cancellationToken);
}

4
DMS.Infrastructure/Services/Mqtt/MqttDeviceContext.cs
View File

@@ -28,14 +28,14 @@ namespace DMS.Infrastructure.Services.Mqtt
/// <summary>
/// 与该MQTT服务器关联的所有变量MQTT别名
/// </summary>
public ConcurrentDictionary<int, VariableMqttAlias> VariableMqttAliases { get; set; }
public ConcurrentDictionary<int, MqttAlias> VariableMqttAliases { get; set; }
/// <summary>
/// 构造函数
/// </summary>
public MqttDeviceContext()
{
VariableMqttAliases = new ConcurrentDictionary<int, VariableMqttAlias>();
VariableMqttAliases = new ConcurrentDictionary<int, MqttAlias>();
ReconnectAttempts = 0;
}
}

6
DMS.Infrastructure/Services/Mqtt/MqttServiceManager.cs
View File

@@ -94,7 +94,7 @@ namespace DMS.Infrastructure.Services.Mqtt
/// <summary>
/// 更新MQTT服务器变量别名
/// </summary>
public void UpdateVariableMqttAliases(int mqttServerId, List<VariableMqttAlias> variableMqttAliases)
public void UpdateVariableMqttAliases(int mqttServerId, List<MqttAlias> variableMqttAliases)
{
if (_mqttContexts.TryGetValue(mqttServerId, out var context))
{
@@ -232,7 +232,7 @@ namespace DMS.Infrastructure.Services.Mqtt
/// <summary>
/// 发布变量数据到MQTT服务器
/// </summary>
public async Task PublishVariableDataAsync(VariableMqttAlias variableMqtt, CancellationToken cancellationToken = default)
public async Task PublishVariableDataAsync(MqttAlias variableMqtt, CancellationToken cancellationToken = default)
{
if (variableMqtt?.MqttServer == null || variableMqtt.Variable == null)
{
@@ -269,7 +269,7 @@ namespace DMS.Infrastructure.Services.Mqtt
}
}
private string BuildSendMessage(VariableMqttAlias variableMqtt)
private string BuildSendMessage(MqttAlias variableMqtt)
{
StringBuilder sb = new StringBuilder();
var now = DateTime.Now;