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

3
DMS.WPF/Profiles/MappingProfile.cs
View File

@@ -24,8 +24,7 @@ namespace DMS.WPF.Profiles
CreateMap<MenuBeanDto, MenuItem>()
.ReverseMap();
CreateMap<MqttServerDto, MqttServerItem>().ReverseMap();
CreateMap<MqttServerItem, MqttServerItem>().ReverseMap();
CreateMap<MqttServer, MqttServerItem>().ReverseMap();
CreateMap<UserDto, UserItem>().ReverseMap();

16
DMS.WPF/Services/MqttDataService.cs
View File

@@ -1,11 +1,13 @@
using AutoMapper;
using DMS.Application.DTOs;
using DMS.Application.Interfaces;
using DMS.Application.Interfaces.Management;
using DMS.Core.Enums;
using DMS.WPF.Interfaces;
using DMS.WPF.ViewModels;
using DMS.WPF.ItemViewModel;
using DMS.Core.Models;
using DMS.Application.DTOs;
namespace DMS.WPF.Services;
@@ -45,9 +47,9 @@ public class MqttDataService : IMqttDataService
try
{
// 加载MQTT服务器数据
foreach (var mqttServerDto in _appDataStorageService.MqttServers.Values)
foreach (var mqttServer in _appDataStorageService.MqttServers.Values)
{
_dataStorageService.MqttServers.TryAdd(mqttServerDto.Id, _mapper.Map<MqttServerItem>(mqttServerDto));
_dataStorageService.MqttServers.TryAdd(mqttServer.Id, _mapper.Map<MqttServerItem>(mqttServer));
}
}
@@ -65,9 +67,9 @@ public class MqttDataService : IMqttDataService
public async Task<MqttServerItem> AddMqttServer(MqttServerItem mqttServer)
{
var addMqttServerDto = await _mqttManagementService.CreateMqttServerAsync(_mapper.Map<MqttServerDto>(mqttServer));
var addMqttServer = await _mqttManagementService.CreateMqttServerAsync(_mapper.Map<MqttServer>(mqttServer));
MqttServerItem mqttServerItem = _mapper.Map<MqttServerItem>(addMqttServerDto);
MqttServerItem mqttServerItem = _mapper.Map<MqttServerItem>(addMqttServer);
_dataStorageService.MqttServers.Add(mqttServerItem.Id, mqttServerItem);
@@ -96,8 +98,8 @@ public class MqttDataService : IMqttDataService
/// </summary>
public async Task<bool> UpdateMqttServer(MqttServerItem mqttServer)
{
var dto = _mapper.Map<MqttServerDto>(mqttServer);
var result = await _mqttManagementService.UpdateMqttServerAsync(dto);
var mqttServerModel = _mapper.Map<DMS.Core.Models.MqttServer>(mqttServer);
var result = await _mqttManagementService.UpdateMqttServerAsync(mqttServerModel);
if (result > 0)
{

34
DMS.WPF/ViewModels/Dialogs/MqttSelectionDialogViewModel.cs
View File

@@ -1,6 +1,6 @@
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using DMS.Application.DTOs;
using DMS.Application.Interfaces;
using DMS.WPF.ItemViewModel;
using System;
@@ -36,27 +36,27 @@ namespace DMS.WPF.ViewModels.Dialogs
{
try
{
var mqttServerDtos = await _mqttAppService.GetAllMqttServersAsync();
var mqttServers = await _mqttAppService.GetAllMqttServersAsync();
MqttServers.Clear();
foreach (var dto in mqttServerDtos)
foreach (var mqttServer in mqttServers)
{
MqttServers.Add(new MqttServerItem
{
Id = dto.Id,
ServerName = dto.ServerName,
ServerUrl = dto.ServerUrl,
Port = dto.Port,
Username = dto.Username,
Password = dto.Password,
IsActive = dto.IsActive,
SubscribeTopic = dto.SubscribeTopic,
PublishTopic = dto.PublishTopic,
ClientId = dto.ClientId,
CreatedAt = dto.CreatedAt,
ConnectedAt = dto.ConnectedAt,
ConnectionDuration = dto.ConnectionDuration,
MessageFormat = dto.MessageFormat
Id = mqttServer.Id,
ServerName = mqttServer.ServerName,
ServerUrl = mqttServer.ServerUrl,
Port = mqttServer.Port,
Username = mqttServer.Username,
Password = mqttServer.Password,
IsActive = mqttServer.IsActive,
SubscribeTopic = mqttServer.SubscribeTopic,
PublishTopic = mqttServer.PublishTopic,
ClientId = mqttServer.ClientId,
CreatedAt = mqttServer.CreatedAt,
ConnectedAt = mqttServer.ConnectedAt,
ConnectionDuration = mqttServer.ConnectionDuration,
MessageFormat = mqttServer.MessageFormat
});
}
}