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

build: 10.9.22

Browse Source
This commit is contained in:
Diego
2025-07-07 15:10:06 +08:00
parent 2258f08555
commit 32fa833736
9 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Directory.Build.props
View File

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

2
src/Gateway/ThingsGateway.Gateway.Application/Common/Tasks/TaskSchedulerLoop.cs
View File

@@ -20,7 +20,7 @@ public class TaskSchedulerLoop
task.Start();
}
}
public bool Stoped => Tasks.All(a => !a.Enable);
public void Stop()
{
foreach (var task in Tasks)

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

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

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

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

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

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

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

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

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

@@ -363,12 +363,9 @@ public class OpcUaMaster : CollectBase
return;
if (DisposedValue)
return;
if (TaskSchedulerLoop.Stoped) return;
if (CurrentDevice.Pause)
{
return;
}
LogMessage?.Trace($"Change: {Environment.NewLine} {data.monitoredItem.StartNodeId} : {data.jToken?.ToString()}");
@@ -390,6 +387,7 @@ public class OpcUaMaster : CollectBase
return;
if (DisposedValue)
return;
if (TaskSchedulerLoop.Stoped) return;
if (isGood)
{

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

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

2
src/Version.props
View File

@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<Version>10.9.19</Version>
<Version>$(DefaultVersion)</Version>
</PropertyGroup>
<ItemGroup>