Browse Source

重构代码结构:1. 将AdbOperations和AtOperations从TerminalDevices中分离为独立模块 2. 重新组织BackendServiceManager目录结构,提高可读性 3. 修复命名空间,确保代码一致性 4. 创建AdbOperationsController和AtOperationsController 5. 将OperationResult.cs重命名为ScopeOperationResult.cs以保持类名统一

feature/x1-web-request
root 4 months ago
parent
commit
c515c3d8d3
  1. 2
      src/X1.Application/Features/AdbOperations/Commands/CreateAdbOperation/CreateAdbOperationCommand.cs
  2. 2
      src/X1.Application/Features/AdbOperations/Commands/CreateAdbOperation/CreateAdbOperationCommandHandler.cs
  3. 2
      src/X1.Application/Features/AdbOperations/Commands/DeleteAdbOperation/DeleteAdbOperationCommand.cs
  4. 2
      src/X1.Application/Features/AdbOperations/Commands/DeleteAdbOperation/DeleteAdbOperationCommandHandler.cs
  5. 2
      src/X1.Application/Features/AdbOperations/Commands/UpdateAdbOperation/UpdateAdbOperationCommand.cs
  6. 2
      src/X1.Application/Features/AdbOperations/Commands/UpdateAdbOperation/UpdateAdbOperationCommandHandler.cs
  7. 2
      src/X1.Application/Features/AdbOperations/Queries/GetAdbOperationById/GetAdbOperationByIdQuery.cs
  8. 2
      src/X1.Application/Features/AdbOperations/Queries/GetAdbOperationById/GetAdbOperationByIdQueryHandler.cs
  9. 2
      src/X1.Application/Features/AdbOperations/Queries/GetAdbOperations/GetAdbOperationsQuery.cs
  10. 2
      src/X1.Application/Features/AdbOperations/Queries/GetAdbOperations/GetAdbOperationsQueryHandler.cs
  11. 2
      src/X1.Application/Features/AtOperations/Commands/CreateAtOperation/CreateAtOperationCommand.cs
  12. 2
      src/X1.Application/Features/AtOperations/Commands/CreateAtOperation/CreateAtOperationCommandHandler.cs
  13. 2
      src/X1.Application/Features/AtOperations/Commands/DeleteAtOperation/DeleteAtOperationCommand.cs
  14. 2
      src/X1.Application/Features/AtOperations/Commands/DeleteAtOperation/DeleteAtOperationCommandHandler.cs
  15. 2
      src/X1.Application/Features/AtOperations/Commands/UpdateAtOperation/UpdateAtOperationCommand.cs
  16. 2
      src/X1.Application/Features/AtOperations/Commands/UpdateAtOperation/UpdateAtOperationCommandHandler.cs
  17. 2
      src/X1.Application/Features/AtOperations/Queries/GetAtOperationById/GetAtOperationByIdQuery.cs
  18. 2
      src/X1.Application/Features/AtOperations/Queries/GetAtOperationById/GetAtOperationByIdQueryHandler.cs
  19. 2
      src/X1.Application/Features/AtOperations/Queries/GetAtOperations/GetAtOperationsQuery.cs
  20. 2
      src/X1.Application/Features/AtOperations/Queries/GetAtOperations/GetAtOperationsQueryHandler.cs
  21. 5
      src/X1.BackendServices/DependencyInjection.cs
  22. 3
      src/X1.BackendServices/DeviceManagement/DeviceManagementService.cs
  23. 3
      src/X1.BackendServices/Interfaces/IServiceScopeExecutor.cs
  24. 2
      src/X1.BackendServices/ProtocolManagement/ProtocolChannelManager.cs
  25. 0
      src/X1.BackendServices/README.md
  26. 2
      src/X1.BackendServices/Results/ScopeOperationResult.cs
  27. 4
      src/X1.BackendServices/ServiceExecution/ServiceScopeExecutor.cs
  28. 12
      src/X1.Presentation/Controllers/AdbOperationsController.cs
  29. 12
      src/X1.Presentation/Controllers/AtOperationsController.cs

2
src/X1.Application/Features/TerminalDevices/Commands/CreateAdbOperation/CreateAdbOperationCommand.cs → 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;
/// <summary>
/// 创建ADB操作命令

2
src/X1.Application/Features/TerminalDevices/Commands/CreateAdbOperation/CreateAdbOperationCommandHandler.cs → 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;
/// <summary>
/// 创建ADB操作命令处理器

2
src/X1.Application/Features/TerminalDevices/Commands/DeleteAdbOperation/DeleteAdbOperationCommand.cs → 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;
/// <summary>
/// 删除ADB操作命令

