g82tt/ThingsGateway
1
0
Fork 0
mirror of https://gitee.com/ThingsGateway/ThingsGateway.git synced 2025-10-29 22:53:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

10.9.23

Browse Source
This commit is contained in:
Diego
2025-07-07 15:20:39 +08:00
parent 32fa833736
commit 4155c07269
7 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Directory.Build.props
View File

@@ -1,11 +1,11 @@
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<PluginVersion>10.9.22</PluginVersion> <PluginVersion>10.9.23</PluginVersion>
<ProPluginVersion>10.9.22</ProPluginVersion> <ProPluginVersion>10.9.23</ProPluginVersion>
<DefaultVersion>10.9.22</DefaultVersion> <DefaultVersion>10.9.23</DefaultVersion>
<AuthenticationVersion>2.9.12</AuthenticationVersion> <AuthenticationVersion>2.9.13</AuthenticationVersion>
<SourceGeneratorVersion>10.9.12</SourceGeneratorVersion> <SourceGeneratorVersion>10.9.13</SourceGeneratorVersion>
<NET8Version>8.0.17</NET8Version> <NET8Version>8.0.17</NET8Version>
<NET9Version>9.0.6</NET9Version> <NET9Version>9.0.6</NET9Version>
<SatelliteResourceLanguages>zh-Hans;en-US</SatelliteResourceLanguages> <SatelliteResourceLanguages>zh-Hans;en-US</SatelliteResourceLanguages>

2
src/Gateway/ThingsGateway.Gateway.Application/Driver/Business/Cache/BusinessBaseWithCacheAlarm.cs
View File

