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

refactor:删除了DeviceDto,VariableDto,VariableTableDto,改为使用DMS.Core中的实体

Browse Source
This commit is contained in:
David P.G
2025-10-07 17:51:24 +08:00
parent 94ad940e03
commit b753e5ea73
52 changed files with 291 additions and 463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
DMS.WPF/Interfaces/IVariableDataService.cs
View File

@@ -1,5 +1,6 @@
using System.Collections.ObjectModel;
using DMS.Application.DTOs;
using DMS.Core.Models;
using DMS.WPF.ItemViewModel;
namespace DMS.WPF.Interfaces;
@@ -18,7 +19,7 @@ public interface IVariableDataService
/// <summary>
/// 添加变量表。
/// </summary>
Task<bool> AddVariableTableToView(VariableTableDto tableDto);
Task<bool> AddVariableTableToView(VariableTable tableDto);
/// <summary>
/// 更新变量表。

3
DMS.WPF/Interfaces/IVariableTableDataService.cs
View File

@@ -1,5 +1,6 @@
using System.Collections.ObjectModel;
using DMS.Application.DTOs;
using DMS.Core.Models;
using DMS.WPF.ItemViewModel;
namespace DMS.WPF.Interfaces;
@@ -9,7 +10,7 @@ public interface IVariableTableDataService
void LoadAllVariableTables();
Task<int> AddVariableTable(VariableTableDto variableTableDto,
Task<int> AddVariableTable(VariableTable variableTable,
MenuBeanDto menuDto = null, bool isAddDb = false);
Task<bool> UpdateVariableTable(VariableTableItem variableTable);

5
DMS.WPF/ItemViewModel/VariableItem.cs
View File

@@ -4,6 +4,7 @@ using DMS.Core.Enums;
using System;
using System.Collections.Generic;
using DMS.Application.Configurations;
using DMS.Core.Models;
using Microsoft.Extensions.DependencyInjection;
namespace DMS.WPF.ItemViewModel;
@@ -98,7 +99,7 @@ public partial class VariableItem : ObservableObject
/// 用于在界面上显示变量表的关联信息。
/// </summary>
[ObservableProperty]
private VariableTableDto? _variableTable;
private VariableTable _variableTable;
/// <summary>
/// 获取或设置与此变量关联的MQTT别名列表。
@@ -250,7 +251,7 @@ public partial class VariableItem : ObservableObject
/// <summary>
/// 检查死区报警和布尔值变化报警
/// </summary>
public void CheckAdvancedAlarms(VariableDto variable)
public void CheckAdvancedAlarms(Variable variable)
{
// 检查死区报警
if (variable.IsAlarmEnabled && variable.AlarmDeadband > 0)

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

@@ -11,10 +11,12 @@ namespace DMS.WPF.Profiles
{
public MappingProfile()
{
CreateMap<DeviceDto, DeviceItem>()
CreateMap<Device, DeviceItem>()
.ReverseMap();
CreateMap<Variable, VariableItem>()
.ReverseMap();
CreateMap<VariableTable, VariableTableItem>()
.ReverseMap();
CreateMap<OpcUaNode, OpcUaNodeItem>()
.ReverseMap();
CreateMap<VariableItem, VariableItem>();
@@ -29,9 +31,8 @@ namespace DMS.WPF.Profiles
CreateMap<MqttServer, MqttServerItem>().ReverseMap();
CreateMap<UserDto, UserItem>().ReverseMap();
CreateMap<VariableHistoryDto, VariableHistoryItem>().ReverseMap();
CreateMap<VariableDto, VariableItem>()
CreateMap<Variable, VariableItem>()
.ReverseMap();
CreateMap<VariableTableDto, VariableTableItem>().ReverseMap();
CreateMap<NlogDto, NlogItem>().ReverseMap();
}
}

10
DMS.WPF/Services/DeviceDataService.cs
View File

@@ -82,9 +82,9 @@ public class DeviceDataService : IDeviceDataService
/// </summary>
public void LoadAllDevices()
{
foreach (var deviceDto in _appDataStorageService.Devices.Values)
foreach (var device in _appDataStorageService.Devices.Values)
{
_dataStorageService.Devices.Add(deviceDto.Id, _mapper.Map<DeviceItem>(deviceDto));
_dataStorageService.Devices.Add(device.Id, _mapper.Map<DeviceItem>(device));
}
}
@@ -171,13 +171,13 @@ public class DeviceDataService : IDeviceDataService
/// </summary>
public async Task<bool> UpdateDevice(DeviceItem device)
{
if (!_appDataStorageService.Devices.TryGetValue(device.Id, out var deviceDto))
if (!_appDataStorageService.Devices.TryGetValue(device.Id, out var existingDevice))
{
return false;
}
_mapper.Map(device, deviceDto);
if (await _appDataCenterService.DeviceManagementService.UpdateDeviceAsync(deviceDto) > 0)
_mapper.Map(device, existingDevice);
if (await _appDataCenterService.DeviceManagementService.UpdateDeviceAsync(existingDevice) > 0)
{
// 更新数据库后会自动更新内存，无需额外操作
return true;

10
DMS.WPF/Services/VariableDataService.cs
View File

@@ -56,7 +56,7 @@ public class VariableDataService : IVariableDataService
/// <summary>
/// 添加变量表。
/// </summary>
public async Task<bool> AddVariableTableToView(VariableTableDto tableDto)
public async Task<bool> AddVariableTableToView(VariableTable tableDto)
{
// 添加null检查
if (tableDto == null || tableDto.DeviceId==0)
@@ -76,15 +76,15 @@ public class VariableDataService : IVariableDataService
/// <summary>
/// 更新变量表。
/// </summary>
public async Task<bool> UpdateVariableTable(VariableTableItem variableTable)
public async Task<bool> UpdateVariableTable(VariableTableItem variableTableItem)
{
if (variableTable == null)
if (variableTableItem is null)
{
return false;
}
var variableTableDto = _mapper.Map<VariableTableDto>(variableTable);
if (await _appDataCenterService.VariableTableManagementService.UpdateVariableTableAsync(variableTableDto) > 0)
var variableTable = _mapper.Map<VariableTable>(variableTableItem);
if (await _appDataCenterService.VariableTableManagementService.UpdateVariableTableAsync(variableTable) > 0)
{
// 更新数据库后会自动更新内存，无需额外操作
return true;

13
DMS.WPF/Services/VariableTableDataService.cs
View File

@@ -3,6 +3,7 @@ using AutoMapper;
using DMS.Application.DTOs;
using DMS.Application.Interfaces;
using DMS.Core.Enums;
using DMS.Core.Models;
using DMS.WPF.Interfaces;
using DMS.WPF.ItemViewModel;
@@ -38,17 +39,17 @@ public class VariableTableDataService : IVariableTableDataService
}
}
public async Task<int> AddVariableTable(VariableTableDto variableTableDto,
public async Task<int> AddVariableTable(VariableTable variableTable,
MenuBeanDto menuDto = null, bool isAddDb = false)
{
if (variableTableDto == null)
if (variableTable == null)
return 0;
if (isAddDb && menuDto != null)
{
CreateVariableTableWithMenuDto createDto = new CreateVariableTableWithMenuDto();
createDto.VariableTable = variableTableDto;
createDto.DeviceId = variableTableDto.DeviceId;
createDto.VariableTable = variableTable;
createDto.DeviceId = variableTable.DeviceId;
createDto.Menu = menuDto;
var resDto = await _appDataCenterService.VariableTableManagementService.CreateVariableTableAsync(createDto);
@@ -69,8 +70,8 @@ public class VariableTableDataService : IVariableTableDataService
return false;
}
var variableTableDto = _mapper.Map<VariableTableDto>(variableTable);
if (await _appDataCenterService.VariableTableManagementService.UpdateVariableTableAsync(variableTableDto) > 0)
var variableTable_mapped = _mapper.Map<VariableTable>(variableTable);
if (await _appDataCenterService.VariableTableManagementService.UpdateVariableTableAsync(variableTable_mapped) > 0)
{
// 更新数据库后会自动更新内存，无需额外操作

2
DMS.WPF/ViewModels/DeviceDetailViewModel.cs
View File

@@ -75,7 +75,7 @@ public partial class DeviceDetailViewModel : ViewModelBase
TargetViewKey = nameof(VariableTableViewModel)
};
int addVarTableId = await _wpfDataService.VariableTableDataService.AddVariableTable(
_mapper.Map<VariableTableDto>(VariableTableItem),
_mapper.Map<VariableTable>(VariableTableItem),
tableMenu, true);
if (addVarTableId > 0)

6
DMS.WPF/ViewModels/DevicesViewModel.cs
View File

@@ -95,7 +95,7 @@ public partial class DevicesViewModel : ViewModelBase, INavigatable
// 添加null检查
if (_mapper != null)
{
dto.Device = _mapper.Map<DeviceDto>(device);
dto.Device = _mapper.Map<Device>(device);
}
else
{
@@ -113,7 +113,7 @@ public partial class DevicesViewModel : ViewModelBase, INavigatable
if (device.IsAddDefVarTable)
{
dto.VariableTable = new VariableTableDto()
dto.VariableTable = new VariableTable()
{
Name = "默认变量表",
Description = "默认变量表",
@@ -273,7 +273,7 @@ public partial class DevicesViewModel : ViewModelBase, INavigatable
TargetViewKey = nameof(VariableTableViewModel)
};
int addVarTableId = await _wpfDataService.VariableTableDataService.AddVariableTable(
_mapper.Map<VariableTableDto>(VariableTableItem),
_mapper.Map<VariableTable>(VariableTableItem),
tableMenu, true);
if (addVarTableId > 0)

18
DMS.WPF/ViewModels/VariableTableViewModel.cs
View File

@@ -208,7 +208,7 @@ partial class VariableTableViewModel : ViewModelBase, INavigatable
editedVariable.UpdatedAt = DateTime.Now;
// 更新数据库中的变量数据
var updateResult = await _variableManagementService.UpdateVariableAsync(_mapper.Map<VariableDto>(editedVariable));
var updateResult = await _variableManagementService.UpdateVariableAsync(_mapper.Map<Variable>(editedVariable));
if (updateResult > 0)
@@ -245,7 +245,7 @@ partial class VariableTableViewModel : ViewModelBase, INavigatable
if (improtVariable == null || improtVariable.Count == 0) return;
var improtVariableDtos = _mapper.Map<List<VariableDto>>(improtVariable);
var improtVariableDtos = _mapper.Map<List<Variable>>(improtVariable);
foreach (var variableDto in improtVariableDtos)
{
variableDto.IsActive = true;
@@ -331,7 +331,7 @@ partial class VariableTableViewModel : ViewModelBase, INavigatable
// 将导入的变量转换为DTO并设置必要的属性
var importedVariableDtos = _mapper.Map<List<VariableDto>>(importedVariables);
var importedVariableDtos = _mapper.Map<List<Variable>>(importedVariables);
foreach (var variableDto in importedVariableDtos)
{
variableDto.CreatedAt = DateTime.Now;
@@ -420,7 +420,7 @@ partial class VariableTableViewModel : ViewModelBase, INavigatable
// // 添加变量数据到数据库
var addVariable
= await _variableManagementService.CreateVariableAsync(_mapper.Map<VariableDto>(variableItemViewModel));
= await _variableManagementService.CreateVariableAsync(_mapper.Map<Variable>(variableItemViewModel));
_mapper.Map(addVariable, variableItemViewModel);
// // 更新当前页面显示的数据：将新变量添加到集合中
_variableItemList.Add(variableItemViewModel);
@@ -526,7 +526,7 @@ partial class VariableTableViewModel : ViewModelBase, INavigatable
}
// 批量更新数据库中的变量数据
var variableDtos = _mapper.Map<List<VariableDto>>(validVariables);
var variableDtos = _mapper.Map<List<Variable>>(validVariables);
var result = await _variableManagementService.UpdateVariablesAsync(variableDtos);
if (result > 0)
@@ -568,7 +568,7 @@ partial class VariableTableViewModel : ViewModelBase, INavigatable
}
// 批量更新数据库中的变量数据
var variableDtos = _mapper.Map<List<VariableDto>>(validVariables);
var variableDtos = _mapper.Map<List<Variable>>(validVariables);
var result = await _variableManagementService.UpdateVariablesAsync(variableDtos);
if (result > 0)
@@ -720,7 +720,7 @@ partial class VariableTableViewModel : ViewModelBase, INavigatable
}
// 批量更新数据库中的变量数据
var variableDtos = _mapper.Map<List<VariableDto>>(validVariables);
var variableDtos = _mapper.Map<List<Variable>>(validVariables);
var result = await _variableManagementService.UpdateVariablesAsync(variableDtos);
if (result > 0)
@@ -800,7 +800,7 @@ partial class VariableTableViewModel : ViewModelBase, INavigatable
}
// 批量更新数据库中的变量数据
var variableDtos = _mapper.Map<List<VariableDto>>(validVariables);
var variableDtos = _mapper.Map<List<Variable>>(validVariables);
var updateResult = await _variableManagementService.UpdateVariablesAsync(variableDtos);
@@ -855,7 +855,7 @@ partial class VariableTableViewModel : ViewModelBase, INavigatable
}
// 批量更新数据库中的变量数据
var variableDtos = _mapper.Map<List<VariableDto>>(validVariables);
var variableDtos = _mapper.Map<List<Variable>>(validVariables);
var updateResult = await _variableManagementService.UpdateVariablesAsync(variableDtos);
if (updateResult > 0)