2
src/X1.Application/Features/TerminalDevices/Commands/DeleteAdbOperation/DeleteAdbOperationCommandHandler.cs → 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;
/// <summary>
/// 删除ADB操作命令处理器

2
src/X1.Application/Features/TerminalDevices/Commands/UpdateAdbOperation/UpdateAdbOperationCommand.cs → 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;
/// <summary>
/// 更新ADB操作命令

2
src/X1.Application/Features/TerminalDevices/Commands/UpdateAdbOperation/UpdateAdbOperationCommandHandler.cs → 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;
/// <summary>
/// 更新ADB操作命令处理器

2
src/X1.Application/Features/TerminalDevices/Queries/GetAdbOperationById/GetAdbOperationByIdQuery.cs → 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;
/// <summary>
/// 根据ID获取ADB操作查询

2
src/X1.Application/Features/TerminalDevices/Queries/GetAdbOperationById/GetAdbOperationByIdQueryHandler.cs → 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;
/// <summary>
/// 根据ID获取ADB操作查询处理器

2
src/X1.Application/Features/TerminalDevices/Queries/GetAdbOperations/GetAdbOperationsQuery.cs → 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;
/// <summary>
/// 获取ADB操作列表查询

2
src/X1.Application/Features/TerminalDevices/Queries/GetAdbOperations/GetAdbOperationsQueryHandler.cs → 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;
/// <summary>
/// 获取ADB操作列表查询处理器

2
src/X1.Application/Features/TerminalDevices/Commands/CreateAtOperation/CreateAtOperationCommand.cs → 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;
/// <summary>
/// 创建AT操作命令

2
src/X1.Application/Features/TerminalDevices/Commands/CreateAtOperation/CreateAtOperationCommandHandler.cs → 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;
/// <summary>
/// 创建AT操作命令处理器

2
src/X1.Application/Features/TerminalDevices/Commands/DeleteAtOperation/DeleteAtOperationCommand.cs → 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;
/// <summary>
/// 删除AT操作命令

2
src/X1.Application/Features/TerminalDevices/Commands/DeleteAtOperation/DeleteAtOperationCommandHandler.cs → 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;
/// <summary>
/// 删除AT操作命令处理器

2
src/X1.Application/Features/TerminalDevices/Commands/UpdateAtOperation/UpdateAtOperationCommand.cs → 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;
/// <summary>
/// 更新AT操作命令

2
src/X1.Application/Features/TerminalDevices/Commands/UpdateAtOperation/UpdateAtOperationCommandHandler.cs → 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;
/// <summary>
/// 更新AT操作命令处理器

2
src/X1.Application/Features/TerminalDevices/Queries/GetAtOperationById/GetAtOperationByIdQuery.cs → 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;
/// <summary>
/// 根据ID获取AT操作查询

2
src/X1.Application/Features/TerminalDevices/Queries/GetAtOperationById/GetAtOperationByIdQueryHandler.cs → 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;
/// <summary>
/// 根据ID获取AT操作查询处理器

2
src/X1.Application/Features/TerminalDevices/Queries/GetAtOperations/GetAtOperationsQuery.cs → 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;
/// <summary>
/// 获取AT操作列表查询

2
src/X1.Application/Features/TerminalDevices/Queries/GetAtOperations/GetAtOperationsQueryHandler.cs → 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;
/// <summary>
/// 获取AT操作列表查询处理器

5
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;

3
src/X1.BackendServices/BackendServiceManager/DeviceManagementService.cs → 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
{
/// <summary>
/// 设备管理服务 - 负责管理设备端点的后台服务

3
src/X1.BackendServices/BackendServiceManager/IServiceScopeExecutor.cs → 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
{
/// <summary>
/// 服务作用域执行器接口

2
src/X1.BackendServices/BackendServiceManager/ProtocolChannelManager.cs → 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
{
/// <summary>
/// 协议通道管理器实现

0
src/X1.BackendServices/README.md

2
src/X1.BackendServices/BackendServiceManager/OperationResult.cs → src/X1.BackendServices/Results/ScopeOperationResult.cs

@ -1,6 +1,6 @@
using System;
namespace X1.BackendServices.BackendServiceManager
namespace X1.BackendServices.Results
{
/// <summary>
/// 作用域服务操作结果包装类,用于表示作用域服务操作的成功或失败状态

4
src/X1.BackendServices/BackendServiceManager/ServiceScopeExecutor.cs → 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
{
/// <summary>
/// 服务作用域执行器实现类

12
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;
}

12
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;
}

Loading…
Cancel
Save