refactor:将AppDataCenterService改为AppCenterService,将AppDataStorageService改为AppStorageService,将触发器的增删改成合并
This commit is contained in:
@@ -22,7 +22,7 @@ namespace DMS.Infrastructure.Services.OpcUa
|
||||
{
|
||||
private readonly ILogger<OpcUaServiceManager> _logger;
|
||||
private readonly IDataProcessingService _dataProcessingService;
|
||||
private readonly IAppDataCenterService _appDataCenterService;
|
||||
private readonly IAppCenterService _appCenterService;
|
||||
private readonly IEventService _eventService;
|
||||
private readonly OpcUaServiceOptions _options;
|
||||
private readonly ConcurrentDictionary<int, DeviceContext> _deviceContexts;
|
||||
@@ -33,15 +33,15 @@ namespace DMS.Infrastructure.Services.OpcUa
|
||||
ILogger<OpcUaServiceManager> logger,
|
||||
IDataProcessingService dataProcessingService,
|
||||
IEventService eventService,
|
||||
IAppDataCenterService appDataCenterService,
|
||||
IAppCenterService appCenterService,
|
||||
IOptions<OpcUaServiceOptions> options)
|
||||
{
|
||||
_logger = logger ?? throw new ArgumentNullException(nameof(logger));
|
||||
_dataProcessingService
|
||||
= dataProcessingService ?? throw new ArgumentNullException(nameof(dataProcessingService));
|
||||
_eventService = eventService;
|
||||
_appDataCenterService
|
||||
= appDataCenterService ?? throw new ArgumentNullException(nameof(appDataCenterService));
|
||||
_appCenterService
|
||||
= appCenterService ?? throw new ArgumentNullException(nameof(appCenterService));
|
||||
_options = options?.Value ?? throw new ArgumentNullException(nameof(options));
|
||||
_deviceContexts = new ConcurrentDictionary<int, DeviceContext>();
|
||||
_semaphore = new SemaphoreSlim(_options.MaxConcurrentConnections, _options.MaxConcurrentConnections);
|
||||
|
||||
@@ -14,22 +14,22 @@ namespace DMS.Infrastructure.Services.OpcUa
|
||||
/// </summary>
|
||||
public class OptimizedOpcUaBackgroundService : BackgroundService
|
||||
{
|
||||
private readonly IAppDataCenterService _appDataCenterService;
|
||||
private readonly IAppDataStorageService _appDataStorageService;
|
||||
private readonly IAppCenterService _appCenterService;
|
||||
private readonly IAppStorageService _appStorageService;
|
||||
private readonly IEventService _eventService;
|
||||
private readonly IOpcUaServiceManager _opcUaServiceManager;
|
||||
private readonly ILogger<OptimizedOpcUaBackgroundService> _logger;
|
||||
private readonly SemaphoreSlim _reloadSemaphore = new SemaphoreSlim(0);
|
||||
|
||||
public OptimizedOpcUaBackgroundService(
|
||||
IAppDataCenterService appDataCenterService,
|
||||
IAppDataStorageService appDataStorageService,
|
||||
IAppCenterService appCenterService,
|
||||
IAppStorageService appStorageService,
|
||||
IEventService eventService,
|
||||
IOpcUaServiceManager opcUaServiceManager,
|
||||
ILogger<OptimizedOpcUaBackgroundService> logger)
|
||||
{
|
||||
_appDataCenterService = appDataCenterService ?? throw new ArgumentNullException(nameof(appDataCenterService));
|
||||
_appDataStorageService = appDataStorageService;
|
||||
_appCenterService = appCenterService ?? throw new ArgumentNullException(nameof(appCenterService));
|
||||
_appStorageService = appStorageService;
|
||||
_opcUaServiceManager = opcUaServiceManager ?? throw new ArgumentNullException(nameof(opcUaServiceManager));
|
||||
_logger = logger ?? throw new ArgumentNullException(nameof(logger));
|
||||
_eventService = eventService;
|
||||
@@ -60,7 +60,7 @@ namespace DMS.Infrastructure.Services.OpcUa
|
||||
if (stoppingToken.IsCancellationRequested)
|
||||
break;
|
||||
|
||||
if (_appDataStorageService.Devices.IsEmpty)
|
||||
if (_appStorageService.Devices.IsEmpty)
|
||||
{
|
||||
_logger.LogInformation("没有可用的OPC UA设备,等待设备列表更新...");
|
||||
continue;
|
||||
@@ -96,7 +96,7 @@ namespace DMS.Infrastructure.Services.OpcUa
|
||||
try
|
||||
{
|
||||
// 获取所有活动的OPC UA设备
|
||||
var opcUaDevices = _appDataStorageService.Devices.Values
|
||||
var opcUaDevices = _appStorageService.Devices.Values
|
||||
.Where(d => d.Protocol == ProtocolType.OpcUa )
|
||||
.ToList();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user