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

refactor:删除MqttServerDto,将使用MqttServerDto的全部转为使用MqttServer

Browse Source
This commit is contained in:
David P.G
2025-10-06 19:32:45 +08:00
parent c85f89db33
commit 94ad940e03
17 changed files with 174 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,7 +35,7 @@ public class AppDataStorageService : IAppDataStorageService
/// <summary>
/// 安全字典，用于存储所有MQTT服务器数据
/// </summary>
public ConcurrentDictionary<int, MqttServerDto> MqttServers { get; } = new();
public ConcurrentDictionary<int, MqttServer> MqttServers { get; } = new();
/// <summary>

8
DMS.Application/Services/DataLoaderService.cs
View File

@@ -118,7 +118,7 @@ public class DataLoaderService : IDataLoaderService
if (_appDataStorageService.MqttServers.TryGetValue(variableMqttAlias.MqttServerId, out var mqttServer))
{
variableMqttAlias.MqttServer = _mapper.Map<MqttServer>(mqttServer);
variableMqttAlias.MqttServer = mqttServer;
mqttServer.VariableAliases?.Add(variableMqttAlias);
}
}
@@ -209,11 +209,11 @@ public class DataLoaderService : IDataLoaderService
public async Task LoadAllMqttServersAsync()
{
_appDataStorageService.MqttServers.Clear();
var mqttServerDtos =await _mqttAppService.GetAllMqttServersAsync();
var mqttServers =await _mqttAppService.GetAllMqttServersAsync();
// 加载MQTT服务器数据到内存
foreach (var mqttServerDto in mqttServerDtos)
foreach (var mqttServer in mqttServers)
{
_appDataStorageService.MqttServers.TryAdd(mqttServerDto.Id, mqttServerDto);
_appDataStorageService.MqttServers.TryAdd(mqttServer.Id, mqttServer);
}
}

89
DMS.Application/Services/Database/MqttAppService.cs
View File

