From 4155c07269fa134575e02a4f76fa835957d9684f Mon Sep 17 00:00:00 2001 From: Diego <2248356998@qq.com> Date: Mon, 7 Jul 2025 15:20:39 +0800 Subject: [PATCH] 10.9.23 --- src/Directory.Build.props | 10 +++++----- .../Business/Cache/BusinessBaseWithCacheAlarm.cs | 2 +- .../Business/Cache/BusinessBaseWithCacheInterval.cs | 6 +++--- .../ModbusSlave/ModbusSlave.cs | 2 +- .../OpcDaMaster/OpcDaMaster.cs | 6 +++--- .../OpcUaMaster/OpcUaMaster.cs | 4 ++-- .../OpcUaServer/OpcUaServer.cs | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index bc2bc4838..295382493 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,11 +1,11 @@ - 10.9.22 - 10.9.22 - 10.9.22 - 2.9.12 - 10.9.12 + 10.9.23 + 10.9.23 + 10.9.23 + 2.9.13 + 10.9.13 8.0.17 9.0.6 zh-Hans;en-US diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Driver/Business/Cache/BusinessBaseWithCacheAlarm.cs b/src/Gateway/ThingsGateway.Gateway.Application/Driver/Business/Cache/BusinessBaseWithCacheAlarm.cs index 75d61474b..ed388b779 100644 --- a/src/Gateway/ThingsGateway.Gateway.Application/Driver/Business/Cache/BusinessBaseWithCacheAlarm.cs +++ b/src/Gateway/ThingsGateway.Gateway.Application/Driver/Business/Cache/BusinessBaseWithCacheAlarm.cs @@ -78,7 +78,7 @@ public abstract class BusinessBaseWithCacheAlarm : BusinessBaseWithCache { if (CurrentDevice?.Pause != false) return; - if (TaskSchedulerLoop.Stoped) return; + if (TaskSchedulerLoop?.Stoped==true) return; if (AlarmModelEnable) return; // 如果业务属性的缓存为间隔上传，则不执行后续操作 diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Driver/Business/Cache/BusinessBaseWithCacheInterval.cs b/src/Gateway/ThingsGateway.Gateway.Application/Driver/Business/Cache/BusinessBaseWithCacheInterval.cs index 124a8101c..081a72897 100644 --- a/src/Gateway/ThingsGateway.Gateway.Application/Driver/Business/Cache/BusinessBaseWithCacheInterval.cs +++ b/src/Gateway/ThingsGateway.Gateway.Application/Driver/Business/Cache/BusinessBaseWithCacheInterval.cs @@ -248,7 +248,7 @@ public abstract class BusinessBaseWithCacheInterval : BusinessBaseWithCache { if (CurrentDevice?.Pause != false) return; - if (TaskSchedulerLoop.Stoped) return; + if (TaskSchedulerLoop?.Stoped==true) return; if (!AlarmModelEnable) return; // 如果业务属性的缓存为间隔上传，则不执行后续操作 @@ -305,7 +305,7 @@ public abstract class BusinessBaseWithCacheInterval : BusinessBaseWithCache { if (CurrentDevice?.Pause != false) return; - if (TaskSchedulerLoop.Stoped) return; + if (TaskSchedulerLoop?.Stoped==true) return; if (!DevModelEnable) return; // 如果业务属性的缓存为间隔上传，则不执行后续操作 //if (_businessPropertyWithCacheInterval?.IsInterval != true) @@ -326,7 +326,7 @@ public abstract class BusinessBaseWithCacheInterval : BusinessBaseWithCache if (CurrentDevice?.Pause != false) return; if (!VarModelEnable) return; - if (TaskSchedulerLoop.Stoped) return; + if (TaskSchedulerLoop?.Stoped==true) return; // 如果业务属性的缓存为间隔上传，则不执行后续操作 //if (_businessPropertyWithCacheInterval?.IsInterval != true) diff --git a/src/Plugin/ThingsGateway.Plugin.Modbus/ModbusSlave/ModbusSlave.cs b/src/Plugin/ThingsGateway.Plugin.Modbus/ModbusSlave/ModbusSlave.cs index bb2612867..928fafbcd 100644 --- a/src/Plugin/ThingsGateway.Plugin.Modbus/ModbusSlave/ModbusSlave.cs +++ b/src/Plugin/ThingsGateway.Plugin.Modbus/ModbusSlave/ModbusSlave.cs @@ -248,7 +248,7 @@ public class ModbusSlave : BusinessBase { if (CurrentDevice?.Pause != false) return; - if (TaskSchedulerLoop.Stoped) return; + if (TaskSchedulerLoop?.Stoped==true) return; var address = variableRuntime.GetPropertyValue(DeviceId, nameof(_variablePropertys.ServiceAddress)); if (address != null && variableRuntime.Value != null) { diff --git a/src/Plugin/ThingsGateway.Plugin.OpcDa/OpcDaMaster/OpcDaMaster.cs b/src/Plugin/ThingsGateway.Plugin.OpcDa/OpcDaMaster/OpcDaMaster.cs index b3e495c57..9bcc48dd7 100644 --- a/src/Plugin/ThingsGateway.Plugin.OpcDa/OpcDaMaster/OpcDaMaster.cs +++ b/src/Plugin/ThingsGateway.Plugin.OpcDa/OpcDaMaster/OpcDaMaster.cs @@ -219,7 +219,7 @@ public class OpcDaMaster : CollectBase { if (CurrentDevice.Pause) return; - if (TaskSchedulerLoop.Stoped) return; + if (TaskSchedulerLoop?.Stoped==true) return; if (DisposedValue) return; LogMessage?.Trace($"{ToString()} Change:{Environment.NewLine} {values?.ToSystemTextJsonString()}"); @@ -228,7 +228,7 @@ public class OpcDaMaster : CollectBase { if (CurrentDevice.Pause) return; - if (TaskSchedulerLoop.Stoped) return; + if (TaskSchedulerLoop?.Stoped==true) return; if (DisposedValue) return; var type = data.Value.GetType(); @@ -242,7 +242,7 @@ public class OpcDaMaster : CollectBase { if (CurrentDevice.Pause) return; - if (TaskSchedulerLoop.Stoped) return; + if (TaskSchedulerLoop?.Stoped==true) return; if (DisposedValue) return; var value = data.Value; diff --git a/src/Plugin/ThingsGateway.Plugin.OpcUa/OpcUaMaster/OpcUaMaster.cs b/src/Plugin/ThingsGateway.Plugin.OpcUa/OpcUaMaster/OpcUaMaster.cs index db9c34ee8..33dd6fb2a 100644 --- a/src/Plugin/ThingsGateway.Plugin.OpcUa/OpcUaMaster/OpcUaMaster.cs +++ b/src/Plugin/ThingsGateway.Plugin.OpcUa/OpcUaMaster/OpcUaMaster.cs @@ -363,7 +363,7 @@ public class OpcUaMaster : CollectBase return; if (DisposedValue) return; - if (TaskSchedulerLoop.Stoped) return; + if (TaskSchedulerLoop?.Stoped==true) return; @@ -387,7 +387,7 @@ public class OpcUaMaster : CollectBase return; if (DisposedValue) return; - if (TaskSchedulerLoop.Stoped) return; + if (TaskSchedulerLoop?.Stoped==true) return; if (isGood) { diff --git a/src/Plugin/ThingsGateway.Plugin.OpcUa/OpcUaServer/OpcUaServer.cs b/src/Plugin/ThingsGateway.Plugin.OpcUa/OpcUaServer/OpcUaServer.cs index 9842a4c70..f4998c7b3 100644 --- a/src/Plugin/ThingsGateway.Plugin.OpcUa/OpcUaServer/OpcUaServer.cs +++ b/src/Plugin/ThingsGateway.Plugin.OpcUa/OpcUaServer/OpcUaServer.cs @@ -397,7 +397,7 @@ public partial class OpcUaServer : BusinessBase { if (CurrentDevice.Pause) return; - if (TaskSchedulerLoop.Stoped) return; + if (TaskSchedulerLoop?.Stoped==true) return; if (DisposedValue) return; if (IdVariableRuntimes.ContainsKey(variableData.Id)) CollectVariableRuntimes.AddOrUpdate(variableData.Id, id => variableData, (id, addValue) => variableData);