diff --git a/src/X1.Application/Features/TerminalDevices/Commands/CreateAdbOperation/CreateAdbOperationCommand.cs b/src/X1.Application/Features/AdbOperations/Commands/CreateAdbOperation/CreateAdbOperationCommand.cs similarity index 95% rename from src/X1.Application/Features/TerminalDevices/Commands/CreateAdbOperation/CreateAdbOperationCommand.cs rename to src/X1.Application/Features/AdbOperations/Commands/CreateAdbOperation/CreateAdbOperationCommand.cs index 04c63e8..e794dc9 100644 --- a/src/X1.Application/Features/TerminalDevices/Commands/CreateAdbOperation/CreateAdbOperationCommand.cs +++ b/src/X1.Application/Features/AdbOperations/Commands/CreateAdbOperation/CreateAdbOperationCommand.cs @@ -1,7 +1,7 @@ using CellularManagement.Domain.Common; using MediatR; -namespace CellularManagement.Application.Features.TerminalDevices.Commands.CreateAdbOperation; +namespace CellularManagement.Application.Features.AdbOperations.Commands.CreateAdbOperation; /// /// 创建ADB操作命令 diff --git a/src/X1.Application/Features/TerminalDevices/Commands/CreateAdbOperation/CreateAdbOperationCommandHandler.cs b/src/X1.Application/Features/AdbOperations/Commands/CreateAdbOperation/CreateAdbOperationCommandHandler.cs similarity index 96% rename from src/X1.Application/Features/TerminalDevices/Commands/CreateAdbOperation/CreateAdbOperationCommandHandler.cs rename to src/X1.Application/Features/AdbOperations/Commands/CreateAdbOperation/CreateAdbOperationCommandHandler.cs index 5c663eb..d80bbd8 100644 --- a/src/X1.Application/Features/TerminalDevices/Commands/CreateAdbOperation/CreateAdbOperationCommandHandler.cs +++ b/src/X1.Application/Features/AdbOperations/Commands/CreateAdbOperation/CreateAdbOperationCommandHandler.cs @@ -4,7 +4,7 @@ using CellularManagement.Domain.Repositories.Terminal; using MediatR; using Microsoft.Extensions.Logging; -namespace CellularManagement.Application.Features.TerminalDevices.Commands.CreateAdbOperation; +namespace CellularManagement.Application.Features.AdbOperations.Commands.CreateAdbOperation; /// /// 创建ADB操作命令处理器 diff --git a/src/X1.Application/Features/TerminalDevices/Commands/DeleteAdbOperation/DeleteAdbOperationCommand.cs b/src/X1.Application/Features/AdbOperations/Commands/DeleteAdbOperation/DeleteAdbOperationCommand.cs similarity index 75% rename from src/X1.Application/Features/TerminalDevices/Commands/DeleteAdbOperation/DeleteAdbOperationCommand.cs rename to src/X1.Application/Features/AdbOperations/Commands/DeleteAdbOperation/DeleteAdbOperationCommand.cs index 62f6ec9..cf7676e 100644 --- a/src/X1.Application/Features/TerminalDevices/Commands/DeleteAdbOperation/DeleteAdbOperationCommand.cs +++ b/src/X1.Application/Features/AdbOperations/Commands/DeleteAdbOperation/DeleteAdbOperationCommand.cs @@ -1,7 +1,7 @@ using MediatR; using CellularManagement.Domain.Common; -namespace CellularManagement.Application.Features.TerminalDevices.Commands.DeleteAdbOperation; +namespace CellularManagement.Application.Features.AdbOperations.Commands.DeleteAdbOperation; /// /// 删除ADB操作命令 diff --git a/src/X1.Application/Features/TerminalDevices/Commands/DeleteAdbOperation/DeleteAdbOperationCommandHandler.cs b/src/X1.Application/Features/AdbOperations/Commands/DeleteAdbOperation/DeleteAdbOperationCommandHandler.cs similarity index 95% rename from src/X1.Application/Features/TerminalDevices/Commands/DeleteAdbOperation/DeleteAdbOperationCommandHandler.cs rename to src/X1.Application/Features/AdbOperations/Commands/DeleteAdbOperation/DeleteAdbOperationCommandHandler.cs index 43e3558..c06a296 100644 --- a/src/X1.Application/Features/TerminalDevices/Commands/DeleteAdbOperation/DeleteAdbOperationCommandHandler.cs +++ b/src/X1.Application/Features/AdbOperations/Commands/DeleteAdbOperation/DeleteAdbOperationCommandHandler.cs @@ -2,7 +2,7 @@ using CellularManagement.Domain.Repositories.Terminal; using MediatR; using Microsoft.Extensions.Logging; using CellularManagement.Domain.Common; -namespace CellularManagement.Application.Features.TerminalDevices.Commands.DeleteAdbOperation; +namespace CellularManagement.Application.Features.AdbOperations.Commands.DeleteAdbOperation; /// /// 删除ADB操作命令处理器 diff --git a/src/X1.Application/Features/TerminalDevices/Commands/UpdateAdbOperation/UpdateAdbOperationCommand.cs b/src/X1.Application/Features/AdbOperations/Commands/UpdateAdbOperation/UpdateAdbOperationCommand.cs similarity index 95% rename from src/X1.Application/Features/TerminalDevices/Commands/UpdateAdbOperation/UpdateAdbOperationCommand.cs rename to src/X1.Application/Features/AdbOperations/Commands/UpdateAdbOperation/UpdateAdbOperationCommand.cs index 46b39c1..648bedc 100644 --- a/src/X1.Application/Features/TerminalDevices/Commands/UpdateAdbOperation/UpdateAdbOperationCommand.cs +++ b/src/X1.Application/Features/AdbOperations/Commands/UpdateAdbOperation/UpdateAdbOperationCommand.cs @@ -1,7 +1,7 @@ using MediatR; using CellularManagement.Domain.Common; -namespace CellularManagement.Application.Features.TerminalDevices.Commands.UpdateAdbOperation; +namespace CellularManagement.Application.Features.AdbOperations.Commands.UpdateAdbOperation; /// /// 更新ADB操作命令 diff --git a/src/X1.Application/Features/TerminalDevices/Commands/UpdateAdbOperation/UpdateAdbOperationCommandHandler.cs b/src/X1.Application/Features/AdbOperations/Commands/UpdateAdbOperation/UpdateAdbOperationCommandHandler.cs similarity index 97% rename from src/X1.Application/Features/TerminalDevices/Commands/UpdateAdbOperation/UpdateAdbOperationCommandHandler.cs rename to src/X1.Application/Features/AdbOperations/Commands/UpdateAdbOperation/UpdateAdbOperationCommandHandler.cs index 4558b25..40a400d 100644 --- a/src/X1.Application/Features/TerminalDevices/Commands/UpdateAdbOperation/UpdateAdbOperationCommandHandler.cs +++ b/src/X1.Application/Features/AdbOperations/Commands/UpdateAdbOperation/UpdateAdbOperationCommandHandler.cs @@ -3,7 +3,7 @@ using MediatR; using Microsoft.Extensions.Logging; using CellularManagement.Domain.Common; -namespace CellularManagement.Application.Features.TerminalDevices.Commands.UpdateAdbOperation; +namespace CellularManagement.Application.Features.AdbOperations.Commands.UpdateAdbOperation; /// /// 更新ADB操作命令处理器 diff --git a/src/X1.Application/Features/TerminalDevices/Queries/GetAdbOperationById/GetAdbOperationByIdQuery.cs b/src/X1.Application/Features/AdbOperations/Queries/GetAdbOperationById/GetAdbOperationByIdQuery.cs similarity index 92% rename from src/X1.Application/Features/TerminalDevices/Queries/GetAdbOperationById/GetAdbOperationByIdQuery.cs rename to src/X1.Application/Features/AdbOperations/Queries/GetAdbOperationById/GetAdbOperationByIdQuery.cs index db20461..74097ae 100644 --- a/src/X1.Application/Features/TerminalDevices/Queries/GetAdbOperationById/GetAdbOperationByIdQuery.cs +++ b/src/X1.Application/Features/AdbOperations/Queries/GetAdbOperationById/GetAdbOperationByIdQuery.cs @@ -1,7 +1,7 @@ using MediatR; using CellularManagement.Domain.Common; -namespace CellularManagement.Application.Features.TerminalDevices.Queries.GetAdbOperationById; +namespace CellularManagement.Application.Features.AdbOperations.Queries.GetAdbOperationById; /// /// 根据ID获取ADB操作查询 diff --git a/src/X1.Application/Features/TerminalDevices/Queries/GetAdbOperationById/GetAdbOperationByIdQueryHandler.cs b/src/X1.Application/Features/AdbOperations/Queries/GetAdbOperationById/GetAdbOperationByIdQueryHandler.cs similarity index 96% rename from src/X1.Application/Features/TerminalDevices/Queries/GetAdbOperationById/GetAdbOperationByIdQueryHandler.cs rename to src/X1.Application/Features/AdbOperations/Queries/GetAdbOperationById/GetAdbOperationByIdQueryHandler.cs index 5214c47..0b42224 100644 --- a/src/X1.Application/Features/TerminalDevices/Queries/GetAdbOperationById/GetAdbOperationByIdQueryHandler.cs +++ b/src/X1.Application/Features/AdbOperations/Queries/GetAdbOperationById/GetAdbOperationByIdQueryHandler.cs @@ -3,7 +3,7 @@ using MediatR; using Microsoft.Extensions.Logging; using CellularManagement.Domain.Common; -namespace CellularManagement.Application.Features.TerminalDevices.Queries.GetAdbOperationById; +namespace CellularManagement.Application.Features.AdbOperations.Queries.GetAdbOperationById; /// /// 根据ID获取ADB操作查询处理器 diff --git a/src/X1.Application/Features/TerminalDevices/Queries/GetAdbOperations/GetAdbOperationsQuery.cs b/src/X1.Application/Features/AdbOperations/Queries/GetAdbOperations/GetAdbOperationsQuery.cs similarity index 95% rename from src/X1.Application/Features/TerminalDevices/Queries/GetAdbOperations/GetAdbOperationsQuery.cs rename to src/X1.Application/Features/AdbOperations/Queries/GetAdbOperations/GetAdbOperationsQuery.cs index 2b67159..2c14759 100644 --- a/src/X1.Application/Features/TerminalDevices/Queries/GetAdbOperations/GetAdbOperationsQuery.cs +++ b/src/X1.Application/Features/AdbOperations/Queries/GetAdbOperations/GetAdbOperationsQuery.cs @@ -1,7 +1,7 @@ using MediatR; using CellularManagement.Domain.Common; -namespace CellularManagement.Application.Features.TerminalDevices.Queries.GetAdbOperations; +namespace CellularManagement.Application.Features.AdbOperations.Queries.GetAdbOperations; /// /// 获取ADB操作列表查询 diff --git a/src/X1.Application/Features/TerminalDevices/Queries/GetAdbOperations/GetAdbOperationsQueryHandler.cs b/src/X1.Application/Features/AdbOperations/Queries/GetAdbOperations/GetAdbOperationsQueryHandler.cs similarity index 96% rename from src/X1.Application/Features/TerminalDevices/Queries/GetAdbOperations/GetAdbOperationsQueryHandler.cs rename to src/X1.Application/Features/AdbOperations/Queries/GetAdbOperations/GetAdbOperationsQueryHandler.cs index f95ad3d..383e546 100644 --- a/src/X1.Application/Features/TerminalDevices/Queries/GetAdbOperations/GetAdbOperationsQueryHandler.cs +++ b/src/X1.Application/Features/AdbOperations/Queries/GetAdbOperations/GetAdbOperationsQueryHandler.cs @@ -3,7 +3,7 @@ using MediatR; using Microsoft.Extensions.Logging; using CellularManagement.Domain.Common; -namespace CellularManagement.Application.Features.TerminalDevices.Queries.GetAdbOperations; +namespace CellularManagement.Application.Features.AdbOperations.Queries.GetAdbOperations; /// /// 获取ADB操作列表查询处理器 diff --git a/src/X1.Application/Features/TerminalDevices/Commands/CreateAtOperation/CreateAtOperationCommand.cs b/src/X1.Application/Features/AtOperations/Commands/CreateAtOperation/CreateAtOperationCommand.cs similarity index 96% rename from src/X1.Application/Features/TerminalDevices/Commands/CreateAtOperation/CreateAtOperationCommand.cs rename to src/X1.Application/Features/AtOperations/Commands/CreateAtOperation/CreateAtOperationCommand.cs index db4af3c..d339ac1 100644 --- a/src/X1.Application/Features/TerminalDevices/Commands/CreateAtOperation/CreateAtOperationCommand.cs +++ b/src/X1.Application/Features/AtOperations/Commands/CreateAtOperation/CreateAtOperationCommand.cs @@ -1,7 +1,7 @@ using CellularManagement.Domain.Common; using MediatR; -namespace CellularManagement.Application.Features.TerminalDevices.Commands.CreateAtOperation; +namespace CellularManagement.Application.Features.AtOperations.Commands.CreateAtOperation; /// /// 创建AT操作命令 diff --git a/src/X1.Application/Features/TerminalDevices/Commands/CreateAtOperation/CreateAtOperationCommandHandler.cs b/src/X1.Application/Features/AtOperations/Commands/CreateAtOperation/CreateAtOperationCommandHandler.cs similarity index 97% rename from src/X1.Application/Features/TerminalDevices/Commands/CreateAtOperation/CreateAtOperationCommandHandler.cs rename to src/X1.Application/Features/AtOperations/Commands/CreateAtOperation/CreateAtOperationCommandHandler.cs index 6445f32..45d2a65 100644 --- a/src/X1.Application/Features/TerminalDevices/Commands/CreateAtOperation/CreateAtOperationCommandHandler.cs +++ b/src/X1.Application/Features/AtOperations/Commands/CreateAtOperation/CreateAtOperationCommandHandler.cs @@ -4,7 +4,7 @@ using CellularManagement.Domain.Repositories.Terminal; using MediatR; using Microsoft.Extensions.Logging; -namespace CellularManagement.Application.Features.TerminalDevices.Commands.CreateAtOperation; +namespace CellularManagement.Application.Features.AtOperations.Commands.CreateAtOperation; /// /// 创建AT操作命令处理器 diff --git a/src/X1.Application/Features/TerminalDevices/Commands/DeleteAtOperation/DeleteAtOperationCommand.cs b/src/X1.Application/Features/AtOperations/Commands/DeleteAtOperation/DeleteAtOperationCommand.cs similarity index 75% rename from src/X1.Application/Features/TerminalDevices/Commands/DeleteAtOperation/DeleteAtOperationCommand.cs rename to src/X1.Application/Features/AtOperations/Commands/DeleteAtOperation/DeleteAtOperationCommand.cs index 4a90772..9a8eef1 100644 --- a/src/X1.Application/Features/TerminalDevices/Commands/DeleteAtOperation/DeleteAtOperationCommand.cs +++ b/src/X1.Application/Features/AtOperations/Commands/DeleteAtOperation/DeleteAtOperationCommand.cs @@ -1,7 +1,7 @@ using CellularManagement.Domain.Common; using MediatR; -namespace CellularManagement.Application.Features.TerminalDevices.Commands.DeleteAtOperation; +namespace CellularManagement.Application.Features.AtOperations.Commands.DeleteAtOperation; /// /// 删除AT操作命令 diff --git a/src/X1.Application/Features/TerminalDevices/Commands/DeleteAtOperation/DeleteAtOperationCommandHandler.cs b/src/X1.Application/Features/AtOperations/Commands/DeleteAtOperation/DeleteAtOperationCommandHandler.cs similarity index 95% rename from src/X1.Application/Features/TerminalDevices/Commands/DeleteAtOperation/DeleteAtOperationCommandHandler.cs rename to src/X1.Application/Features/AtOperations/Commands/DeleteAtOperation/DeleteAtOperationCommandHandler.cs index 9bc9f72..8c9fbbd 100644 --- a/src/X1.Application/Features/TerminalDevices/Commands/DeleteAtOperation/DeleteAtOperationCommandHandler.cs +++ b/src/X1.Application/Features/AtOperations/Commands/DeleteAtOperation/DeleteAtOperationCommandHandler.cs @@ -3,7 +3,7 @@ using CellularManagement.Domain.Repositories.Terminal; using MediatR; using Microsoft.Extensions.Logging; -namespace CellularManagement.Application.Features.TerminalDevices.Commands.DeleteAtOperation; +namespace CellularManagement.Application.Features.AtOperations.Commands.DeleteAtOperation; /// /// 删除AT操作命令处理器 diff --git a/src/X1.Application/Features/TerminalDevices/Commands/UpdateAtOperation/UpdateAtOperationCommand.cs b/src/X1.Application/Features/AtOperations/Commands/UpdateAtOperation/UpdateAtOperationCommand.cs similarity index 96% rename from src/X1.Application/Features/TerminalDevices/Commands/UpdateAtOperation/UpdateAtOperationCommand.cs rename to src/X1.Application/Features/AtOperations/Commands/UpdateAtOperation/UpdateAtOperationCommand.cs index e4b8a48..208a2ae 100644 --- a/src/X1.Application/Features/TerminalDevices/Commands/UpdateAtOperation/UpdateAtOperationCommand.cs +++ b/src/X1.Application/Features/AtOperations/Commands/UpdateAtOperation/UpdateAtOperationCommand.cs @@ -1,7 +1,7 @@ using CellularManagement.Domain.Common; using MediatR; -namespace CellularManagement.Application.Features.TerminalDevices.Commands.UpdateAtOperation; +namespace CellularManagement.Application.Features.AtOperations.Commands.UpdateAtOperation; /// /// 更新AT操作命令 diff --git a/src/X1.Application/Features/TerminalDevices/Commands/UpdateAtOperation/UpdateAtOperationCommandHandler.cs b/src/X1.Application/Features/AtOperations/Commands/UpdateAtOperation/UpdateAtOperationCommandHandler.cs similarity index 97% rename from src/X1.Application/Features/TerminalDevices/Commands/UpdateAtOperation/UpdateAtOperationCommandHandler.cs rename to src/X1.Application/Features/AtOperations/Commands/UpdateAtOperation/UpdateAtOperationCommandHandler.cs index b31dd0e..036ecc0 100644 --- a/src/X1.Application/Features/TerminalDevices/Commands/UpdateAtOperation/UpdateAtOperationCommandHandler.cs +++ b/src/X1.Application/Features/AtOperations/Commands/UpdateAtOperation/UpdateAtOperationCommandHandler.cs @@ -3,7 +3,7 @@ using CellularManagement.Domain.Repositories.Terminal; using MediatR; using Microsoft.Extensions.Logging; -namespace CellularManagement.Application.Features.TerminalDevices.Commands.UpdateAtOperation; +namespace CellularManagement.Application.Features.AtOperations.Commands.UpdateAtOperation; /// /// 更新AT操作命令处理器 diff --git a/src/X1.Application/Features/TerminalDevices/Queries/GetAtOperationById/GetAtOperationByIdQuery.cs b/src/X1.Application/Features/AtOperations/Queries/GetAtOperationById/GetAtOperationByIdQuery.cs similarity index 94% rename from src/X1.Application/Features/TerminalDevices/Queries/GetAtOperationById/GetAtOperationByIdQuery.cs rename to src/X1.Application/Features/AtOperations/Queries/GetAtOperationById/GetAtOperationByIdQuery.cs index 40217fc..e176c86 100644 --- a/src/X1.Application/Features/TerminalDevices/Queries/GetAtOperationById/GetAtOperationByIdQuery.cs +++ b/src/X1.Application/Features/AtOperations/Queries/GetAtOperationById/GetAtOperationByIdQuery.cs @@ -1,7 +1,7 @@ using MediatR; using CellularManagement.Domain.Common; -namespace CellularManagement.Application.Features.TerminalDevices.Queries.GetAtOperationById; +namespace CellularManagement.Application.Features.AtOperations.Queries.GetAtOperationById; /// /// 根据ID获取AT操作查询 diff --git a/src/X1.Application/Features/TerminalDevices/Queries/GetAtOperationById/GetAtOperationByIdQueryHandler.cs b/src/X1.Application/Features/AtOperations/Queries/GetAtOperationById/GetAtOperationByIdQueryHandler.cs similarity index 96% rename from src/X1.Application/Features/TerminalDevices/Queries/GetAtOperationById/GetAtOperationByIdQueryHandler.cs rename to src/X1.Application/Features/AtOperations/Queries/GetAtOperationById/GetAtOperationByIdQueryHandler.cs index 4b9408b..e819d96 100644 --- a/src/X1.Application/Features/TerminalDevices/Queries/GetAtOperationById/GetAtOperationByIdQueryHandler.cs +++ b/src/X1.Application/Features/AtOperations/Queries/GetAtOperationById/GetAtOperationByIdQueryHandler.cs @@ -3,7 +3,7 @@ using MediatR; using Microsoft.Extensions.Logging; using CellularManagement.Domain.Common; -namespace CellularManagement.Application.Features.TerminalDevices.Queries.GetAtOperationById; +namespace CellularManagement.Application.Features.AtOperations.Queries.GetAtOperationById; /// /// 根据ID获取AT操作查询处理器 diff --git a/src/X1.Application/Features/TerminalDevices/Queries/GetAtOperations/GetAtOperationsQuery.cs b/src/X1.Application/Features/AtOperations/Queries/GetAtOperations/GetAtOperationsQuery.cs similarity index 96% rename from src/X1.Application/Features/TerminalDevices/Queries/GetAtOperations/GetAtOperationsQuery.cs rename to src/X1.Application/Features/AtOperations/Queries/GetAtOperations/GetAtOperationsQuery.cs index a9b9b57..6a8a703 100644 --- a/src/X1.Application/Features/TerminalDevices/Queries/GetAtOperations/GetAtOperationsQuery.cs +++ b/src/X1.Application/Features/AtOperations/Queries/GetAtOperations/GetAtOperationsQuery.cs @@ -1,7 +1,7 @@ using MediatR; using CellularManagement.Domain.Common; -namespace CellularManagement.Application.Features.TerminalDevices.Queries.GetAtOperations; +namespace CellularManagement.Application.Features.AtOperations.Queries.GetAtOperations; /// /// 获取AT操作列表查询 diff --git a/src/X1.Application/Features/TerminalDevices/Queries/GetAtOperations/GetAtOperationsQueryHandler.cs b/src/X1.Application/Features/AtOperations/Queries/GetAtOperations/GetAtOperationsQueryHandler.cs similarity index 97% rename from src/X1.Application/Features/TerminalDevices/Queries/GetAtOperations/GetAtOperationsQueryHandler.cs rename to src/X1.Application/Features/AtOperations/Queries/GetAtOperations/GetAtOperationsQueryHandler.cs index 705b3d8..f0bcc2f 100644 --- a/src/X1.Application/Features/TerminalDevices/Queries/GetAtOperations/GetAtOperationsQueryHandler.cs +++ b/src/X1.Application/Features/AtOperations/Queries/GetAtOperations/GetAtOperationsQueryHandler.cs @@ -3,7 +3,7 @@ using MediatR; using Microsoft.Extensions.Logging; using CellularManagement.Domain.Common; -namespace CellularManagement.Application.Features.TerminalDevices.Queries.GetAtOperations; +namespace CellularManagement.Application.Features.AtOperations.Queries.GetAtOperations; /// /// 获取AT操作列表查询处理器 diff --git a/src/X1.BackendServices/DependencyInjection.cs b/src/X1.BackendServices/DependencyInjection.cs index 1d71e71..7aad7cf 100644 --- a/src/X1.BackendServices/DependencyInjection.cs +++ b/src/X1.BackendServices/DependencyInjection.cs @@ -1,5 +1,8 @@ using Microsoft.Extensions.DependencyInjection; -using X1.BackendServices.BackendServiceManager; +using X1.BackendServices.DeviceManagement; +using X1.BackendServices.Interfaces; +using X1.BackendServices.ProtocolManagement; +using X1.BackendServices.ServiceExecution; using X1.Domain.Transmission; namespace X1.BackendServices; diff --git a/src/X1.BackendServices/BackendServiceManager/DeviceManagementService.cs b/src/X1.BackendServices/DeviceManagement/DeviceManagementService.cs similarity index 99% rename from src/X1.BackendServices/BackendServiceManager/DeviceManagementService.cs rename to src/X1.BackendServices/DeviceManagement/DeviceManagementService.cs index f912293..888f7fd 100644 --- a/src/X1.BackendServices/BackendServiceManager/DeviceManagementService.cs +++ b/src/X1.BackendServices/DeviceManagement/DeviceManagementService.cs @@ -15,8 +15,9 @@ using System.Data; using Microsoft.Extensions.DependencyInjection; using X1.Domain.ExternalCommunication.Models; using X1.Domain.ExternalCommunication; +using X1.BackendServices.Interfaces; -namespace X1.BackendServices.BackendServiceManager +namespace X1.BackendServices.DeviceManagement { /// /// 设备管理服务 - 负责管理设备端点的后台服务 diff --git a/src/X1.BackendServices/BackendServiceManager/IServiceScopeExecutor.cs b/src/X1.BackendServices/Interfaces/IServiceScopeExecutor.cs similarity index 93% rename from src/X1.BackendServices/BackendServiceManager/IServiceScopeExecutor.cs rename to src/X1.BackendServices/Interfaces/IServiceScopeExecutor.cs index 87be748..f00ee00 100644 --- a/src/X1.BackendServices/BackendServiceManager/IServiceScopeExecutor.cs +++ b/src/X1.BackendServices/Interfaces/IServiceScopeExecutor.cs @@ -1,8 +1,9 @@ using System; using System.Threading; using System.Threading.Tasks; +using X1.BackendServices.Results; -namespace X1.BackendServices.BackendServiceManager +namespace X1.BackendServices.Interfaces { /// /// 服务作用域执行器接口 diff --git a/src/X1.BackendServices/BackendServiceManager/ProtocolChannelManager.cs b/src/X1.BackendServices/ProtocolManagement/ProtocolChannelManager.cs similarity index 99% rename from src/X1.BackendServices/BackendServiceManager/ProtocolChannelManager.cs rename to src/X1.BackendServices/ProtocolManagement/ProtocolChannelManager.cs index 7c9df6b..8057191 100644 --- a/src/X1.BackendServices/BackendServiceManager/ProtocolChannelManager.cs +++ b/src/X1.BackendServices/ProtocolManagement/ProtocolChannelManager.cs @@ -8,7 +8,7 @@ using CellularManagement.Domain.Entities.Logging; using Microsoft.Extensions.Logging; using X1.Domain.Transmission; -namespace X1.BackendServices.BackendServiceManager +namespace X1.BackendServices.ProtocolManagement { /// /// 协议通道管理器实现 diff --git a/src/X1.BackendServices/README.md b/src/X1.BackendServices/README.md new file mode 100644 index 0000000..e69de29 diff --git a/src/X1.BackendServices/BackendServiceManager/OperationResult.cs b/src/X1.BackendServices/Results/ScopeOperationResult.cs similarity index 98% rename from src/X1.BackendServices/BackendServiceManager/OperationResult.cs rename to src/X1.BackendServices/Results/ScopeOperationResult.cs index fcdad83..fd02f1d 100644 --- a/src/X1.BackendServices/BackendServiceManager/OperationResult.cs +++ b/src/X1.BackendServices/Results/ScopeOperationResult.cs @@ -1,6 +1,6 @@ using System; -namespace X1.BackendServices.BackendServiceManager +namespace X1.BackendServices.Results { /// /// 作用域服务操作结果包装类，用于表示作用域服务操作的成功或失败状态 diff --git a/src/X1.BackendServices/BackendServiceManager/ServiceScopeExecutor.cs b/src/X1.BackendServices/ServiceExecution/ServiceScopeExecutor.cs similarity index 97% rename from src/X1.BackendServices/BackendServiceManager/ServiceScopeExecutor.cs rename to src/X1.BackendServices/ServiceExecution/ServiceScopeExecutor.cs index dfe2034..8dddf63 100644 --- a/src/X1.BackendServices/BackendServiceManager/ServiceScopeExecutor.cs +++ b/src/X1.BackendServices/ServiceExecution/ServiceScopeExecutor.cs @@ -3,8 +3,10 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; +using X1.BackendServices.Interfaces; +using X1.BackendServices.Results; -namespace X1.BackendServices.BackendServiceManager +namespace X1.BackendServices.ServiceExecution { /// /// 服务作用域执行器实现类 diff --git a/src/X1.Presentation/Controllers/AdbOperationsController.cs b/src/X1.Presentation/Controllers/AdbOperationsController.cs index ec49e0f..e4d32da 100644 --- a/src/X1.Presentation/Controllers/AdbOperationsController.cs +++ b/src/X1.Presentation/Controllers/AdbOperationsController.cs @@ -1,8 +1,8 @@ -using CellularManagement.Application.Features.TerminalDevices.Commands.CreateAdbOperation; -using CellularManagement.Application.Features.TerminalDevices.Commands.DeleteAdbOperation; -using CellularManagement.Application.Features.TerminalDevices.Commands.UpdateAdbOperation; -using CellularManagement.Application.Features.TerminalDevices.Queries.GetAdbOperationById; -using CellularManagement.Application.Features.TerminalDevices.Queries.GetAdbOperations; +using CellularManagement.Application.Features.AdbOperations.Commands.CreateAdbOperation; +using CellularManagement.Application.Features.AdbOperations.Commands.DeleteAdbOperation; +using CellularManagement.Application.Features.AdbOperations.Commands.UpdateAdbOperation; +using CellularManagement.Application.Features.AdbOperations.Queries.GetAdbOperationById; +using CellularManagement.Application.Features.AdbOperations.Queries.GetAdbOperations; using CellularManagement.Domain.Common; using CellularManagement.Presentation.Abstractions; using MediatR; @@ -87,7 +87,7 @@ namespace CellularManagement.Presentation.Controllers return result; } - _logger.LogInformation("成功创建ADB操作，操作ID: {OperationId}", result.Data.Id); + _logger.LogInformation("成功创建ADB操作，操作ID: {OperationId}", result.Data?.Id); return result; } diff --git a/src/X1.Presentation/Controllers/AtOperationsController.cs b/src/X1.Presentation/Controllers/AtOperationsController.cs index a9d6aac..25c7cfa 100644 --- a/src/X1.Presentation/Controllers/AtOperationsController.cs +++ b/src/X1.Presentation/Controllers/AtOperationsController.cs @@ -1,8 +1,8 @@ -using CellularManagement.Application.Features.TerminalDevices.Commands.CreateAtOperation; -using CellularManagement.Application.Features.TerminalDevices.Commands.DeleteAtOperation; -using CellularManagement.Application.Features.TerminalDevices.Commands.UpdateAtOperation; -using CellularManagement.Application.Features.TerminalDevices.Queries.GetAtOperationById; -using CellularManagement.Application.Features.TerminalDevices.Queries.GetAtOperations; +using CellularManagement.Application.Features.AtOperations.Commands.CreateAtOperation; +using CellularManagement.Application.Features.AtOperations.Commands.DeleteAtOperation; +using CellularManagement.Application.Features.AtOperations.Commands.UpdateAtOperation; +using CellularManagement.Application.Features.AtOperations.Queries.GetAtOperationById; +using CellularManagement.Application.Features.AtOperations.Queries.GetAtOperations; using CellularManagement.Domain.Common; using CellularManagement.Presentation.Abstractions; using MediatR; @@ -87,7 +87,7 @@ namespace CellularManagement.Presentation.Controllers return result; } - _logger.LogInformation("成功创建AT操作，操作ID: {OperationId}", result.Data.Id); + _logger.LogInformation("成功创建AT操作，操作ID: {OperationId}", result.Data?.Id); return result; }