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

12
DMS.Application/Interfaces/Database/IDeviceAppService.cs
View File

@@ -12,13 +12,11 @@ public interface IDeviceAppService
/// <summary>
/// 异步根据ID获取设备DTO。
/// </summary>
Task<DeviceDto> GetDeviceByIdAsync(int id);
Task<Device> GetDeviceByIdAsync(int id);
/// <summary>
/// 异步获取所有设备DTO列表。
/// </summary>
Task<List<DeviceDto>> GetAllDevicesAsync();
Task<List<Device>> GetAllDevicesAsync();
/// <summary>
/// 异步创建一个新设备及其关联的变量表和菜单（事务性操作）。
/// </summary>
@@ -29,8 +27,7 @@ public interface IDeviceAppService
/// <summary>
/// 异步更新一个已存在的设备。
/// </summary>
Task<int> UpdateDeviceAsync(DeviceDto deviceDto);
Task<int> UpdateDeviceAsync(Device device);
/// <summary>
/// 异步删除一个设备。
/// </summary>
@@ -49,5 +46,4 @@ public interface IDeviceAppService
/// <summary>
/// 异步获取指定协议类型的设备列表。
/// </summary>
Task<List<DeviceDto>> GetDevicesByProtocolAsync(ProtocolType protocol);
}
Task<List<Device>> GetDevicesByProtocolAsync(ProtocolType protocol);}

21
DMS.Application/Interfaces/Database/IVariableAppService.cs
View File

@@ -1,4 +1,5 @@
using DMS.Application.DTOs;
using DMS.Core.Models;
namespace DMS.Application.Interfaces.Database;
@@ -10,37 +11,37 @@ public interface IVariableAppService
/// <summary>
/// 异步根据ID获取变量DTO。
/// </summary>
Task<VariableDto> GetVariableByIdAsync(int id);
Task<Variable> GetVariableByIdAsync(int id);
/// <summary>
/// 异步根据OPC UA NodeId获取变量DTO。
/// </summary>
Task<VariableDto?> GetVariableByOpcUaNodeIdAsync(string opcUaNodeId);
Task<Variable?> GetVariableByOpcUaNodeIdAsync(string opcUaNodeId);
/// <summary>
/// 异步根据OPC UA NodeId列表获取变量DTO列表。
/// </summary>
Task<List<VariableDto>> GetVariableByOpcUaNodeIdsAsync(List<string> opcUaNodeIds);
Task<List<Variable>> GetVariableByOpcUaNodeIdsAsync(List<string> opcUaNodeIds);
/// <summary>
/// 异步获取所有变量DTO列表。
/// </summary>
Task<List<VariableDto>> GetAllVariablesAsync();
Task<List<Variable>> GetAllVariablesAsync();
/// <summary>
/// 异步创建一个新变量。
/// </summary>
Task<VariableDto> CreateVariableAsync(VariableDto variableDto);
Task<Variable> CreateVariableAsync(Variable variable);
/// <summary>
/// 异步更新一个已存在的变量。
/// </summary>
Task<int> UpdateVariableAsync(VariableDto variableDto);
Task<int> UpdateVariableAsync(Variable variable);
/// <summary>
/// 异步更新一个已存在的变量。
/// </summary>
Task<int> UpdateVariablesAsync(List<VariableDto> variableDtos);
Task<int> UpdateVariablesAsync(List<Variable> variables);
/// <summary>
/// 异步删除一个变量。
@@ -55,19 +56,19 @@ public interface IVariableAppService
/// <summary>
/// 异步批量导入变量。
/// </summary>
Task<List<VariableDto>> BatchImportVariablesAsync(List<VariableDto> variables);
Task<List<Variable>> BatchImportVariablesAsync(List<Variable> variables);
/// <summary>
/// 检测一组变量是否已存在。
/// </summary>
/// <param name="variablesToCheck">要检查的变量列表。</param>
/// <returns>返回输入列表中已存在的变量。</returns>
Task<List<VariableDto>> FindExistingVariablesAsync(IEnumerable<VariableDto> variablesToCheck);
Task<List<Variable>> FindExistingVariablesAsync(IEnumerable<Variable> variablesToCheck);
/// <summary>
/// 检测单个变量是否已存在。
/// </summary>
/// <param name="variableToCheck">要检查的变量。</param>
/// <returns>如果变量已存在则返回该变量，否则返回null。</returns>
Task<VariableDto?> FindExistingVariableAsync(VariableDto variableToCheck);
Task<Variable?> FindExistingVariableAsync(Variable variableToCheck);
}

8
DMS.Application/Interfaces/Database/IVariableTableAppService.cs
View File

@@ -1,13 +1,15 @@
using DMS.Application.DTOs;
using DMS.Core.Models;
namespace DMS.Application.Interfaces.Database
{
public interface IVariableTableAppService
{
Task<VariableTableDto> GetVariableTableByIdAsync(int id);
Task<List<VariableTableDto>> GetAllVariableTablesAsync();
Task<VariableTable> GetVariableTableByIdAsync(int id);
Task<List<VariableTable>> GetAllVariableTablesAsync();
Task<CreateVariableTableWithMenuDto> CreateVariableTableAsync(CreateVariableTableWithMenuDto createDto);
Task<int> UpdateVariableTableAsync(VariableTableDto variableTableDto);
Task<int> UpdateVariableTableAsync(VariableTable variableTableDto);
Task<bool> DeleteVariableTableAsync(int id);
}
}

3
DMS.Application/Interfaces/IAlarmService.cs
View File

