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

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)
{
// 更新数据库后会自动更新内存，无需额外操作