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

refactor:将所有的ItemViewMdoel的名字删除ViewModel，并将命名空间调整为DMS.WPF.ItemViewModel.

Browse Source
This commit is contained in:
David P.G
2025-10-06 18:17:56 +08:00
parent 6cff70cd87
commit c85f89db33
72 changed files with 316 additions and 1023 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,7 @@ using DMS.Application.Interfaces.Management;
using DMS.Core.Enums;
using DMS.WPF.Interfaces;
using DMS.WPF.ViewModels;
using DMS.WPF.ViewModels.Items;
using DMS.WPF.ItemViewModel;
namespace DMS.WPF.Services;
@@ -47,7 +47,7 @@ public class MqttDataService : IMqttDataService
// 加载MQTT服务器数据
foreach (var mqttServerDto in _appDataStorageService.MqttServers.Values)
{
_dataStorageService.MqttServers.TryAdd(mqttServerDto.Id, _mapper.Map<MqttServerItemViewModel>(mqttServerDto));
_dataStorageService.MqttServers.TryAdd(mqttServerDto.Id, _mapper.Map<MqttServerItem>(mqttServerDto));
}
}
@@ -62,12 +62,12 @@ public class MqttDataService : IMqttDataService
/// <summary>
/// 添加MQTT服务器。
/// </summary>
public async Task<MqttServerItemViewModel> AddMqttServer(MqttServerItemViewModel mqttServer)
public async Task<MqttServerItem> AddMqttServer(MqttServerItem mqttServer)
{
var addMqttServerDto = await _mqttManagementService.CreateMqttServerAsync(_mapper.Map<MqttServerDto>(mqttServer));
MqttServerItemViewModel mqttServerItem = _mapper.Map<MqttServerItemViewModel>(addMqttServerDto);
MqttServerItem mqttServerItem = _mapper.Map<MqttServerItem>(addMqttServerDto);
_dataStorageService.MqttServers.Add(mqttServerItem.Id, mqttServerItem);
@@ -85,7 +85,7 @@ public class MqttDataService : IMqttDataService
MenuType = MenuType.MqttServerMenu,
TargetViewKey = nameof(MqttServerDetailViewModel),
};
await _menuDataService.AddMenuItem(_mapper.Map<MenuItemViewModel>(mqttServerMenu));
await _menuDataService.AddMenuItem(_mapper.Map<MenuItem>(mqttServerMenu));
}
return mqttServerItem;
@@ -94,7 +94,7 @@ public class MqttDataService : IMqttDataService
/// <summary>
/// 更新MQTT服务器。
/// </summary>
public async Task<bool> UpdateMqttServer(MqttServerItemViewModel mqttServer)
public async Task<bool> UpdateMqttServer(MqttServerItem mqttServer)
{
var dto = _mapper.Map<MqttServerDto>(mqttServer);
var result = await _mqttManagementService.UpdateMqttServerAsync(dto);
@@ -120,7 +120,7 @@ public class MqttDataService : IMqttDataService
/// <summary>
/// 删除MQTT服务器。
/// </summary>
public async Task<bool> DeleteMqttServer(MqttServerItemViewModel mqttServer)
public async Task<bool> DeleteMqttServer(MqttServerItem mqttServer)
{
// 从数据库和内存中删除MQTT服务器
var result = await _mqttManagementService.DeleteMqttServerAsync(mqttServer.Id);