@@ -78,7 +78,7 @@ public abstract class BusinessBaseWithCacheAlarm : BusinessBaseWithCache
{ {
if (CurrentDevice?.Pause != false) if (CurrentDevice?.Pause != false)
return; return;
if (TaskSchedulerLoop.Stoped) return; if (TaskSchedulerLoop?.Stoped==true) return;
if (AlarmModelEnable) return; if (AlarmModelEnable) return;
// 如果业务属性的缓存为间隔上传，则不执行后续操作 // 如果业务属性的缓存为间隔上传，则不执行后续操作

6
src/Gateway/ThingsGateway.Gateway.Application/Driver/Business/Cache/BusinessBaseWithCacheInterval.cs
View File

@@ -248,7 +248,7 @@ public abstract class BusinessBaseWithCacheInterval : BusinessBaseWithCache
{ {
if (CurrentDevice?.Pause != false) if (CurrentDevice?.Pause != false)
return; return;
if (TaskSchedulerLoop.Stoped) return; if (TaskSchedulerLoop?.Stoped==true) return;
if (!AlarmModelEnable) return; if (!AlarmModelEnable) return;
// 如果业务属性的缓存为间隔上传，则不执行后续操作 // 如果业务属性的缓存为间隔上传，则不执行后续操作
@@ -305,7 +305,7 @@ public abstract class BusinessBaseWithCacheInterval : BusinessBaseWithCache
{ {
if (CurrentDevice?.Pause != false) if (CurrentDevice?.Pause != false)
return; return;
if (TaskSchedulerLoop.Stoped) return; if (TaskSchedulerLoop?.Stoped==true) return;
if (!DevModelEnable) return; if (!DevModelEnable) return;
// 如果业务属性的缓存为间隔上传，则不执行后续操作 // 如果业务属性的缓存为间隔上传，则不执行后续操作
//if (_businessPropertyWithCacheInterval?.IsInterval != true) //if (_businessPropertyWithCacheInterval?.IsInterval != true)
@@ -326,7 +326,7 @@ public abstract class BusinessBaseWithCacheInterval : BusinessBaseWithCache
if (CurrentDevice?.Pause != false) if (CurrentDevice?.Pause != false)
return; return;
if (!VarModelEnable) return; if (!VarModelEnable) return;
if (TaskSchedulerLoop.Stoped) return; if (TaskSchedulerLoop?.Stoped==true) return;
// 如果业务属性的缓存为间隔上传，则不执行后续操作 // 如果业务属性的缓存为间隔上传，则不执行后续操作
//if (_businessPropertyWithCacheInterval?.IsInterval != true) //if (_businessPropertyWithCacheInterval?.IsInterval != true)

2
src/Plugin/ThingsGateway.Plugin.Modbus/ModbusSlave/ModbusSlave.cs
View File

@@ -248,7 +248,7 @@ public class ModbusSlave : BusinessBase
{ {
if (CurrentDevice?.Pause != false) if (CurrentDevice?.Pause != false)
return; return;
if (TaskSchedulerLoop.Stoped) return; if (TaskSchedulerLoop?.Stoped==true) return;
var address = variableRuntime.GetPropertyValue(DeviceId, nameof(_variablePropertys.ServiceAddress)); var address = variableRuntime.GetPropertyValue(DeviceId, nameof(_variablePropertys.ServiceAddress));
if (address != null && variableRuntime.Value != null) if (address != null && variableRuntime.Value != null)
{ {

6
src/Plugin/ThingsGateway.Plugin.OpcDa/OpcDaMaster/OpcDaMaster.cs
View File

@@ -219,7 +219,7 @@ public class OpcDaMaster : CollectBase
{ {
if (CurrentDevice.Pause) if (CurrentDevice.Pause)
return; return;
if (TaskSchedulerLoop.Stoped) return; if (TaskSchedulerLoop?.Stoped==true) return;
if (DisposedValue) if (DisposedValue)
return; return;
LogMessage?.Trace($"{ToString()} Change:{Environment.NewLine} {values?.ToSystemTextJsonString()}"); LogMessage?.Trace($"{ToString()} Change:{Environment.NewLine} {values?.ToSystemTextJsonString()}");
@@ -228,7 +228,7 @@ public class OpcDaMaster : CollectBase
{ {
if (CurrentDevice.Pause) if (CurrentDevice.Pause)
return; return;
if (TaskSchedulerLoop.Stoped) return; if (TaskSchedulerLoop?.Stoped==true) return;
if (DisposedValue) if (DisposedValue)
return; return;
var type = data.Value.GetType(); var type = data.Value.GetType();
@@ -242,7 +242,7 @@ public class OpcDaMaster : CollectBase
{ {
if (CurrentDevice.Pause) if (CurrentDevice.Pause)
return; return;
if (TaskSchedulerLoop.Stoped) return; if (TaskSchedulerLoop?.Stoped==true) return;
if (DisposedValue) if (DisposedValue)
return; return;
var value = data.Value; var value = data.Value;

4
src/Plugin/ThingsGateway.Plugin.OpcUa/OpcUaMaster/OpcUaMaster.cs
View File

@@ -363,7 +363,7 @@ public class OpcUaMaster : CollectBase
return; return;
if (DisposedValue) if (DisposedValue)
return; return;
if (TaskSchedulerLoop.Stoped) return; if (TaskSchedulerLoop?.Stoped==true) return;
@@ -387,7 +387,7 @@ public class OpcUaMaster : CollectBase
return; return;
if (DisposedValue) if (DisposedValue)
return; return;
if (TaskSchedulerLoop.Stoped) return; if (TaskSchedulerLoop?.Stoped==true) return;
if (isGood) if (isGood)
{ {

2
src/Plugin/ThingsGateway.Plugin.OpcUa/OpcUaServer/OpcUaServer.cs
View File

@@ -397,7 +397,7 @@ public partial class OpcUaServer : BusinessBase
{ {
if (CurrentDevice.Pause) if (CurrentDevice.Pause)
return; return;
if (TaskSchedulerLoop.Stoped) return; if (TaskSchedulerLoop?.Stoped==true) return;
if (DisposedValue) return; if (DisposedValue) return;
if (IdVariableRuntimes.ContainsKey(variableData.Id)) if (IdVariableRuntimes.ContainsKey(variableData.Id))
CollectVariableRuntimes.AddOrUpdate(variableData.Id, id => variableData, (id, addValue) => variableData); CollectVariableRuntimes.AddOrUpdate(variableData.Id, id => variableData, (id, addValue) => variableData);