@@ -1,5 +1,6 @@
using DMS.Application.DTOs;
using DMS.Core.Events;
using DMS.Core.Models;
namespace DMS.Application.Interfaces
{
@@ -10,7 +11,7 @@ namespace DMS.Application.Interfaces
/// </summary>
/// <param name="variable">变量DTO</param>
/// <returns>是否触发报警</returns>
bool CheckAlarm(VariableDto variable);
bool CheckAlarm(Variable variable);
/// <summary>
/// 警报事件

7
DMS.Application/Interfaces/IAppDataStorageService.cs
View File

@@ -9,17 +9,16 @@ public interface IAppDataStorageService
/// <summary>
/// 安全字典，用于存储所有设备数据
/// </summary>
ConcurrentDictionary<int, DeviceDto> Devices { get; }
ConcurrentDictionary<int, Device> Devices { get; }
/// <summary>
/// 安全字典，用于存储所有变量表数据
/// </summary>
ConcurrentDictionary<int, VariableTableDto> VariableTables { get; }
ConcurrentDictionary<int, VariableTable> VariableTables { get; }
/// <summary>
/// 安全字典，用于存储所有变量数据
/// </summary>
ConcurrentDictionary<int, VariableDto> Variables { get; }
ConcurrentDictionary<int, Variable> Variables { get; }
/// <summary>
/// 安全字典，用于存储所有菜单数据

10
DMS.Application/Interfaces/Management/IDeviceManagementService.cs
View File

@@ -1,5 +1,6 @@
using DMS.Application.DTOs;
using DMS.Application.Events;
using DMS.Core.Models;
namespace DMS.Application.Interfaces.Management;
@@ -10,13 +11,11 @@ public interface IDeviceManagementService
/// <summary>
/// 异步根据ID获取设备DTO。
/// </summary>
Task<DeviceDto> GetDeviceByIdAsync(int id);
Task<Device> GetDeviceByIdAsync(int id);
/// <summary>
/// 异步获取所有设备DTO列表。
/// </summary>
Task<List<DeviceDto>> GetAllDevicesAsync();
Task<List<Device>> GetAllDevicesAsync();
/// <summary>
/// 异步创建一个新设备及其关联的变量表和菜单（事务性操作）。
/// </summary>
@@ -25,8 +24,7 @@ public interface IDeviceManagementService
/// <summary>
/// 异步更新一个已存在的设备。
/// </summary>
Task<int> UpdateDeviceAsync(DeviceDto deviceDto);
Task<int> UpdateDeviceAsync(Device device);
/// <summary>
/// 异步删除一个设备。
/// </summary>

15
DMS.Application/Interfaces/Management/IVariableManagementService.cs
View File

@@ -1,5 +1,6 @@
using System.Collections.Concurrent;
using DMS.Application.DTOs;
using DMS.Core.Models;
namespace DMS.Application.Interfaces.Management;
@@ -8,27 +9,27 @@ public interface IVariableManagementService
/// <summary>
/// 异步根据ID获取变量DTO。
/// </summary>
Task<VariableDto> GetVariableByIdAsync(int id);
Task<Variable> GetVariableByIdAsync(int id);
/// <summary>
/// 异步获取所有变量DTO列表。
/// </summary>
Task<List<VariableDto>> GetAllVariablesAsync();
Task<List<Variable>> GetAllVariablesAsync();
/// <summary>
/// 异步创建一个新变量。
/// </summary>
Task<VariableDto> CreateVariableAsync(VariableDto variableDto);
Task<Variable> CreateVariableAsync(Variable variable);
/// <summary>
/// 异步更新一个已存在的变量。
/// </summary>
Task<int> UpdateVariableAsync(VariableDto variableDto);
Task<int> UpdateVariableAsync(Variable variable);
/// <summary>
/// 异步批量更新变量。
/// </summary>
Task<int> UpdateVariablesAsync(List<VariableDto> variableDtos);
Task<int> UpdateVariablesAsync(List<Variable> variables);
/// <summary>
/// 异步删除一个变量。
@@ -43,10 +44,10 @@ public interface IVariableManagementService
/// <summary>
/// 异步批量导入变量。
/// </summary>
Task<List<VariableDto>> BatchImportVariablesAsync(List<VariableDto> variables);
Task<List<Variable>> BatchImportVariablesAsync(List<Variable> variables);
/// <summary>
/// 查找已存在的变量。
/// </summary>
Task<List<VariableDto>> FindExistingVariablesAsync(IEnumerable<VariableDto> variablesToCheck);
Task<List<Variable>> FindExistingVariablesAsync(IEnumerable<Variable> variablesToCheck);
}

7
DMS.Application/Interfaces/Management/IVariableTableManagementService.cs
View File

@@ -1,5 +1,6 @@
using DMS.Application.DTOs;
using DMS.Application.Events;
using DMS.Core.Models;
namespace DMS.Application.Interfaces.Management;
@@ -8,12 +9,12 @@ public interface IVariableTableManagementService
/// <summary>
/// 异步根据ID获取变量表DTO。
/// </summary>
Task<VariableTableDto> GetVariableTableByIdAsync(int id);
Task<VariableTable> GetVariableTableByIdAsync(int id);
/// <summary>
/// 异步获取所有变量表DTO列表。
/// </summary>
Task<List<VariableTableDto>> GetAllVariableTablesAsync();
Task<List<VariableTable>> GetAllVariableTablesAsync();
/// <summary>
/// 异步创建一个新变量表及其关联菜单（事务性操作）。
@@ -23,7 +24,7 @@ public interface IVariableTableManagementService
/// <summary>
/// 异步更新一个已存在的变量表。
/// </summary>
Task<int> UpdateVariableTableAsync(VariableTableDto variableTableDto);
Task<int> UpdateVariableTableAsync(VariableTable variableTableDto);
/// <summary>
/// 异步删除一个变量表。