xiaowei/DMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改了目录架构

Browse Source
This commit is contained in:
David P.G
2025-09-16 12:29:09 +08:00
parent 5ab18f95f0
commit ffa24f861e
74 changed files with 122 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
DMS.Infrastructure/Services/OpcUaServiceManager.cs
View File

@@ -189,17 +189,18 @@ namespace DMS.Infrastructure.Services
{
context.IsConnected = true;
context.Device.IsRunning = true;
_eventService.RaiseDeviceConnectChanged(
this, new DeviceConnectChangedEventArgs(context.Device.Id, context.Device.Name, false, true));
await SetupSubscriptionsAsync(context, cancellationToken);
_logger.LogInformation("设备 {DeviceName} 连接成功", context.Device.Name);
}
else
{
_eventService.RaiseDeviceConnectChanged(
this, new DeviceConnectChangedEventArgs(context.Device.Id, context.Device.Name, false, false));
context.IsConnected = false;
context.Device.IsRunning = false;
_logger.LogWarning("设备 {DeviceName} 连接失败", context.Device.Name);
}
_eventService.RaiseDeviceConnectChanged(
this, new DeviceConnectChangedEventArgs(context.Device.Id, context.Device.Name, context.IsConnected));
}
catch (Exception ex)
{
@@ -208,7 +209,7 @@ namespace DMS.Infrastructure.Services
context.IsConnected = false;
context.Device.IsRunning = false;
_eventService.RaiseDeviceConnectChanged(
this, new DeviceConnectChangedEventArgs(context.Device.Id, context.Device.Name, false, false));
this, new DeviceConnectChangedEventArgs(context.Device.Id, context.Device.Name, false));
}
finally
{
@@ -231,7 +232,7 @@ namespace DMS.Infrastructure.Services
context.IsConnected = false;
context.Device.IsRunning = false;
_eventService.RaiseDeviceConnectChanged(
this, new DeviceConnectChangedEventArgs(context.Device.Id, context.Device.Name, false, false));
this, new DeviceConnectChangedEventArgs(context.Device.Id, context.Device.Name, false));
_logger.LogInformation("设备 {DeviceName} 连接已断开", context.Device.Name);
}
catch (Exception ex)
@@ -269,16 +270,13 @@ namespace DMS.Infrastructure.Services
"为设备 {DeviceName} 设置PollingInterval {PollingInterval} 的订阅，变量数: {VariableCount}",
context.Device.Name, pollingInterval, variables.Count);
// 根据PollingInterval计算发布间隔和采样间隔（毫秒）
var publishingInterval = GetPublishingIntervalFromPollLevel(pollingInterval);
// var samplingInterval = GetSamplingIntervalFromPollLevel(pollLevel);
var opcUaNodes = variables
.Select(v => new OpcUaNode { NodeId = v.OpcUaNodeId })
.ToList();
context.OpcUaService.SubscribeToNode(opcUaNodes, HandleDataChanged,
publishingInterval, publishingInterval);
pollingInterval, pollingInterval);
}
_logger.LogInformation("设备 {DeviceName} 订阅设置完成", context.Device.Name);

9
DMS.Infrastructure/Services/S7ServiceManager.cs
View File

@@ -186,8 +186,6 @@ namespace DMS.Infrastructure.Services
{
_logger.LogWarning("设备 {DeviceName} 连接失败", context.Device.Name);
}
_eventService.RaiseDeviceConnectChanged(
this, new DeviceConnectChangedEventArgs(context.Device.Id, context.Device.Name, false, context.IsConnected));
}
catch (Exception ex)
{
@@ -195,11 +193,12 @@ namespace DMS.Infrastructure.Services
context.Device.Name, ex.Message);
context.IsConnected = false;
_eventService.RaiseDeviceConnectChanged(
this, new DeviceConnectChangedEventArgs(context.Device.Id, context.Device.Name, false, context.IsConnected));
}
finally
{
_eventService.RaiseDeviceConnectChanged(
this, new DeviceConnectChangedEventArgs(context.Device.Id, context.Device.Name, context.IsConnected));
_semaphore.Release();
}
}
@@ -219,7 +218,7 @@ namespace DMS.Infrastructure.Services
context.IsConnected = false;
_eventService.RaiseDeviceConnectChanged(
this, new DeviceConnectChangedEventArgs(context.Device.Id, context.Device.Name, false, context.IsConnected));
this, new DeviceConnectChangedEventArgs(context.Device.Id, context.Device.Name, context.IsConnected));
_logger.LogInformation("设备 {DeviceName} 连接已断开", context.Device.Name);
}
catch (Exception ex)