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

21
DMS.Application/Services/Management/DeviceManagementService.cs
View File

@@ -4,6 +4,7 @@ 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;
@@ -26,7 +27,7 @@ public class DeviceManagementService : IDeviceManagementService
/// <summary>
/// 异步根据ID获取设备DTO。
/// </summary>
public async Task<DeviceDto> GetDeviceByIdAsync(int id)
public async Task<Device> GetDeviceByIdAsync(int id)
{
return await _deviceAppService.GetDeviceByIdAsync(id);
}
@@ -34,7 +35,7 @@ public class DeviceManagementService : IDeviceManagementService
/// <summary>
/// 异步获取所有设备DTO列表。
/// </summary>
public async Task<List<DeviceDto>> GetAllDevicesAsync()
public async Task<List<Device>> GetAllDevicesAsync()
{
return await _deviceAppService.GetAllDevicesAsync();
}
@@ -65,15 +66,15 @@ public class DeviceManagementService : IDeviceManagementService
/// <summary>
/// 异步更新一个已存在的设备。
/// </summary>
public async Task<int> UpdateDeviceAsync(DeviceDto deviceDto)
public async Task<int> UpdateDeviceAsync(Device device)
{
var result = await _deviceAppService.UpdateDeviceAsync(deviceDto);
var result = await _deviceAppService.UpdateDeviceAsync(device);
// 更新成功后，更新内存中的设备
if (result > 0 && deviceDto != null)
if (result > 0 && device != null)
{
_appDataStorageService.Devices.AddOrUpdate(deviceDto.Id, deviceDto, (key, oldValue) => deviceDto);
_eventService.RaiseDeviceChanged(this, new DeviceChangedEventArgs(DataChangeType.Updated, deviceDto));
_appDataStorageService.Devices.AddOrUpdate(device.Id, device, (key, oldValue) => device);
_eventService.RaiseDeviceChanged(this, new DeviceChangedEventArgs(DataChangeType.Updated, device));
}
return result;
@@ -90,9 +91,9 @@ public class DeviceManagementService : IDeviceManagementService
// 删除成功后，从内存中移除设备
if (result && device != null)
{
if (_appDataStorageService.Devices.TryGetValue(deviceId, out var deviceDto))
if (_appDataStorageService.Devices.TryGetValue(deviceId, out var deviceInStorage))
{
foreach (var variableTable in deviceDto.VariableTables)
foreach (var variableTable in deviceInStorage.VariableTables)
{
foreach (var variable in variableTable.Variables)
{
@@ -104,7 +105,7 @@ public class DeviceManagementService : IDeviceManagementService
_appDataStorageService.Devices.TryRemove(deviceId, out _);
_eventService.RaiseDeviceChanged(this, new DeviceChangedEventArgs(DataChangeType.Deleted, deviceDto));
_eventService.RaiseDeviceChanged(this, new DeviceChangedEventArgs(DataChangeType.Deleted, deviceInStorage));
}
}

75
DMS.Application/Services/Management/VariableManagementService.cs
View File

@@ -6,6 +6,7 @@ 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;
@@ -37,7 +38,7 @@ public class VariableManagementService : IVariableManagementService
/// <summary>
/// 异步根据ID获取变量DTO。
/// </summary>
public async Task<VariableDto> GetVariableByIdAsync(int id)
public async Task<Variable> GetVariableByIdAsync(int id)
{
return await _variableAppService.GetVariableByIdAsync(id);
}
@@ -45,7 +46,7 @@ public class VariableManagementService : IVariableManagementService
/// <summary>
/// 异步获取所有变量DTO列表。
/// </summary>
public async Task<List<VariableDto>> GetAllVariablesAsync()
public async Task<List<Variable>> GetAllVariablesAsync()
{
return await _variableAppService.GetAllVariablesAsync();
}
@@ -53,18 +54,16 @@ public class VariableManagementService : IVariableManagementService
/// <summary>
/// 异步创建一个新变量。
/// </summary>
public async Task<VariableDto> CreateVariableAsync(VariableDto variableDto)
public async Task<Variable> CreateVariableAsync(Variable variable)
{
var result = await _variableAppService.CreateVariableAsync(variableDto);
var result = await _variableAppService.CreateVariableAsync(variable);
// 创建成功后，将变量添加到内存中
if (result != null)
{
VariableTableDto variableTableDto = null;
if (_appDataStorageService.VariableTables.TryGetValue(result.VariableTableId, out var variableTable))
{
variableTableDto = variableTable;
result.VariableTable = variableTableDto;
result.VariableTable = variableTable;
variableTable.Variables.Add(result);
}
@@ -81,51 +80,51 @@ public class VariableManagementService : IVariableManagementService
/// <summary>
/// 异步更新一个已存在的变量。
/// </summary>
public async Task<int> UpdateVariableAsync(VariableDto variableDto)
public async Task<int> UpdateVariableAsync(Variable variable)
{
return await UpdateVariablesAsync(new List<VariableDto>() { variableDto});
return await UpdateVariablesAsync(new List<Variable>() { variable});
}
/// <summary>
/// 异步批量更新变量。
/// </summary>
public async Task<int> UpdateVariablesAsync(List<VariableDto> variableDtos)
public async Task<int> UpdateVariablesAsync(List<Variable> variables)
{
var result = await _variableAppService.UpdateVariablesAsync(variableDtos);
var result = await _variableAppService.UpdateVariablesAsync(variables);
// 批量更新成功后，更新内存中的变量
if (result > 0 && variableDtos != null)
if (result > 0 && variables != null)
{
foreach (var variableDto in variableDtos)
foreach (var variable in variables)
{
if (_appDataStorageService.Variables.TryGetValue(variableDto.Id, out var mVariableDto))
if (_appDataStorageService.Variables.TryGetValue(variable.Id, out var mVariable))
{
// 比较旧值和新值，确定哪个属性发生了变化
var changedProperties = GetChangedProperties(mVariableDto, variableDto);
var changedProperties = GetChangedProperties(mVariable, variable);
// 更新内存中的变量
_mapper.Map(variableDto,mVariableDto);
_mapper.Map(variable, mVariable);
// 为每个发生变化的属性触发事件
foreach (var property in changedProperties)
{
_eventService.RaiseVariableChanged(
this, new VariableChangedEventArgs(ActionChangeType.Updated, variableDto, property));
this, new VariableChangedEventArgs(ActionChangeType.Updated, variable, property));
}
// 如果没有任何属性发生变化，至少触发一次更新事件
if (changedProperties.Count == 0)
{
_eventService.RaiseVariableChanged(
this, new VariableChangedEventArgs(ActionChangeType.Updated, variableDto, VariablePropertyType.All));
this, new VariableChangedEventArgs(ActionChangeType.Updated, variable, VariablePropertyType.All));
}
}
else
{
// 如果内存中不存在该变量，则直接添加
_appDataStorageService.Variables.TryAdd(variableDto.Id, variableDto);
_appDataStorageService.Variables.TryAdd(variable.Id, variable);
_eventService.RaiseVariableChanged(
this, new VariableChangedEventArgs(ActionChangeType.Added, variableDto, VariablePropertyType.All));
this, new VariableChangedEventArgs(ActionChangeType.Added, variable, VariablePropertyType.All));
}
}
}
@@ -138,23 +137,21 @@ public class VariableManagementService : IVariableManagementService
/// </summary>
public async Task<bool> DeleteVariableAsync(int id)
{
var variable = await _variableAppService.GetVariableByIdAsync(id); // 获取变量信息用于内存删除
var result = await _variableAppService.DeleteVariableAsync(id);
// 删除成功后，从内存中移除变量
if (result && variable != null)
if (result)
{
if (_appDataStorageService.Variables.TryRemove(id, out var variableDto))
if (_appDataStorageService.Variables.TryRemove(id, out var variable))
{
VariableTableDto variableTableDto = null;
if (variableDto != null && _appDataStorageService.VariableTables.TryGetValue(variableDto.VariableTableId, out var variableTable))
if (variable != null && _appDataStorageService.VariableTables.TryGetValue(variable.VariableTableId, out var variableTable))
{
variableTableDto = variableTable;
variableTable.Variables.Remove(variableDto);
variableTable.Variables.Remove(variable);
}
_eventService.RaiseVariableChanged(
this, new VariableChangedEventArgs(ActionChangeType.Deleted, variableDto));
this, new VariableChangedEventArgs(ActionChangeType.Deleted, variable));
}
}
@@ -164,14 +161,14 @@ public class VariableManagementService : IVariableManagementService
/// <summary>
/// 异步批量导入变量。
/// </summary>
public async Task<List<VariableDto>> BatchImportVariablesAsync(List<VariableDto> variables)
public async Task<List<Variable>> BatchImportVariablesAsync(List<Variable> variables)
{
var result = await _variableAppService.BatchImportVariablesAsync(variables);
foreach (var variableDto in result)
foreach (var variable in result)
{
if (_appDataStorageService.VariableTables.TryGetValue(variableDto.VariableTableId ,out var variableTable))
if (_appDataStorageService.VariableTables.TryGetValue(variable.VariableTableId ,out var variableTable))
{
variableDto.VariableTable = variableTable;
variable.VariableTable = variableTable;
}
}
@@ -186,7 +183,7 @@ public class VariableManagementService : IVariableManagementService
return result;
}
public async Task<List<VariableDto>> FindExistingVariablesAsync(IEnumerable<VariableDto> variablesToCheck)
public async Task<List<Variable>> FindExistingVariablesAsync(IEnumerable<Variable> variablesToCheck)
{
return await _variableAppService.FindExistingVariablesAsync(variablesToCheck);
}
@@ -197,7 +194,7 @@ public class VariableManagementService : IVariableManagementService
/// <param name="oldVariable">旧变量值</param>
/// <param name="newVariable">新变量值</param>
/// <returns>发生变化的属性列表</returns>
private List<VariablePropertyType> GetChangedProperties(VariableDto oldVariable, VariableDto newVariable)
private List<VariablePropertyType> GetChangedProperties(Variable oldVariable, Variable newVariable)
{
var changedProperties = new List<VariablePropertyType>();
@@ -261,17 +258,15 @@ public class VariableManagementService : IVariableManagementService
{
foreach (var id in ids)
{
if (_appDataStorageService.Variables.TryRemove(id, out var variableDto))
if (_appDataStorageService.Variables.TryRemove(id, out var variable))
{
VariableTableDto variableTableDto = null;
if (variableDto != null && _appDataStorageService.VariableTables.TryGetValue(variableDto.VariableTableId, out var variableTable))
if (variable != null && _appDataStorageService.VariableTables.TryGetValue(variable.VariableTableId, out var variableTable))
{
variableTableDto = variableTable;
variableTable.Variables.Remove(variableDto);
variableTable.Variables.Remove(variable);
}
_eventService.RaiseVariableChanged(
this, new VariableChangedEventArgs(ActionChangeType.Deleted, variableDto));
this, new VariableChangedEventArgs(ActionChangeType.Deleted, variable));
}
}
}

68
DMS.Application/Services/Management/VariableTableManagementService.cs
View File

@@ -1,10 +1,10 @@
using System.Collections.Concurrent;
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;
@@ -22,7 +22,7 @@ public class VariableTableManagementService : IVariableTableManagementService
/// </summary>
public event EventHandler<VariableTableChangedEventArgs> OnVariableTableChanged;
public VariableTableManagementService(IVariableTableAppService variableTableAppService,
public VariableTableManagementService(IVariableTableAppService variableTableAppService,
IAppDataStorageService appDataStorageService,
IEventService eventService)
{
@@ -34,7 +34,7 @@ public class VariableTableManagementService : IVariableTableManagementService
/// <summary>
/// 异步根据ID获取变量表DTO。
/// </summary>
public async Task<VariableTableDto> GetVariableTableByIdAsync(int id)
public async Task<VariableTable> GetVariableTableByIdAsync(int id)
{
return await _variableTableAppService.GetVariableTableByIdAsync(id);
}
@@ -42,7 +42,7 @@ public class VariableTableManagementService : IVariableTableManagementService
/// <summary>
/// 异步获取所有变量表DTO列表。
/// </summary>
public async Task<List<VariableTableDto>> GetAllVariableTablesAsync()
public async Task<List<VariableTable>> GetAllVariableTablesAsync()
{
return await _variableTableAppService.GetAllVariableTablesAsync();
}
@@ -53,25 +53,20 @@ public class VariableTableManagementService : IVariableTableManagementService
public async Task<CreateVariableTableWithMenuDto> CreateVariableTableAsync(CreateVariableTableWithMenuDto dto)
{
var result = await _variableTableAppService.CreateVariableTableAsync(dto);
// 创建成功后，将变量表添加到内存中
if (result?.VariableTable != null)
{
// 添加null检查
if (result.VariableTable == null)
return result;
DeviceDto deviceDto = null;
if (_appDataStorageService.Devices != null &&
if (_appDataStorageService.Devices != null &&
_appDataStorageService.Devices.TryGetValue(result.VariableTable.DeviceId, out var device))
{
deviceDto = device;
// 确保VariableTables不为null
if (device.VariableTables == null)
device.VariableTables = new List<VariableTableDto>();
device.VariableTables = new List<VariableTable>();
device.VariableTables.Add(result.VariableTable);
// 确保Device属性不为null
if (result.VariableTable != null)
result.VariableTable.Device = device;
@@ -85,32 +80,26 @@ public class VariableTableManagementService : IVariableTableManagementService
result.VariableTable));
}
}
return result;
}
/// <summary>
/// 异步更新一个已存在的变量表。
/// </summary>
public async Task<int> UpdateVariableTableAsync(VariableTableDto variableTableDto)
public async Task<int> UpdateVariableTableAsync(VariableTable variableTable)
{
var result = await _variableTableAppService.UpdateVariableTableAsync(variableTableDto);
// 更新成功后，更新内存中的变量表
if (result > 0 && variableTableDto != null)
{
DeviceDto deviceDto = null;
if (_appDataStorageService.Devices.TryGetValue(variableTableDto.DeviceId, out var device))
{
deviceDto = device;
}
var result = await _variableTableAppService.UpdateVariableTableAsync(variableTable);
_appDataStorageService.VariableTables.AddOrUpdate(variableTableDto.Id, variableTableDto, (key, oldValue) => variableTableDto);
// 更新成功后，更新内存中的变量表
if (result > 0 && variableTable != null)
{
_appDataStorageService.VariableTables.AddOrUpdate(variableTable.Id, variableTable, (key, oldValue) => variableTable);
_eventService.RaiseVariableTableChanged(this, new VariableTableChangedEventArgs(
DataChangeType.Updated,
variableTableDto));
variableTable));
}
return result;
}
@@ -119,32 +108,29 @@ public class VariableTableManagementService : IVariableTableManagementService
/// </summary>
public async Task<bool> DeleteVariableTableAsync(int id)
{
var variableTable = await _variableTableAppService.GetVariableTableByIdAsync(id); // 获取变量表信息用于内存删除
var result = await _variableTableAppService.DeleteVariableTableAsync(id);
// 删除成功后，从内存中移除变量表
if (result && variableTable != null)
if (result )
{
if (_appDataStorageService.VariableTables.TryRemove(id, out var variableTableDto))
if (_appDataStorageService.VariableTables.TryRemove(id, out var variableTable))
{
DeviceDto deviceDto = null;
if (variableTableDto != null && _appDataStorageService.Devices.TryGetValue(variableTableDto.DeviceId, out var device))
if (variableTable != null && _appDataStorageService.Devices.TryGetValue(variableTable.DeviceId, out var device))
{
deviceDto = device;
if (device.VariableTables != null)
device.VariableTables.Remove(variableTableDto);
device.VariableTables.Remove(variableTable);
}
_eventService.RaiseVariableTableChanged(this, new VariableTableChangedEventArgs(
DataChangeType.Deleted,
variableTableDto));
variableTable));
}
}
return result;
}
}