@@ -1,6 +1,3 @@
using AutoMapper;
using DMS.Application.DTOs;
using DMS.Application.Interfaces;
using DMS.Application.Interfaces.Database;
using DMS.Core.Interfaces;
using DMS.Core.Models;
@@ -14,52 +11,47 @@ namespace DMS.Application.Services.Database;
public class MqttAppService : IMqttAppService
{
private readonly IRepositoryManager _repoManager;
private readonly IMapper _mapper;
/// <summary>
/// 构造函数，通过依赖注入获取仓储管理器和AutoMapper实例。
/// 构造函数，通过依赖注入获取仓储管理器实例。
/// </summary>
/// <param name="repoManager">仓储管理器实例。</param>
/// <param name="mapper">AutoMapper 实例。</param>
public MqttAppService(IRepositoryManager repoManager, IMapper mapper)
public MqttAppService(IRepositoryManager repoManager)
{
_repoManager = repoManager;
_mapper = mapper;
}
/// <summary>
/// 异步根据ID获取MQTT服务器数据传输对象。
/// 异步根据ID获取MQTT服务器。
/// </summary>
/// <param name="id">MQTT服务器ID。</param>
/// <returns>MQTT服务器数据传输对象。</returns>
public async Task<MqttServerDto> GetMqttServerByIdAsync(int id)
/// <returns>MQTT服务器。</returns>
public async Task<MqttServer> GetMqttServerByIdAsync(int id)
{
var mqttServer = await _repoManager.MqttServers.GetByIdAsync(id);
return _mapper.Map<MqttServerDto>(mqttServer);
return await _repoManager.MqttServers.GetByIdAsync(id);
}
/// <summary>
/// 异步获取所有MQTT服务器数据传输对象列表。
/// 异步获取所有MQTT服务器列表。
/// </summary>
/// <returns>MQTT服务器数据传输对象列表。</returns>
public async Task<List<MqttServerDto>> GetAllMqttServersAsync()
/// <returns>MQTT服务器列表。</returns>
public async Task<List<MqttServer>> GetAllMqttServersAsync()
{
var mqttServers = await _repoManager.MqttServers.GetAllAsync();
return _mapper.Map<List<MqttServerDto>>(mqttServers);
return mqttServers.ToList();
}
/// <summary>
/// 异步创建一个新MQTT服务器（事务性操作）。
/// </summary>
/// <param name="mqttServerDto">要创建的MQTT服务器数据传输对象。</param>
/// <param name="mqttServer">要创建的MQTT服务器。</param>
/// <returns>新创建MQTT服务器的ID。</returns>
/// <exception cref="ApplicationException">如果创建MQTT服务器时发生错误。</exception>
public async Task<int> CreateMqttServerAsync(MqttServerDto mqttServerDto)
public async Task<int> CreateMqttServerAsync(MqttServer mqttServer)
{
try
{
await _repoManager.BeginTranAsync();
var mqttServer = _mapper.Map<MqttServer>(mqttServerDto);
await _repoManager.MqttServers.AddAsync(mqttServer);
await _repoManager.CommitAsync();
return mqttServer.Id;
@@ -74,21 +66,36 @@ public class MqttAppService : IMqttAppService
/// <summary>
/// 异步更新一个已存在的MQTT服务器（事务性操作）。
/// </summary>
/// <param name="mqttServerDto">要更新的MQTT服务器数据传输对象。</param>
/// <param name="mqttServer">要更新的MQTT服务器。</param>
/// <returns>表示异步操作的任务。</returns>
/// <exception cref="ApplicationException">如果找不到MQTT服务器或更新MQTT服务器时发生错误。</exception>
public async Task UpdateMqttServerAsync(MqttServerDto mqttServerDto)
public async Task UpdateMqttServerAsync(MqttServer mqttServer)
{
try
{
await _repoManager.BeginTranAsync();
var mqttServer = await _repoManager.MqttServers.GetByIdAsync(mqttServerDto.Id);
if (mqttServer == null)
var existingMqttServer = await _repoManager.MqttServers.GetByIdAsync(mqttServer.Id);
if (existingMqttServer == null)
{
throw new ApplicationException($"MQTT Server with ID {mqttServerDto.Id} not found.");
throw new ApplicationException($"MQTT Server with ID {mqttServer.Id} not found.");
}
_mapper.Map(mqttServerDto, mqttServer);
await _repoManager.MqttServers.UpdateAsync(mqttServer);
existingMqttServer.ServerName = mqttServer.ServerName;
existingMqttServer.ServerUrl = mqttServer.ServerUrl;
existingMqttServer.Port = mqttServer.Port;
existingMqttServer.Username = mqttServer.Username;
existingMqttServer.Password = mqttServer.Password;
existingMqttServer.IsActive = mqttServer.IsActive;
existingMqttServer.IsConnect = mqttServer.IsConnect;
existingMqttServer.SubscribeTopic = mqttServer.SubscribeTopic;
existingMqttServer.PublishTopic = mqttServer.PublishTopic;
existingMqttServer.ClientId = mqttServer.ClientId;
existingMqttServer.MessageFormat = mqttServer.MessageFormat;
existingMqttServer.MessageHeader = mqttServer.MessageHeader;
existingMqttServer.MessageContent = mqttServer.MessageContent;
existingMqttServer.MessageFooter = mqttServer.MessageFooter;
await _repoManager.MqttServers.UpdateAsync(existingMqttServer);
await _repoManager.CommitAsync();
}
catch (Exception ex)
@@ -121,22 +128,36 @@ public class MqttAppService : IMqttAppService
/// <summary>
/// 异步批量更新MQTT服务器（事务性操作）。
/// </summary>
/// <param name="mqttServerDtos">要更新的MQTT服务器数据传输对象列表。</param>
/// <param name="mqttServers">要更新的MQTT服务器列表。</param>
/// <returns>成功更新的MQTT服务器数量。</returns>
/// <exception cref="ApplicationException">如果批量更新MQTT服务器时发生错误。</exception>
public async Task<int> UpdateMqttServersAsync(List<MqttServerDto> mqttServerDtos)
public async Task<int> UpdateMqttServersAsync(List<MqttServer> mqttServers)
{
try
{
await _repoManager.BeginTranAsync();
var count = 0;
foreach (var mqttServerDto in mqttServerDtos)
foreach (var mqttServer in mqttServers)
{
var mqttServer = await _repoManager.MqttServers.GetByIdAsync(mqttServerDto.Id);
if (mqttServer != null)
var existingMqttServer = await _repoManager.MqttServers.GetByIdAsync(mqttServer.Id);
if (existingMqttServer != null)
{
_mapper.Map(mqttServerDto, mqttServer);
await _repoManager.MqttServers.UpdateAsync(mqttServer);
existingMqttServer.ServerName = mqttServer.ServerName;
existingMqttServer.ServerUrl = mqttServer.ServerUrl;
existingMqttServer.Port = mqttServer.Port;
existingMqttServer.Username = mqttServer.Username;
existingMqttServer.Password = mqttServer.Password;
existingMqttServer.IsActive = mqttServer.IsActive;
existingMqttServer.IsConnect = mqttServer.IsConnect;
existingMqttServer.SubscribeTopic = mqttServer.SubscribeTopic;
existingMqttServer.PublishTopic = mqttServer.PublishTopic;
existingMqttServer.ClientId = mqttServer.ClientId;
existingMqttServer.MessageFormat = mqttServer.MessageFormat;
existingMqttServer.MessageHeader = mqttServer.MessageHeader;
existingMqttServer.MessageContent = mqttServer.MessageContent;
existingMqttServer.MessageFooter = mqttServer.MessageFooter;
await _repoManager.MqttServers.UpdateAsync(existingMqttServer);
count++;
}
}

86
DMS.Application/Services/Management/MqttManagementService.cs
View File

@@ -1,11 +1,11 @@
using System.Collections.Concurrent;
using AutoMapper;
using DMS.Application.DTOs;
using DMS.Application.Events;
using DMS.Application.Interfaces;
using DMS.Application.Interfaces.Database;
using DMS.Application.Interfaces.Management;
using DMS.Core.Enums;
using DMS.Core.Models;
namespace DMS.Application.Services.Management;
@@ -17,83 +17,91 @@ public class MqttManagementService : IMqttManagementService
private readonly IMqttAppService _mqttAppService;
private readonly IAppDataStorageService _appDataStorageService;
private readonly IEventService _eventService;
private readonly IMapper _mapper;
private readonly IDataProcessingService _dataProcessingService;
private readonly IMenuManagementService _menuManagementService;
public MqttManagementService(IMqttAppService mqttAppService,
IAppDataStorageService appDataStorageService,
IEventService eventService,
IMapper mapper,
IDataProcessingService dataProcessingService,
IMenuManagementService menuManagementService)
IEventService eventService)
{
_mqttAppService = mqttAppService;
_appDataStorageService = appDataStorageService;
_eventService = eventService;
_mapper = mapper;
_dataProcessingService = dataProcessingService;
_menuManagementService = menuManagementService;
}
/// <summary>
/// 异步根据ID获取MQTT服务器DTO。
/// </summary>
public async Task<MqttServerDto> GetMqttServerByIdAsync(int id)
public async Task<MqttServer> GetMqttServerByIdAsync(int id)
{
return await _mqttAppService.GetMqttServerByIdAsync(id);
if (_appDataStorageService.MqttServers.TryGetValue(id,out var mqttServer))
{
return mqttServer;
}
return null;
}
/// <summary>
/// 异步获取所有MQTT服务器DTO列表。
/// </summary>
public async Task<List<MqttServerDto>> GetAllMqttServersAsync()
public async Task<List<MqttServer>> GetAllMqttServersAsync()
{
return await _mqttAppService.GetAllMqttServersAsync();
return _appDataStorageService.MqttServers.Values.ToList();
}
/// <summary>
/// 异步更新一个已存在的MQTT服务器。
/// </summary>
public async Task<int> UpdateMqttServerAsync(MqttServerDto mqttServerDto)
public async Task<int> UpdateMqttServerAsync(MqttServer mqttServer)
{
return await UpdateMqttServersAsync(new List<MqttServerDto>() { mqttServerDto });
return await UpdateMqttServersAsync(new List<MqttServer>() { mqttServer });
}
/// <summary>
/// 异步批量更新MQTT服务器。
/// </summary>
public async Task<int> UpdateMqttServersAsync(List<MqttServerDto> mqttServerDtos)
public async Task<int> UpdateMqttServersAsync(List<MqttServer> mqttServers)
{
var result = await _mqttAppService.UpdateMqttServersAsync(mqttServerDtos);
var result = await _mqttAppService.UpdateMqttServersAsync(mqttServers);
// 批量更新成功后，更新内存中的MQTT服务器
if (result > 0 && mqttServerDtos != null)
if (result > 0 && mqttServers != null)
{
foreach (var mqttServerDto in mqttServerDtos)
foreach (var mqttServer in mqttServers)
{
if (_appDataStorageService.MqttServers.TryGetValue(mqttServerDto.Id, out var mMqttServerDto))
if (_appDataStorageService.MqttServers.TryGetValue(mqttServer.Id, out var mMqttServer))
{
// 比较旧值和新值，确定哪个属性发生了变化
var changedProperties = GetChangedProperties(mMqttServerDto, mqttServerDto);
var changedProperties = GetChangedProperties(mMqttServer, mqttServer);
// 更新内存中的MQTT服务器
_mapper.Map(mqttServerDto, mMqttServerDto);
mMqttServer.ServerName = mqttServer.ServerName;
mMqttServer.ServerUrl = mqttServer.ServerUrl;
mMqttServer.Port = mqttServer.Port;
mMqttServer.Username = mqttServer.Username;
mMqttServer.Password = mqttServer.Password;
mMqttServer.IsActive = mqttServer.IsActive;
mMqttServer.IsConnect = mqttServer.IsConnect;
mMqttServer.SubscribeTopic = mqttServer.SubscribeTopic;
mMqttServer.PublishTopic = mqttServer.PublishTopic;
mMqttServer.ClientId = mqttServer.ClientId;
mMqttServer.MessageFormat = mqttServer.MessageFormat;
mMqttServer.MessageHeader = mqttServer.MessageHeader;
mMqttServer.MessageContent = mqttServer.MessageContent;
mMqttServer.MessageFooter = mqttServer.MessageFooter;
// 为每个发生变化的属性触发事件
foreach (var property in changedProperties)
{
_eventService.RaiseMqttServerChanged(
this, new MqttServerChangedEventArgs(ActionChangeType.Updated, mMqttServerDto, property));
this, new MqttServerChangedEventArgs(ActionChangeType.Updated, mMqttServer, property));
}
}
else
{
// 如果内存中不存在该MQTT服务器，则直接添加
_appDataStorageService.MqttServers.TryAdd(mqttServerDto.Id, mqttServerDto);
_appDataStorageService.MqttServers.TryAdd(mqttServer.Id, mqttServer);
_eventService.RaiseMqttServerChanged(
this, new MqttServerChangedEventArgs(ActionChangeType.Added, mqttServerDto, MqttServerPropertyType.All));
this, new MqttServerChangedEventArgs(ActionChangeType.Added, mqttServer, MqttServerPropertyType.All));
}
}
}
@@ -112,10 +120,10 @@ public class MqttManagementService : IMqttManagementService
// 删除成功后，从内存中移除MQTT服务器
if (result && mqttServer != null)
{
if (_appDataStorageService.MqttServers.TryRemove(id, out var mqttServerDto))
if (_appDataStorageService.MqttServers.TryRemove(id, out var mqttServerFromCache))
{
_eventService.RaiseMqttServerChanged(
this, new MqttServerChangedEventArgs(ActionChangeType.Deleted, mqttServerDto));
this, new MqttServerChangedEventArgs(ActionChangeType.Deleted, mqttServerFromCache));
}
}
@@ -134,10 +142,10 @@ public class MqttManagementService : IMqttManagementService
{
foreach (var id in ids)
{
if (_appDataStorageService.MqttServers.TryRemove(id, out var mqttServerDto))
if (_appDataStorageService.MqttServers.TryRemove(id, out var mqttServer))
{
_eventService.RaiseMqttServerChanged(
this, new MqttServerChangedEventArgs(ActionChangeType.Deleted, mqttServerDto));
this, new MqttServerChangedEventArgs(ActionChangeType.Deleted, mqttServer));
}
}
}
@@ -148,27 +156,27 @@ public class MqttManagementService : IMqttManagementService
/// <summary>
/// 异步创建MQTT服务器及其菜单项。
/// </summary>
public async Task<MqttServerDto> CreateMqttServerAsync(MqttServerDto mqttServerDto)
public async Task<MqttServer> CreateMqttServerAsync(MqttServer mqttServer)
{
// 首先创建MQTT服务器
var mqttServerId = await _mqttAppService.CreateMqttServerAsync(mqttServerDto);
var mqttServerId = await _mqttAppService.CreateMqttServerAsync(mqttServer);
if (mqttServerId > 0)
{
mqttServerDto.Id = mqttServerId;
mqttServer.Id = mqttServerId;
// 将MQTT服务器添加到内存中
if (_appDataStorageService.MqttServers.TryAdd(mqttServerDto.Id, mqttServerDto))
if (_appDataStorageService.MqttServers.TryAdd(mqttServer.Id, mqttServer))
{
_eventService.RaiseMqttServerChanged(
this, new MqttServerChangedEventArgs(ActionChangeType.Added, mqttServerDto));
this, new MqttServerChangedEventArgs(ActionChangeType.Added, mqttServer));
}
}
return mqttServerDto; // 返回null表示创建失败
return mqttServer; // 返回null表示创建失败
}
/// <summary>
@@ -177,7 +185,7 @@ public class MqttManagementService : IMqttManagementService
/// <param name="oldMqttServer">旧MQTT服务器值</param>
/// <param name="newMqttServer">新MQTT服务器值</param>
/// <returns>发生变化的属性列表</returns>
private List<MqttServerPropertyType> GetChangedProperties(MqttServerDto oldMqttServer, MqttServerDto newMqttServer)
private List<MqttServerPropertyType> GetChangedProperties(MqttServer oldMqttServer, MqttServer newMqttServer)
{
var changedProperties = new List<MqttServerPropertyType>();