10.8.2

feat: 优化闭包导致的状态机内存占用，高并发时内存显著下降
fix(sqldb): 定时上传模式时，实时表时效
fix(taos): 初始化失败

src/Admin/BlazorSetParametersAsyncGenerator/AnalyzerReleases.Shipped.md

@@ -0,0 +1,6 @@
+## Release 1.0
+
+### New Rules
+Rule ID | Category | Severity | Notes
+--------|----------|----------|--------------------
+TG0001 | Conflict | Error | SetParametersAsyncGenerator

src/Admin/BlazorSetParametersAsyncGenerator/BlazorSetParametersAsyncGenerator.csproj

@@ -0,0 +1,32 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<Import Project="$(SolutionDir)PackNuget.props" />
+	<PropertyGroup>
+		<TargetFrameworks>netstandard2.0;</TargetFrameworks>
+		<Version>$(SourceGeneratorVersion)</Version>
+		<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
+		<NoPackageAnalysis>true</NoPackageAnalysis>
+		<SignAssembly>false</SignAssembly>
+
+		<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
+		<IncludeBuildOutput>false</IncludeBuildOutput>
+		<!-- 避免 DLL 被打包到 lib/ -->
+		<EnableSourceGenerator>true</EnableSourceGenerator>
+		<!-- 可选 -->
+
+		
+	</PropertyGroup>
+
+	<ItemGroup>
+		<None Include="$(OutputPath)\$(TargetFileName)" Pack="true"
+			  PackagePath="analyzers/dotnet/cs" Visible="false" />
+	</ItemGroup>
+	
+
+	<ItemGroup>
+		<AdditionalFiles Include="AnalyzerReleases.Shipped.md" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.9.0" PrivateAssets="all" />
+	</ItemGroup>
+</Project>

src/Admin/BlazorSetParametersAsyncGenerator/GlobalUsings.cs

@@ -0,0 +1,9 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------

src/Admin/BlazorSetParametersAsyncGenerator/SourceGenerator/SetParametersAsyncGenerator.cs

@@ -0,0 +1,534 @@
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+
+namespace BlazorSetParametersAsyncGenerator;
+
+[Generator]
+public partial class SetParametersAsyncGenerator : ISourceGenerator
+{
+
+    private string m_DoNotGenerateSetParametersAsyncAttribute = """
+        
+        using System;
+        namespace BlazorSetParametersAsyncGenerator
+        {
+            [AttributeUsage(AttributeTargets.Class, Inherited = false, AllowMultiple = true)]
+            internal sealed class DoNotGenerateSetParametersAsyncAttribute : Attribute
+            {
+            }
+        }
+
+
+        """
+        ;
+    private string m_GenerateSetParametersAsyncAttribute = """
+        
+        using System;
+        namespace BlazorSetParametersAsyncGenerator
+        {
+            [AttributeUsage(AttributeTargets.Class, Inherited = false, AllowMultiple = true)]
+            internal sealed class GenerateSetParametersAsyncAttribute : Attribute
+            {
+                public bool RequireExactMatch { get; set; }
+            }
+        }
+
+
+        """
+        ;
+    private string m_GlobalGenerateSetParametersAsyncAttribute = """
+        
+        using System;
+        namespace BlazorSetParametersAsyncGenerator
+        {
+            [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = false)]
+            internal sealed class GlobalGenerateSetParametersAsyncAttribute : Attribute
+            {
+                public bool Enable { get; }
+
+                public GlobalGenerateSetParametersAsyncAttribute(bool enable = true)
+                {
+                    Enable = enable;
+                }
+            }
+
+        }
+
+
+        """
+        ;
+
+    private static readonly DiagnosticDescriptor ParameterNameConflict = new DiagnosticDescriptor(
+        id: "TG0001",
+        title: "Parameter name conflict",
+        messageFormat: "Parameter names are case insensitive. {0} conflicts with {1}.",
+        category: "Conflict",
+        defaultSeverity: DiagnosticSeverity.Error,
+        isEnabledByDefault: true,
+        description: "Parameter names must be case insensitive to be usable in routes. Rename the parameter to not be in conflict with other parameters.");
+
+    public void Initialize(GeneratorInitializationContext context)
+    {
+        context.RegisterForPostInitialization(a =>
+        {
+            a.AddSource(nameof(m_DoNotGenerateSetParametersAsyncAttribute), m_DoNotGenerateSetParametersAsyncAttribute);
+            a.AddSource(nameof(m_GenerateSetParametersAsyncAttribute), m_GenerateSetParametersAsyncAttribute);
+            a.AddSource(nameof(m_GlobalGenerateSetParametersAsyncAttribute), m_GlobalGenerateSetParametersAsyncAttribute);
+        });
+
+        // Register a syntax receiver that will be created for each generation pass
+        context.RegisterForSyntaxNotifications(() => new SyntaxReceiver());
+    }
+
+    public void Execute(GeneratorExecutionContext context)
+    {
+        // https://github.com/dotnet/AspNetCore.Docs/blob/1e199f340780f407a685695e6c4d953f173fa891/aspnetcore/blazor/webassembly-performance-best-practices.md#implement-setparametersasync-manually
+        if (context.SyntaxReceiver is not SyntaxReceiver receiver)
+        {
+            return;
+        }
+
+        var candidate_classes = GetCandidateClasses(receiver, context);
+
+        foreach (var class_symbol in candidate_classes.Distinct(SymbolEqualityComparer.Default).Cast<INamedTypeSymbol>())
+        {
+            GenerateSetParametersAsyncMethod(context, class_symbol);
+        }
+    }
+
+    private static void GenerateSetParametersAsyncMethod(GeneratorExecutionContext context, INamedTypeSymbol class_symbol)
+    {
+        var force_exact_match = class_symbol.GetAttributes().Any(a => a.NamedArguments.Any(na => na.Key == "RequireExactMatch" && na.Value.Value is bool v && v));
+        var namespaceName = class_symbol.ContainingNamespace.ToDisplayString();
+        var type_kind = class_symbol.TypeKind switch { TypeKind.Class => "class", TypeKind.Interface => "interface", _ => "struct" };
+        var type_parameters = string.Join(", ", class_symbol.TypeArguments.Select(t => t.Name));
+        type_parameters = string.IsNullOrEmpty(type_parameters) ? type_parameters : "<" + type_parameters + ">";
+        context.AddCode(class_symbol.ToDisplayString() + "_override.cs", $@"
+using Microsoft.AspNetCore.Components;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+#pragma warning disable CA2007
+#pragma warning disable CS0162
+#pragma warning disable CS8632
+namespace {namespaceName}
+{{
+    public partial class {class_symbol.Name}{type_parameters}
+    {{
+        private bool _initialized;
+
+        /// <summary>
+        /// <inheritdoc/>
+        /// </summary>
+        public override Task SetParametersAsync(ParameterView parameters)
+        {{
+            Dictionary<string,object?> parameterValues = new();
+            foreach (var parameter in parameters)
+            {{
+              if(BlazorImplementation__WriteSingleParameter(parameter.Name, parameter.Value)==false)
+              {{
+                  // 如果没有处理参数，则添加到参数列表中
+                  parameterValues.Add(parameter.Name, parameter.Value);
+              }}
+            }}
+            
+            if(parameterValues.Count > 0)
+            {{
+                parameters.SetParameterProperties(this);
+            }}
+            if (!_initialized)
+            {{
+                _initialized = true;
+
+                return RunInitAndSetParametersAsync();
+            }}
+            else
+            {{
+                return CallOnParametersSetAsync();
+            }}
+        }}
+
+        // We do not want the debugger to consider NavigationExceptions caught by this method as user-unhandled.
+    #if NET9_0_OR_GREATER
+        [System.Diagnostics.DebuggerDisableUserUnhandledExceptions]
+    #endif
+        private async Task RunInitAndSetParametersAsync()
+        {{
+            Task task;
+
+            try
+            {{
+                OnInitialized();
+                task = OnInitializedAsync();
+            }}
+            catch (Exception ex) when (ex is not NavigationException)
+            {{
+                throw;
+            }}
+
+            if (task.Status != TaskStatus.RanToCompletion && task.Status != TaskStatus.Canceled)
+            {{
+                // Call state has changed here so that we render after the sync part of OnInitAsync has run
+                // and wait for it to finish before we continue. If no async work has been done yet, we want
+                // to defer calling StateHasChanged up until the first bit of async code happens or until
+                // the end. Additionally, we want to avoid calling StateHasChanged if no
+                // async work is to be performed.
+                StateHasChanged();
+
+                try
+                {{
+                    await task;
+                }}
+                catch // avoiding exception filters for AOT runtime support
+                {{
+                    // Ignore exceptions from task cancellations.
+                    // Awaiting a canceled task may produce either an OperationCanceledException (if produced as a consequence of
+                    // CancellationToken.ThrowIfCancellationRequested()) or a TaskCanceledException (produced as a consequence of awaiting Task.FromCanceled).
+                    // It's much easier to check the state of the Task (i.e. Task.IsCanceled) rather than catch two distinct exceptions.
+                    if (!task.IsCanceled)
+                    {{
+                        throw;
+                    }}
+                }}
+
+                // Don't call StateHasChanged here. CallOnParametersSetAsync should handle that for us.
+            }}
+
+            await CallOnParametersSetAsync();
+        }}
+
+        // We do not want the debugger to consider NavigationExceptions caught by this method as user-unhandled.
+    #if NET9_0_OR_GREATER
+        [System.Diagnostics.DebuggerDisableUserUnhandledExceptions]
+    #endif
+        private Task CallOnParametersSetAsync()
+        {{
+            Task task;
+
+            try
+            {{
+                OnParametersSet();
+                task = OnParametersSetAsync();
+            }}
+            catch (Exception ex) when (ex is not NavigationException)
+            {{
+    #if NET9_0_OR_GREATER
+                System.Diagnostics.Debugger.BreakForUserUnhandledException(ex);
+    #endif
+                throw;
+            }}
+
+            // If no async work is to be performed, i.e. the task has already ran to completion
+            // or was canceled by the time we got to inspect it, avoid going async and re-invoking
+            // StateHasChanged at the culmination of the async work.
+            var shouldAwaitTask = task.Status != TaskStatus.RanToCompletion &&
+                task.Status != TaskStatus.Canceled;
+
+            // We always call StateHasChanged here as we want to trigger a rerender after OnParametersSet and
+            // the synchronous part of OnParametersSetAsync has run.
+            StateHasChanged();
+
+            return shouldAwaitTask ?
+                CallStateHasChangedOnAsyncCompletion(task) :
+                Task.CompletedTask;
+        }}
+
+        // We do not want the debugger to stop more than once per user-unhandled exception.
+    #if NET9_0_OR_GREATER
+        [System.Diagnostics.DebuggerDisableUserUnhandledExceptions]
+    #endif
+        private async Task CallStateHasChangedOnAsyncCompletion(Task task)
+        {{
+            try
+            {{
+                await task;
+            }}
+            catch // avoiding exception filters for AOT runtime support
+            {{
+                // Ignore exceptions from task cancellations, but don't bother issuing a state change.
+                if (task.IsCanceled)
+                {{
+                    return;
+                }}
+
+                throw;
+            }}
+
+            StateHasChanged();
+        }}
+
+    }}
+}}
+#pragma warning restore CS8632
+#pragma warning restore CS0162
+#pragma warning restore CA2007
+");
+        var bases = class_symbol.GetTypeHierarchy().Where(t => !SymbolEqualityComparer.Default.Equals(t, class_symbol));
+        var members = class_symbol.GetMembers() // members of the type itself
+            .Concat(bases.SelectMany(t => t.GetMembers().Where(m => m.DeclaredAccessibility != Accessibility.Private))) // plus accessible members of any base
+            .Distinct(SymbolEqualityComparer.Default);
+        var property_symbols = members.OfType<IPropertySymbol>();
+        var writable_property_symbols = property_symbols.Where(ps =>
+            !ps.IsReadOnly || ps.GetAttributes().Any(a =>
+                a.AttributeClass?.Name is "CascadingParameter" or "CascadingParameterAttribute")
+        );
+
+        var parameter_symbols = writable_property_symbols
+            .Where(ps => ps.GetAttributes().Any(a => false
+            || a.AttributeClass.Name == "Parameter"
+            || a.AttributeClass.Name == "ParameterAttribute"
+            || a.AttributeClass.Name == "CascadingParameter"
+            || a.AttributeClass.Name == "CascadingParameterAttribute"
+
+        ));
+        var name_conflicts = parameter_symbols.GroupBy(ps => ps.Name.ToLowerInvariant()).Where(g => g.Count() > 1);
+        foreach (var conflict in name_conflicts)
+        {
+            var key = conflict.Key;
+            var conflicting_parameters = conflict.ToList();
+            foreach (var parameter in conflicting_parameters)
+            {
+                var this_name = parameter.Name;
+                var conflicting_name = conflicting_parameters.Select(p => p.Name).FirstOrDefault(n => n != this_name);
+                foreach (var location in parameter.Locations)
+                {
+                    context.ReportDiagnostic(Diagnostic.Create(ParameterNameConflict, location, this_name, conflicting_name));
+                }
+            }
+        }
+        var all = parameter_symbols.ToList();
+        var catch_all_parameter = parameter_symbols.FirstOrDefault(p =>
+        {
+            var parameter_attr = p.GetAttributes().FirstOrDefault(a => a.AttributeClass!.Name.StartsWith("Parameter"));
+            return parameter_attr?.NamedArguments.Any(n => n.Key == "CaptureUnmatchedValues" && n.Value.Value is bool v && v) == true;
+        });
+        var lower_case_match_cases = parameter_symbols.Except(new[] { catch_all_parameter }).Select(p => $"case \"{p.Name.ToLowerInvariant()}\": this.{p.Name} = ({p.Type.ToDisplayString()}) value; break;");
+        var lower_case_match_default = catch_all_parameter == null ? @"default: {return false;}" : $@"
+default:
+{{
+    this.{catch_all_parameter.Name} ??= new System.Collections.Generic.Dictionary<string, object>();
+    var writable_dict = this.{catch_all_parameter.Name};
+    if (!writable_dict.TryAdd(name, value))
+    {{
+        writable_dict[name] = value;
+    }}
+    break;
+}}";
+
+        var exact_match_cases = parameter_symbols.Except(new[] { catch_all_parameter }).Select(p => $"case \"{p!.Name}\": this.{p.Name} = ({p.Type.ToDisplayString()}) value; break;");
+        string exact_match_default;
+        if (force_exact_match)
+        {
+            if (catch_all_parameter == null) // exact matches are forced, and we do not have a catch-all parameter, therefore we need to throw on unmatched parameter
+            {
+                exact_match_default = @"default: { return false;";
+            }
+            else // exact matches are forced, and we DO have a catch-all parameter, therefore we simply add that unmatched parameter to the dictionary
+            {
+                exact_match_default = $@"
+default:
+{{
+    this.{catch_all_parameter.Name} ??= new System.Collections.Generic.Dictionary<string, object>();
+    var writable_dict = this.{catch_all_parameter.Name};
+    if (!writable_dict.TryAdd(name, value))
+    {{
+        writable_dict[name] = value;
+    }}
+    break;
+}}";
+            }
+        }
+        else
+        {
+            // exact matches are not forced, so if there is no exact match, we fall back to compare it in lower case
+            exact_match_default = $@"
+default:
+{{
+    switch (name.ToLowerInvariant())
+    {{
+        {string.Join("\n", lower_case_match_cases)}
+        {lower_case_match_default}
+    }}
+    break;
+}}
+";
+        }
+        context.AddCode(class_symbol.ToDisplayString() + "_implementation.cs", $@"
+using System;
+
+#pragma warning disable CS0162
+#pragma warning disable CS0618
+#pragma warning disable CS8632
+namespace {namespaceName}
+{{
+    public partial class {class_symbol.Name}{type_parameters}
+    {{
+
+        private bool BlazorImplementation__WriteSingleParameter(string name, object value)
+        {{
+            if(name != ""Body"")
+            {{
+
+                switch (name)
+                {{
+                    {string.Join("\n", exact_match_cases)}
+                    {exact_match_default}
+                }}
+                return true;
+            }}
+           return false;
+         }}
+    }}
+}}
+#pragma warning restore CS8632
+#pragma warning restore CS0618
+#pragma warning restore CS0162");
+    }
+
+    private static bool HasUserDefinedSetParametersAsync(INamedTypeSymbol classSymbol)
+    {
+        return classSymbol
+            .GetMembers("SetParametersAsync")
+            .OfType<IMethodSymbol>()
+            .Any(m =>
+                m.Parameters.Length == 1 &&
+                m.Parameters[0].Type.ToDisplayString() == "Microsoft.AspNetCore.Components.ParameterView" &&
+                m.DeclaredAccessibility == Accessibility.Public &&
+                !m.IsStatic);
+    }
+
+
+    private static bool IsPartial(INamedTypeSymbol symbol)
+    {
+        return symbol.DeclaringSyntaxReferences
+            .Select(r => r.GetSyntax())
+            .OfType<ClassDeclarationSyntax>()
+            .Any(c => c.Modifiers.Any(m => m.IsKind(SyntaxKind.PartialKeyword)));
+    }
+    private static bool IsComponent(ClassDeclarationSyntax classDeclarationSyntax, INamedTypeSymbol symbol, Compilation compilation)
+    {
+        if (HasUserDefinedSetParametersAsync(symbol))
+        {
+            // 用户自己写了方法，不生成
+            return false;
+        }
+
+        if (!IsPartial(symbol))
+        {
+            return false;
+        }
+
+        if (classDeclarationSyntax.SyntaxTree.FilePath.EndsWith(".razor") || classDeclarationSyntax.SyntaxTree.FilePath.EndsWith(".razor.cs"))
+        {
+            return true;
+        }
+
+
+
+        var iComponent = compilation.GetTypeByMetadataName("Microsoft.AspNetCore.Components.IComponent");
+        var componentBase = compilation.GetTypeByMetadataName("Microsoft.AspNetCore.Components.ComponentBase");
+        if (iComponent == null || componentBase == null)
+            return false;
+
+        if (SymbolEqualityComparer.Default.Equals(symbol, iComponent))
+            return true;
+        if (SymbolEqualityComparer.Default.Equals(symbol, componentBase))
+            return true;
+
+        return false;
+    }
+
+    /// <summary>
+    /// Enumerate methods with at least one Group attribute
+    /// </summary>
+    private static IEnumerable<INamedTypeSymbol> GetCandidateClasses(SyntaxReceiver receiver, GeneratorExecutionContext context)
+    {
+        var compilation = context.Compilation;
+        var positiveAttributeSymbol = compilation.GetTypeByMetadataName("BlazorSetParametersAsyncGenerator.GenerateSetParametersAsyncAttribute");
+        var negativeAttributeSymbol = compilation.GetTypeByMetadataName("BlazorSetParametersAsyncGenerator.DoNotGenerateSetParametersAsyncAttribute");
+
+        // loop over the candidate methods, and keep the ones that are actually annotated
+
+        // 找特性
+        var assemblyAttributes = compilation.Assembly.GetAttributes();
+
+        var enableAttr = assemblyAttributes.FirstOrDefault(attr =>
+            attr.AttributeClass?.ToDisplayString() == "BlazorSetParametersAsyncGenerator.GlobalGenerateSetParametersAsyncAttribute");
+
+        var globalEnable = false;
+        if (enableAttr != null)
+        {
+            var arg = enableAttr.ConstructorArguments.FirstOrDefault();
+            if (arg.Value is bool b)
+                globalEnable = b;
+        }
+
+        foreach (ClassDeclarationSyntax class_declaration in receiver.CandidateClasses)
+        {
+            var model = compilation.GetSemanticModel(class_declaration.SyntaxTree);
+            var class_symbol = model.GetDeclaredSymbol(class_declaration);
+            if (class_symbol is null)
+            {
+                continue;
+            }
+            if (class_symbol.Name == "_Imports")
+            {
+                continue;
+            }
+
+            // 是否拒绝生成
+            var hasNegative = class_symbol.GetAttributes().Any(ad =>
+                ad.AttributeClass?.Equals(negativeAttributeSymbol, SymbolEqualityComparer.Default) == true);
+
+            if (hasNegative)
+                continue;
+
+
+            if (IsComponent(class_declaration, class_symbol, compilation))
+            {
+                if (globalEnable)
+                {
+                    yield return class_symbol;
+                }
+                else
+                {
+                    // 必须显式标注 Positive Attribute
+                    var hasPositive = class_symbol.GetAttributes().Any(ad =>
+                        ad.AttributeClass?.Equals(positiveAttributeSymbol, SymbolEqualityComparer.Default) == true);
+
+                    if (hasPositive)
+                        yield return class_symbol;
+                }
+            }
+            else
+            {
+
+            }
+        }
+    }
+
+    /// <summary>
+    /// Created on demand before each generation pass
+    /// </summary>
+    internal class SyntaxReceiver : ISyntaxReceiver
+    {
+        public List<ClassDeclarationSyntax> CandidateClasses { get; } = new List<ClassDeclarationSyntax>();
+
+        /// <summary>
+        /// Called for every syntax node in the compilation, we can inspect the nodes and save any information useful for generation
+        /// </summary>
+        public void OnVisitSyntaxNode(SyntaxNode syntax_node)
+        {
+            // any class with at least one attribute is a candidate for property generation
+            if (syntax_node is ClassDeclarationSyntax classDeclarationSyntax)
+            {
+                CandidateClasses.Add(classDeclarationSyntax);
+            }
+            else
+            {
+
+            }
+        }
+    }
+}

src/Admin/BlazorSetParametersAsyncGenerator/SourceGenerator/SourceGeneratorContextExtension.cs

@@ -0,0 +1,15 @@
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Text;
+
+using System.Text;
+
+namespace BlazorSetParametersAsyncGenerator
+{
+    internal static class SourceGeneratorContextExtension
+    {
+        public static void AddCode(this GeneratorExecutionContext context, string hint_name, string code)
+        {
+            context.AddSource(hint_name.Replace("<", "_").Replace(">", "_"), SourceText.From(code, Encoding.UTF8));
+        }
+    }
+}

src/Admin/BlazorSetParametersAsyncGenerator/SourceGenerator/StringExtension.cs

@@ -0,0 +1,13 @@
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace BlazorSetParametersAsyncGenerator
+{
+    internal static class StringExtension
+    {
+        public static string NormalizeWhitespace(this string code)
+        {
+            return CSharpSyntaxTree.ParseText(code).GetRoot().NormalizeWhitespace().ToFullString();
+        }
+    }
+}

src/Admin/BlazorSetParametersAsyncGenerator/SourceGenerator/TypeSymbolExtension.cs

@@ -0,0 +1,19 @@
+using Microsoft.CodeAnalysis;
+
+namespace BlazorSetParametersAsyncGenerator
+{
+    public static class TypeSymbolExtension
+    {
+        public static IEnumerable<INamedTypeSymbol> GetTypeHierarchy(this INamedTypeSymbol symbol)
+        {
+            yield return symbol;
+            if (symbol.BaseType != null)
+            {
+                foreach (var type in GetTypeHierarchy(symbol.BaseType))
+                {
+                    yield return type;
+                }
+            }
+        }
+    }
+}

src/Admin/BlazorSetParametersAsyncGenerator/tools/install.ps1

@@ -0,0 +1,49 @@
+param($installPath, $toolsPath, $package, $project)
+
+$analyzersPaths = Join-Path (Join-Path (Split-Path -Path $toolsPath -Parent) "analyzers" ) * -Resolve
+
+foreach($analyzersPath in $analyzersPaths)
+{
+    # Install the language agnostic analyzers.
+    if (Test-Path $analyzersPath)
+    {
+        foreach ($analyzerFilePath in Get-ChildItem $analyzersPath -Filter *.dll)
+        {
+            if($project.Object.AnalyzerReferences)
+            {
+                $project.Object.AnalyzerReferences.Add($analyzerFilePath.FullName)
+            }
+        }
+    }
+}
+
+# $project.Type gives the language name like (C# or VB.NET)
+$languageFolder = ""
+if($project.Type -eq "C#")
+{
+    $languageFolder = "cs"
+}
+if($project.Type -eq "VB.NET")
+{
+    $languageFolder = "vb"
+}
+if($languageFolder -eq "")
+{
+    return
+}
+
+foreach($analyzersPath in $analyzersPaths)
+{
+    # Install language specific analyzers.
+    $languageAnalyzersPath = join-path $analyzersPath $languageFolder
+    if (Test-Path $languageAnalyzersPath)
+    {
+        foreach ($analyzerFilePath in Get-ChildItem $languageAnalyzersPath -Filter *.dll)
+        {
+            if($project.Object.AnalyzerReferences)
+            {
+                $project.Object.AnalyzerReferences.Add($analyzerFilePath.FullName)
+            }
+        }
+    }
+}

src/Admin/BlazorSetParametersAsyncGenerator/tools/uninstall.ps1

@@ -0,0 +1,56 @@
+param($installPath, $toolsPath, $package, $project)
+
+$analyzersPaths = Join-Path (Join-Path (Split-Path -Path $toolsPath -Parent) "analyzers" ) * -Resolve
+
+foreach($analyzersPath in $analyzersPaths)
+{
+    # Uninstall the language agnostic analyzers.
+    if (Test-Path $analyzersPath)
+    {
+        foreach ($analyzerFilePath in Get-ChildItem $analyzersPath -Filter *.dll)
+        {
+            if($project.Object.AnalyzerReferences)
+            {
+                $project.Object.AnalyzerReferences.Remove($analyzerFilePath.FullName)
+            }
+        }
+    }
+}
+
+# $project.Type gives the language name like (C# or VB.NET)
+$languageFolder = ""
+if($project.Type -eq "C#")
+{
+    $languageFolder = "cs"
+}
+if($project.Type -eq "VB.NET")
+{
+    $languageFolder = "vb"
+}
+if($languageFolder -eq "")
+{
+    return
+}
+
+foreach($analyzersPath in $analyzersPaths)
+{
+    # Uninstall language specific analyzers.
+    $languageAnalyzersPath = join-path $analyzersPath $languageFolder
+    if (Test-Path $languageAnalyzersPath)
+    {
+        foreach ($analyzerFilePath in Get-ChildItem $languageAnalyzersPath -Filter *.dll)
+        {
+            if($project.Object.AnalyzerReferences)
+            {
+                try
+                {
+                    $project.Object.AnalyzerReferences.Remove($analyzerFilePath.FullName)
+                }
+                catch
+                {
+
+                }
+            }
+        }
+    }
+}

src/Admin/ThingsGateway.Admin.Application/Aop/OperDescAttribute.cs

@@ -91,7 +91,7 @@ public sealed class OperDescAttribute : MoAttribute
             OperDescAttribute.WriteToQueue(log);
         }
     }
-    private static SqlSugarClient _db = DbContext.Db.GetConnectionScopeWithAttr<SysOperateLog>().CopyNew();
+    private static SqlSugarClient _db = DbContext.GetDB<SysOperateLog>();
     /// <summary>
     /// 将日志消息写入数据库中
     /// </summary>

src/Admin/ThingsGateway.Admin.Application/GlobalUsings.cs

@@ -8,5 +8,4 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-global using ThingsGateway;
 global using ThingsGateway.NewLife.Extension;

src/Admin/ThingsGateway.Admin.Application/Job/Hardware/HardwareJob.cs

@@ -61,7 +61,7 @@ public class HardwareJob : IJob, IHardwareJob
         var historyHardwareInfos = MemoryCache.Get<List<HistoryHardwareInfo>>(CacheKey);
         if (historyHardwareInfos == null)
         {
-            using var db = _db.CopyNew();
+            using var db = DbContext.GetDB<HistoryHardwareInfo>(); ;
             historyHardwareInfos = await db.Queryable<HistoryHardwareInfo>().Where(a => a.Date > DateTime.Now.AddDays(-3)).ToListAsync().ConfigureAwait(false);
 
             MemoryCache.Set(CacheKey, historyHardwareInfos);
@@ -71,7 +71,7 @@ public class HardwareJob : IJob, IHardwareJob
 
     private bool error = false;
     private DateTime hisInsertTime = default;
-    private SqlSugarClient _db = DbContext.Db.GetConnectionScopeWithAttr<HistoryHardwareInfo>().CopyNew();
+    private SqlSugarClient _db = DbContext.GetDB<HistoryHardwareInfo>();
 
     public async Task ExecuteAsync(JobExecutingContext context, CancellationToken stoppingToken)
     {
@@ -81,7 +81,7 @@ public class HardwareJob : IJob, IHardwareJob
             {
                 if (HardwareInfo.MachineInfo == null)
                 {
-                    await MachineInfo.RegisterAsync().ConfigureAwait(false);
+                    MachineInfo.Register();
                     HardwareInfo.MachineInfo = MachineInfo.Current;
 
                     string currentPath = Directory.GetCurrentDirectory();

src/Admin/ThingsGateway.Admin.Application/Job/LogJob/LogJob.cs

@@ -27,7 +27,7 @@ public class LogJob : IJob
 
     private static async Task DeleteSysOperateLog(int daysAgo, CancellationToken stoppingToken)
     {
-        using var db = DbContext.Db.GetConnectionScopeWithAttr<SysOperateLog>().CopyNew();
+        using var db = DbContext.GetDB<SysOperateLog>();
         var time = DateTime.Now.AddDays(-daysAgo);
         await db.DeleteableWithAttr<SysOperateLog>().Where(u => u.OpTime < time).ExecuteCommandAsync(stoppingToken).ConfigureAwait(false); // 删除操作日志
     }

src/Admin/ThingsGateway.Admin.Application/Logging/DatabaseLoggingWriter.cs

@@ -143,7 +143,7 @@ public class DatabaseLoggingWriter : IDatabaseLoggingWriter
 
         if (flush)
         {
-            SqlSugarClient ??= DbContext.Db.GetConnectionScopeWithAttr<SysOperateLog>().CopyNew();
+            SqlSugarClient ??= DbContext.GetDB<SysOperateLog>();
             await SqlSugarClient.InsertableWithAttr(_operateLogMessageQueue.ToListWithDequeue()).ExecuteCommandAsync().ConfigureAwait(false);//入库
             return true;
         }
@@ -202,7 +202,7 @@ public class DatabaseLoggingWriter : IDatabaseLoggingWriter
 
         if (flush)
         {
-            SqlSugarClient ??= DbContext.Db.GetConnectionScopeWithAttr<SysOperateLog>().CopyNew();
+            SqlSugarClient ??= DbContext.GetDB<SysOperateLog>();
             await SqlSugarClient.InsertableWithAttr(_operateLogMessageQueue.ToListWithDequeue()).ExecuteCommandAsync().ConfigureAwait(false);//入库
             return true;
         }

src/Admin/ThingsGateway.Admin.Application/OAuth/AdminOAuthHandler.cs

@@ -46,7 +46,7 @@ public class AdminOAuthHandler<TOptions>(
     /// </summary>
     private static async Task Insertable()
     {
-        var db = DbContext.Db.GetConnectionScopeWithAttr<SysOperateLog>().CopyNew();
+        var db = DbContext.GetDB<SysOperateLog>();
         var appLifetime = App.RootServices!.GetService<IHostApplicationLifetime>()!;
         while (!appLifetime.ApplicationStopping.IsCancellationRequested)
         {
@@ -209,7 +209,7 @@ public class AdminOAuthHandler<TOptions>(
 
         #endregion 重新赋值属性,设置本次登录信息为最新的信息
 
-        using var db = DbContext.Db.GetConnectionScopeWithAttr<SysUser>().CopyNew();
+        using var db = DbContext.GetDB<SysUser>();
         //更新用户登录信息
         if (await db.Updateable(sysUser).UpdateColumns(it => new
         {

src/Admin/ThingsGateway.Admin.Application/OAuth/AdminOAuthOptions.cs

@@ -25,7 +25,7 @@ public abstract class AdminOAuthOptions : OAuthOptions
 
         Backchannel = new HttpClient(new HttpClientHandler
         {
-            ServerCertificateCustomValidationCallback = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator // 若测试用
+            ServerCertificateCustomValidationCallback = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator
         });
         Backchannel.DefaultRequestHeaders.UserAgent.Add(
             new ProductInfoHeaderValue("ThingsGateway", "1.0"));

src/Admin/ThingsGateway.Admin.Application/SeedData/SysRelationSeedData.cs

@@ -18,7 +18,7 @@ public class SysRelationSeedData : ISqlSugarEntitySeedData<SysRelation>
     /// <inheritdoc/>
     public IEnumerable<SysRelation> SeedData()
     {
-        using var db = DbContext.Db.GetConnectionScopeWithAttr<SysRelation>().CopyNew();
+        using var db = DbContext.GetDB<SysRelation>();
         if (db.Queryable<SysRelation>().Any(a => a.ObjectId == RoleConst.SuperAdminId))
             return Enumerable.Empty<SysRelation>();
         var data = SeedDataUtil.GetSeedData<SysRelation>(PathExtensions.CombinePathWithOs("SeedData", "Admin", "seed_sys_relation.json"));

src/Admin/ThingsGateway.Admin.Application/Services/Auth/AuthService.cs

@@ -324,7 +324,7 @@ public class AuthService : IAuthService
 
         #endregion 重新赋值属性,设置本次登录信息为最新的信息
 
-        using var db = DbContext.Db.GetConnectionScopeWithAttr<SysUser>().CopyNew();
+        using var db = DbContext.GetDB<SysUser>();
         //更新用户登录信息
         if (await db.Updateable(sysUser).UpdateColumns(it => new
         {

src/Admin/ThingsGateway.Admin.Application/Startup.cs

@@ -78,7 +78,7 @@ public class Startup : AppStartup
         //遍历配置
         DbContext.DbConfigs?.ForEach(it =>
         {
-            var connection = DbContext.Db.GetConnection(it.ConfigId);//获取数据库连接对象
+            var connection = DbContext.GetDB().GetConnection(it.ConfigId);//获取数据库连接对象
             if (it.InitDatabase == true)
                 connection.DbMaintenance.CreateDatabase();//创建数据库,如果存在则不创建
         });

src/Admin/ThingsGateway.Admin.Application/ThingsGateway.Admin.Application.csproj

@@ -46,7 +46,6 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<ProjectReference Include="..\ThingsGateway.Razor\ThingsGateway.Razor.csproj" />
 		<ProjectReference Include="..\ThingsGateway.DB\ThingsGateway.DB.csproj" />
 	</ItemGroup>
 

src/Admin/ThingsGateway.Admin.Application/Util/ClearTokenUtil.cs

@@ -40,7 +40,7 @@ public static class ClearTokenUtil
     public static async Task DeleteUserTokenByOrgIds(HashSet<long> orgIds)
     {
         // 获取用户ID列表
-        var userIds = await DbContext.Db.CopyNew().QueryableWithAttr<SysUser>().Where(it => orgIds.Contains(it.OrgId)).Select(it => it.Id).ToListAsync().ConfigureAwait(false);
+        var userIds = await DbContext.GetDB<SysUser>().Queryable<SysUser>().Where(it => orgIds.Contains(it.OrgId)).Select(it => it.Id).ToListAsync().ConfigureAwait(false);
         //从redis中删除所属机构的用户token
         App.CacheService.HashDel<VerificatInfo>(CacheConst.Cache_Token, userIds.Select(it => it.ToString()).ToArray());
     }

src/Admin/ThingsGateway.Admin.Razor/GlobalUsings.cs

@@ -19,3 +19,4 @@ global using System.Diagnostics.CodeAnalysis;
 global using ThingsGateway.Razor;
 
 [assembly: SuppressMessage("Reliability", "CA2007", Justification = "<挂起>", Scope = "module")]
+[assembly: BlazorSetParametersAsyncGenerator.GlobalGenerateSetParametersAsync(true)]

src/Admin/ThingsGateway.Admin.Razor/Pages/Session/SessionPage.razor.cs

@@ -22,12 +22,11 @@ public partial class SessionPage
 
     #region 查询
 
-    private async Task<QueryData<SessionOutput>> OnQueryAsync(QueryPageOptions options)
+    private Task<QueryData<SessionOutput>> OnQueryAsync(QueryPageOptions options)
     {
-        return await Task.Run(async () =>
+        return Task.Run(() =>
          {
-             var data = await SessionService.PageAsync(options);
-             return data;
+             return SessionService.PageAsync(options);
          });
     }
 

src/Admin/ThingsGateway.Admin.Razor/ThingsGateway.Admin.Razor.csproj

@@ -17,6 +17,7 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+		<!--<UseRazorSourceGenerator>false</UseRazorSourceGenerator>-->
 	</PropertyGroup>
 	<ItemGroup>
 		<Content Remove="Locales\*.json" />
@@ -32,6 +33,12 @@
 		<None Remove="$(SolutionDir)..\README.md" Pack="false" PackagePath="\" />
 		<None Remove="$(SolutionDir)..\README.zh-CN.md" Pack="false" PackagePath="\" />
 	</ItemGroup>
+
+
+	<ItemGroup>
+		<ProjectReference Include="..\BlazorSetParametersAsyncGenerator\BlazorSetParametersAsyncGenerator.csproj" PrivateAssets="all" OutputItemType="Analyzer" />
+	</ItemGroup>
+	
 </Project>
 
 

src/Admin/ThingsGateway.DB/Entity/BaseEntity.cs

@@ -41,19 +41,19 @@ public abstract class PrimaryKeyEntity : PrimaryIdEntity
     [SugarColumn(ColumnDescription = "扩展信息", ColumnDataType = StaticConfig.CodeFirst_BigString, IsNullable = true)]
     [IgnoreExcel]
     [AutoGenerateColumn(Ignore = true)]
-    public virtual string? ExtJson { get; set; }
+    public virtual string ExtJson { get; set; }
 }
 
 public interface IBaseEntity
 {
-    DateTime? CreateTime { get; set; }
-    string? CreateUser { get; set; }
+    DateTime CreateTime { get; set; }
+    string CreateUser { get; set; }
     long CreateUserId { get; set; }
     bool IsDelete { get; set; }
-    int? SortCode { get; set; }
-    DateTime? UpdateTime { get; set; }
-    string? UpdateUser { get; set; }
-    long? UpdateUserId { get; set; }
+    int SortCode { get; set; }
+    DateTime UpdateTime { get; set; }
+    string UpdateUser { get; set; }
+    long UpdateUserId { get; set; }
 }
 
 /// <summary>
@@ -61,13 +61,22 @@ public interface IBaseEntity
 /// </summary>
 public abstract class BaseEntity : PrimaryKeyEntity, IBaseEntity
 {
+    private long createUserId;
+    private long updateUserId;
+    private DateTime createTime;
+    private DateTime updateTime;
+    private int sortCode;
+    private bool isDelete = false;
+    private string createUser;
+    private string updateUser;
+
     /// <summary>
     /// 创建时间
     /// </summary>
     [SugarColumn(ColumnDescription = "创建时间", IsOnlyIgnoreUpdate = true, IsNullable = true)]
     [IgnoreExcel]
     [AutoGenerateColumn(Visible = false, IsVisibleWhenAdd = false, IsVisibleWhenEdit = false)]
-    public virtual DateTime? CreateTime { get; set; }
+    public virtual DateTime CreateTime { get => createTime; set => createTime = value; }
 
     /// <summary>
     /// 创建人
@@ -76,7 +85,7 @@ public abstract class BaseEntity : PrimaryKeyEntity, IBaseEntity
     [IgnoreExcel]
     [NotNull]
     [AutoGenerateColumn(Ignore = true)]
-    public virtual string? CreateUser { get; set; }
+    public virtual string CreateUser { get => createUser; set => createUser = value; }
 
     /// <summary>
     /// 创建者Id
@@ -84,7 +93,7 @@ public abstract class BaseEntity : PrimaryKeyEntity, IBaseEntity
     [SugarColumn(ColumnDescription = "创建者Id", IsOnlyIgnoreUpdate = true, IsNullable = true)]
     [IgnoreExcel]
     [AutoGenerateColumn(Ignore = true)]
-    public virtual long CreateUserId { get; set; }
+    public virtual long CreateUserId { get => createUserId; set => createUserId = value; }
 
     /// <summary>
     /// 软删除
@@ -92,8 +101,7 @@ public abstract class BaseEntity : PrimaryKeyEntity, IBaseEntity
     [SugarColumn(ColumnDescription = "软删除", IsNullable = true)]
     [IgnoreExcel]
     [AutoGenerateColumn(Ignore = true)]
-    public virtual bool IsDelete { get; set; } = false;
-
+    public virtual bool IsDelete { get => isDelete; set => isDelete = value; }
 
     /// <summary>
     /// 更新时间
@@ -101,7 +109,7 @@ public abstract class BaseEntity : PrimaryKeyEntity, IBaseEntity
     [SugarColumn(ColumnDescription = "更新时间", IsOnlyIgnoreInsert = true, IsNullable = true)]
     [IgnoreExcel]
     [AutoGenerateColumn(Visible = false, IsVisibleWhenAdd = false, IsVisibleWhenEdit = false)]
-    public virtual DateTime? UpdateTime { get; set; }
+    public virtual DateTime UpdateTime { get => updateTime; set => updateTime = value; }
 
     /// <summary>
     /// 更新人
@@ -109,7 +117,7 @@ public abstract class BaseEntity : PrimaryKeyEntity, IBaseEntity
     [SugarColumn(ColumnDescription = "更新人", IsOnlyIgnoreInsert = true, IsNullable = true)]
     [IgnoreExcel]
     [AutoGenerateColumn(Ignore = true)]
-    public virtual string? UpdateUser { get; set; }
+    public virtual string UpdateUser { get => updateUser; set => updateUser = value; }
 
     /// <summary>
     /// 修改者Id
@@ -117,7 +125,7 @@ public abstract class BaseEntity : PrimaryKeyEntity, IBaseEntity
     [SugarColumn(ColumnDescription = "修改者Id", IsOnlyIgnoreInsert = true, IsNullable = true)]
     [IgnoreExcel]
     [AutoGenerateColumn(Ignore = true)]
-    public virtual long? UpdateUserId { get; set; }
+    public virtual long UpdateUserId { get => updateUserId; set => updateUserId = value; }
 
     /// <summary>
     /// 排序码
@@ -125,7 +133,7 @@ public abstract class BaseEntity : PrimaryKeyEntity, IBaseEntity
     [SugarColumn(ColumnDescription = "排序码", IsNullable = true)]
     [AutoGenerateColumn(Visible = false, DefaultSort = true, Sortable = true, DefaultSortOrder = SortOrder.Asc)]
     [IgnoreExcel]
-    public virtual int? SortCode { get; set; }
+    public virtual int SortCode { get => sortCode; set => sortCode = value; }
 }
 
 public interface IBaseDataEntity

src/Admin/ThingsGateway.DB/Services/SugarService/BaseService.cs

@@ -161,7 +161,7 @@ public class BaseService<T> : IDataService<T>, IDisposable where T : class, new(
     /// <returns></returns>
     protected SqlSugarClient GetDB()
     {
-        return DbContext.Db.GetConnectionScopeWithAttr<T>().CopyNew();
+        return DbContext.GetDB<T>();
     }
 
 

src/Admin/ThingsGateway.DB/SqlSugar/CodeFirstUtils.cs

@@ -55,7 +55,7 @@ public static class CodeFirstUtils
             var entityType = seedType.GetInterfaces().First().GetGenericArguments().First();//获取实体类型
             var tenantAtt = entityType.GetCustomAttribute<TenantAttribute>();//获取sqlSugar多库特性
             if (tenantAtt == null) continue;//如果没有多库特性就下一个
-            using var db = DbContext.Db.GetConnectionScope(tenantAtt.configId.ToString()).CopyNew();//获取数据库对象
+            using var db = DbContext.GetDB(tenantAtt.configId.ToString());//获取数据库对象
             var config = DbContext.DbConfigs.FirstOrDefault(u => u.ConfigId.ToString() == tenantAtt.configId.ToString());//获取数据库配置
             if (config?.InitSeedData != true) continue;
             var entityInfo = db.EntityMaintenance.GetEntityInfo(entityType);
@@ -99,7 +99,7 @@ public static class CodeFirstUtils
             var ignoreInit = entityType.GetCustomAttribute<IgnoreInitTableAttribute>();//获取忽略初始化特性
             if (ignoreInit != null) continue;//如果有忽略初始化特性
             if (tenantAtt == null) continue;//如果没有多库特性就下一个
-            using var db = DbContext.Db.GetConnectionScope(tenantAtt.configId.ToString()).CopyNew();//获取数据库对象
+            using var db = DbContext.GetDB(tenantAtt.configId.ToString());//获取数据库对象
             var splitTable = entityType.GetCustomAttribute<SplitTableAttribute>();//获取自动分表特性
             if (splitTable == null)//如果特性是空
                 db.CodeFirst.InitTables(entityType);//普通创建

src/Admin/ThingsGateway.DB/SqlSugar/DbContext.cs

@@ -24,7 +24,7 @@ public static class DbContext
     /// <summary>
     /// SqlSugar 数据库实例
     /// </summary>
-    public static readonly SqlSugarScope Db;
+    private static readonly SqlSugarClient Db;
 
     /// <summary>
     /// 读取配置文件中的 ConnectionStrings:Sqlsugar 配置节点
@@ -37,9 +37,28 @@ public static class DbContext
     /// <returns></returns>
     public static SqlSugarClient GetDB<T>()
     {
-        return Db.GetConnectionScopeWithAttr<T>().CopyNew();
+        return Db.GetConnectionWithAttr<T>().CopyNew();
     }
 
+    /// <summary>
+    /// 获取数据库连接
+    /// </summary>
+    /// <returns></returns>
+    public static SqlSugarClient GetDB()
+    {
+        return Db;
+    }
+
+    /// <summary>
+    /// 获取数据库连接
+    /// </summary>
+    /// <returns></returns>
+    public static SqlSugarClient GetDB(string tenant)
+    {
+        return Db.GetConnection(tenant).CopyNew();//获取数据库对象
+    }
+
+
     private static ISugarAopService sugarAopService;
     private static ISugarAopService SugarAopService
     {
@@ -62,7 +81,7 @@ public static class DbContext
         {
             DbConfigs.ForEach(it =>
             {
-                var sqlsugarScope = db.GetConnectionScope(it.ConfigId);//获取当前库
+                var sqlsugarScope = db.GetConnection(it.ConfigId);//获取当前库
                 MoreSetting(sqlsugarScope);//更多设置
                 SugarAopService.AopSetting(sqlsugarScope, it.IsShowSql);//aop配置
             }
@@ -75,7 +94,7 @@ public static class DbContext
     /// 实体更多配置
     /// </summary>
     /// <param name="db"></param>
-    private static void MoreSetting(SqlSugarScopeProvider db)
+    private static void MoreSetting(SqlSugarProvider db)
     {
         db.CurrentConnectionConfig.MoreSettings = new ConnMoreSettings
         {

src/Admin/ThingsGateway.DB/SqlSugar/SeedDataUtil.cs

@@ -24,7 +24,7 @@ namespace ThingsGateway.Admin.Application;
 /// 种子数据工具类
 /// </summary>
 [ThingsGateway.DependencyInjection.SuppressSniffer]
-public static class SeedDataUtil
+public static partial class SeedDataUtil
 {
     /// <summary>
     /// 获取List列表
@@ -53,9 +53,7 @@ public static class SeedDataUtil
         if (!string.IsNullOrEmpty(json))//如果有内容
         {
             //字段没有数据的替换成null
-            json = Regex.Replace(json, "\\\"[^\"]+?\\\": \\\"\\\"", match => match.Value.Replace("\"\"", "null"));
-
-
+            json = SeedDataRegex().Replace(json, match => match.Value.Replace("\"\"", "null"));
 
             var jtoken = JToken.Parse(json);
             jtoken = jtoken.SelectToken("Records") ?? jtoken.SelectToken("RECORDS");
@@ -96,6 +94,9 @@ public static class SeedDataUtil
 
         return seedData;
     }
+
+    [GeneratedRegex("\\\"[^\"]+?\\\": \\\"\\\"")]
+    private static partial Regex SeedDataRegex();
 }
 
 /// <summary>

src/Admin/ThingsGateway.DB/ThingsGateway.DB.csproj

@@ -22,6 +22,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
+		<!--<PackageReference Include="ThingsGateway.Razor" Version="$(SourceGeneratorVersion)" />-->
 		<ProjectReference Include="..\ThingsGateway.Razor\ThingsGateway.Razor.csproj" />
 		<ProjectReference Include="..\ThingsGateway.SqlSugar\ThingsGateway.SqlSugar.csproj" />
 		<!--<PackageReference Include="SqlSugarCore" Version="5.1.4.195" />-->

src/Admin/ThingsGateway.Furion/DynamicApiController/Internal/Penetrates.cs

@@ -87,8 +87,8 @@ internal static class Penetrates
         // 本地静态方法
         static bool Function(Type type)
         {
-            // 排除 OData 控制器
-            if (type.Assembly.GetName().Name.StartsWith("Microsoft.AspNetCore.OData")) return false;
+            //// 排除 OData 控制器
+            //if (type.Assembly.GetName().Name.StartsWith("Microsoft.AspNetCore.OData")) return false;
 
             // 不能是非公开、基元类型、值类型、抽象类、接口、泛型类
             if (!type.IsPublic || type.IsPrimitive || type.IsValueType || type.IsAbstract || type.IsInterface || type.IsGenericType) return false;

src/Admin/ThingsGateway.Furion/Logging/Implantations/Database/DatabaseLoggerProvider.cs

@@ -160,8 +160,8 @@ public sealed class DatabaseLoggerProvider : ILoggerProvider, ISupportExternalSc
         _databaseLoggingWriter = _serviceScope.ServiceProvider.GetRequiredService(databaseLoggingWriterType) as IDatabaseLoggingWriter;
 
         // 创建长时间运行的后台任务，并将日志消息队列中数据写入存储中
-        _processQueueTask = Task.Factory.StartNew(async state => await ((DatabaseLoggerProvider)state).ProcessQueueAsync().ConfigureAwait(false)
-            , this, TaskCreationOptions.LongRunning);
+        _processQueueTask = Task.Factory.StartNew(ProcessQueueAsync
+            , TaskCreationOptions.LongRunning);
     }
 
     /// <summary>

src/Admin/ThingsGateway.Furion/Logging/Implantations/File/FileLoggerProvider.cs

@@ -90,8 +90,7 @@ public sealed class FileLoggerProvider : ILoggerProvider, ISupportExternalScope
         _fileLoggingWriter = new FileLoggingWriter(this);
 
         // 创建长时间运行的后台任务，并将日志消息队列中数据写入文件中
-        _processQueueTask = Task.Factory.StartNew(async state => await ((FileLoggerProvider)state).ProcessQueueAsync().ConfigureAwait(false)
-            , this, TaskCreationOptions.LongRunning);
+        _processQueueTask = Task.Factory.StartNew(ProcessQueueAsync, TaskCreationOptions.LongRunning);
     }
 
     /// <summary>

src/Admin/ThingsGateway.Furion/Schedule/Factories/SchedulerFactory.Internal.cs

@@ -110,8 +110,7 @@ internal sealed partial class SchedulerFactory : ISchedulerFactory
         if (Persistence is not null)
         {
             // 创建长时间运行的后台任务，并将作业运行消息写入持久化中
-            _processQueueTask = Task.Factory.StartNew(async state => await ((SchedulerFactory)state).ProcessQueueAsync().ConfigureAwait(false)
-                , this, TaskCreationOptions.LongRunning);
+            _processQueueTask = Task.Factory.StartNew(ProcessQueueAsync, TaskCreationOptions.LongRunning);
         }
     }
 

src/Admin/ThingsGateway.NewLife.X/Common/MachineInfo.cs

@@ -127,63 +127,57 @@ public class MachineInfo
 
     //static MachineInfo() => RegisterAsync().Wait(100);
 
-    private static Task<MachineInfo>? _task;
     /// <summary>异步注册一个初始化后的机器信息实例</summary>
     /// <returns></returns>
-    public static Task<MachineInfo> RegisterAsync()
+    public static MachineInfo Register()
     {
-
-        if (_task != null) return _task;
-
-        return _task = Task.Factory.StartNew(() =>
+        if (Current != null) return Current;
+        // 文件缓存，加快机器信息获取。在Linux下，可能StarAgent以root权限写入缓存文件，其它应用以普通用户访问
+        var file = Path.GetTempPath().CombinePath("machine_info.json");
+        var json = "";
+        if (Current == null)
         {
-            // 文件缓存，加快机器信息获取。在Linux下，可能StarAgent以root权限写入缓存文件，其它应用以普通用户访问
-            var file = Path.GetTempPath().CombinePath("machine_info.json");
-            var json = "";
-            if (Current == null)
+            var f = file;
+            if (File.Exists(f))
             {
-                var f = file;
-                if (File.Exists(f))
+                try
                 {
-                    try
-                    {
-                        //XTrace.WriteLine("Load MachineInfo {0}", f);
-                        json = File.ReadAllText(f);
-                        Current = json.FromJsonNetString<MachineInfo>();
-                    }
-                    catch (Exception ex)
-                    {
-                        if (XTrace.Log.Level <= LogLevel.Debug) NewLife.Log.XTrace.WriteException(ex);
-                    }
+                    //XTrace.WriteLine("Load MachineInfo {0}", f);
+                    json = File.ReadAllText(f);
+                    Current = json.FromJsonNetString<MachineInfo>();
+                }
+                catch (Exception ex)
+                {
+                    if (XTrace.Log.Level <= LogLevel.Debug) NewLife.Log.XTrace.WriteException(ex);
                 }
             }
+        }
 
-            var mi = Current ?? new MachineInfo();
+        var mi = Current ?? new MachineInfo();
 
-            mi.Init();
-            Current = mi;
+        mi.Init();
+        Current = mi;
 
-            try
+        try
+        {
+            var json2 = mi.ToJsonNetString();
+            if (json != json2)
             {
-                var json2 = mi.ToJsonNetString();
-                if (json != json2)
-                {
-                    File.WriteAllText(file.EnsureDirectory(true), json2);
-                }
-            }
-            catch (Exception ex)
-            {
-                if (XTrace.Log.Level <= LogLevel.Debug) NewLife.Log.XTrace.WriteException(ex);
+                File.WriteAllText(file.EnsureDirectory(true), json2);
             }
+        }
+        catch (Exception ex)
+        {
+            if (XTrace.Log.Level <= LogLevel.Debug) NewLife.Log.XTrace.WriteException(ex);
+        }
 
-            return mi;
-        });
+        return mi;
 
     }
 
     /// <summary>获取当前信息，如果未设置则等待异步注册结果</summary>
     /// <returns></returns>
-    public static MachineInfo GetCurrent() => Current ?? RegisterAsync().ConfigureAwait(false).GetAwaiter().GetResult();
+    public static MachineInfo GetCurrent() => Current ?? Register();
 
     #endregion
 

src/Admin/ThingsGateway.Razor/BaseLayout.razor.cs

@@ -13,6 +13,7 @@ namespace ThingsGateway.Razor;
 /// <summary>
 /// 母版页基类
 /// </summary>
+[BlazorSetParametersAsyncGenerator.DoNotGenerateSetParametersAsync]
 public partial class BaseLayout
 {
 }

src/Admin/ThingsGateway.Razor/Components/Base/WebSiteModuleComponentBase.cs

@@ -11,7 +11,7 @@
 namespace ThingsGateway.Razor;
 
 /// <inheritdoc/>
-public abstract class WebSiteModuleComponentBase : BootstrapModuleComponentBase
+public abstract partial class WebSiteModuleComponentBase : BootstrapModuleComponentBase
 {
     /// <inheritdoc/>
     protected override void OnLoadJSModule()

src/Admin/ThingsGateway.Razor/Components/ImportExcel.razor

@@ -41,14 +41,16 @@
 
             }
 
+            <PopConfirmButton IsAsync IsDisabled=@_importPreviews.Any(it => it.Value.HasError) Color=Color.Warning class="mt-2" OnConfirm=@(SaveDeviceImport)>@Localizer["Import"]</PopConfirmButton>
 
-            <Button IsAsync class="mt-2" IsDisabled=@_importPreviews.Any(it => it.Value.HasError) OnClick="() => step.Next()">@Localizer["Next"]</Button>
+@* 
+            <Button IsAsync class="mt-2" IsDisabled=@_importPreviews.Any(it => it.Value.HasError) OnClick="() => step.Next()">@Localizer["Next"]</Button> *@
 
         </div>
     </StepItem>
-    <StepItem Text=@Localizer["Third"] Title=@Localizer["Import"]>
+@*     <StepItem Text=@Localizer["Third"] Title=@Localizer["Import"]>
         <PopConfirmButton IsAsync Color=Color.Warning class="mt-2" OnConfirm=@(SaveDeviceImport)>@Localizer["Import"]</PopConfirmButton>
-    </StepItem>
+    </StepItem> *@
 </Step>
 @code {
     [NotNull]

src/Admin/ThingsGateway.Razor/Extensions/ParallelExtensions.cs

@@ -8,6 +8,8 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
+using System.Collections.Concurrent;
+
 namespace ThingsGateway;
 
 /// <summary>
@@ -22,7 +24,7 @@ public static class ParallelExtensions
     /// <typeparam name="T">集合元素类型</typeparam>
     /// <param name="source">要操作的集合</param>
     /// <param name="body">要执行的操作</param>
-    public static void ParallelForEach<T>(this IEnumerable<T> source, Action<T> body)
+    public static void ParallelForEach<T>(this IList<T> source, Action<T> body)
     {
         ParallelOptions options = new();
         options.MaxDegreeOfParallelism = Environment.ProcessorCount;
@@ -39,7 +41,7 @@ public static class ParallelExtensions
     /// <typeparam name="T">集合元素类型</typeparam>
     /// <param name="source">要操作的集合</param>
     /// <param name="body">要执行的操作</param>
-    public static void ParallelForEach<T>(this IEnumerable<T> source, Action<T, ParallelLoopState, long> body)
+    public static void ParallelForEach<T>(this IList<T> source, Action<T, ParallelLoopState, long> body)
     {
         ParallelOptions options = new();
         options.MaxDegreeOfParallelism = Environment.ProcessorCount;
@@ -57,7 +59,7 @@ public static class ParallelExtensions
     /// <param name="source">要操作的集合</param>
     /// <param name="body">要执行的操作</param>
     /// <param name="parallelCount">最大并行度</param>
-    public static void ParallelForEach<T>(this IEnumerable<T> source, Action<T> body, int parallelCount)
+    public static void ParallelForEach<T>(this IList<T> source, Action<T> body, int parallelCount)
     {
         // 创建并行操作的选项对象，设置最大并行度为指定的值
         var options = new ParallelOptions();
@@ -69,6 +71,47 @@ public static class ParallelExtensions
         });
     }
 
+
+
+    /// <summary>
+    /// 使用默认的并行设置执行指定的操作（Partitioner 分区）
+    /// </summary>
+    public static void ParallelForEachStreamed<T>(this IEnumerable<T> source, Action<T> body)
+    {
+        var partitioner = Partitioner.Create<T>(source, EnumerablePartitionerOptions.NoBuffering);
+        Parallel.ForEach(partitioner, new ParallelOptions
+        {
+            MaxDegreeOfParallelism = Environment.ProcessorCount
+        }, body);
+    }
+
+    /// <summary>
+    /// 使用默认的并行设置执行指定的操作（带索引和 LoopState，Partitioner 分区）
+    /// </summary>
+    public static void ParallelForEachStreamed<T>(this IEnumerable<T> source, Action<T, ParallelLoopState, long> body)
+    {
+        var partitioner = Partitioner.Create<T>(source, EnumerablePartitionerOptions.NoBuffering);
+        Parallel.ForEach(partitioner, new ParallelOptions
+        {
+            MaxDegreeOfParallelism = Environment.ProcessorCount
+        }, (item, state, index) => body(item, state, index));
+    }
+
+    /// <summary>
+    /// 执行指定的操作，并指定最大并行度（Partitioner 分区）
+    /// </summary>
+    public static void ParallelForEachStreamed<T>(this IEnumerable<T> source, Action<T> body, int parallelCount)
+    {
+        var options = new ParallelOptions
+        {
+            MaxDegreeOfParallelism = parallelCount <= 0 ? 1 : parallelCount
+        };
+
+        var partitioner = Partitioner.Create<T>(source, EnumerablePartitionerOptions.NoBuffering);
+        Parallel.ForEach(partitioner, options, body);
+    }
+
+
     /// <summary>
     /// 异步执行指定的操作，并指定最大并行度和取消标志
     /// </summary>
@@ -78,7 +121,7 @@ public static class ParallelExtensions
     /// <param name="parallelCount">最大并行度</param>
     /// <param name="cancellationToken">取消操作的标志</param>
     /// <returns>表示异步操作的任务</returns>
-    public static Task ParallelForEachAsync<T>(this IEnumerable<T> source, Func<T, CancellationToken, ValueTask> body, int parallelCount, CancellationToken cancellationToken = default)
+    public static Task ParallelForEachAsync<T>(this IList<T> source, Func<T, CancellationToken, ValueTask> body, int parallelCount, CancellationToken cancellationToken = default)
     {
         // 创建并行操作的选项对象，设置最大并行度和取消标志
         var options = new ParallelOptions();
@@ -95,8 +138,10 @@ public static class ParallelExtensions
     /// <param name="body">异步执行的操作</param>
     /// <param name="cancellationToken">取消操作的标志</param>
     /// <returns>表示异步操作的任务</returns>
-    public static Task ParallelForEachAsync<T>(this IEnumerable<T> source, Func<T, CancellationToken, ValueTask> body, CancellationToken cancellationToken = default)
+    public static Task ParallelForEachAsync<T>(this IList<T> source, Func<T, CancellationToken, ValueTask> body, CancellationToken cancellationToken = default)
     {
         return ParallelForEachAsync(source, body, Environment.ProcessorCount, cancellationToken);
     }
+
+
 }

src/Admin/ThingsGateway.Razor/GlobalUsings.cs

@@ -21,3 +21,4 @@ global using System.Globalization;
 
 
 [assembly: SuppressMessage("Reliability", "CA2007", Justification = "<挂起>", Scope = "module")]
+[assembly: BlazorSetParametersAsyncGenerator.GlobalGenerateSetParametersAsync(true)]

src/Admin/ThingsGateway.Razor/Localization/Json/JsonStringLocalizer.cs

@@ -5,10 +5,11 @@
 
 using Microsoft.Extensions.Logging;
 
-using System.Collections.Concurrent;
 using System.Reflection;
 using System.Resources;
 
+using ThingsGateway.NewLife.Collections;
+
 namespace ThingsGateway;
 
 /// <summary>
@@ -107,14 +108,14 @@ internal class JsonStringLocalizer(Assembly assembly, string typeName, string ba
         return ret;
     }
 
-    private readonly ConcurrentDictionary<string, object?> _missingManifestCache = [];
+    private readonly ConcurrentHashSet<string> _missingManifestCache = [];
     private string? GetStringFromJson(string name)
     {
         // get string from json localization file
         var localizerStrings = MegerResolveLocalizers(CacheManager.GetAllStringsByTypeName(Assembly, typeName));
         var cacheKey = $"name={name}&culture={CultureInfo.CurrentUICulture.Name}";
         string? ret = null;
-        if (!_missingManifestCache.ContainsKey(cacheKey))
+        if (!_missingManifestCache.Contain(cacheKey))
         {
             var l = localizerStrings.Find(i => i.Name == name);
             if (l is { ResourceNotFound: false })
@@ -161,6 +162,7 @@ internal class JsonStringLocalizer(Assembly assembly, string typeName, string ba
     private List<LocalizedString> MegerResolveLocalizers(IEnumerable<LocalizedString>? localizerStrings)
     {
         var localizers = new List<LocalizedString>(CacheManager.GetTypeStringsFromResolve(typeName));
+
         if (localizerStrings != null)
         {
             localizers.AddRange(localizerStrings);
@@ -175,7 +177,7 @@ internal class JsonStringLocalizer(Assembly assembly, string typeName, string ba
         {
             Logger.LogInformation("{JsonStringLocalizerName} searched for '{Name}' in '{TypeName}' with culture '{CultureName}' not found.", nameof(JsonStringLocalizer), name, typeName, CultureInfo.CurrentUICulture.Name);
         }
-        _missingManifestCache.TryAdd($"name={name}&culture={CultureInfo.CurrentUICulture.Name}", null);
+        _missingManifestCache.TryAdd($"name={name}&culture={CultureInfo.CurrentUICulture.Name}");
     }
 
     private List<LocalizedString>? _allLocalizerdStrings;

src/Admin/ThingsGateway.Razor/Startup.cs

@@ -47,7 +47,7 @@ public class Startup : AppStartup
         // 缓存
         services.AddSingleton<ICache, MemoryCache>();
 
-        MachineInfo.RegisterAsync();
+        MachineInfo.Register();
 
         // 配置雪花Id算法机器码
         YitIdHelper.SetIdGenerator(new IdGeneratorOptions

src/Admin/ThingsGateway.Razor/ThingsGateway.Razor.csproj

@@ -1,9 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
-
 	<Import Project="$(SolutionDir)Version.props" />
 	<Import Project="$(SolutionDir)PackNuget.props" />
 	<PropertyGroup>
-		<TargetFrameworks>net8.0;</TargetFrameworks>
+		<TargetFrameworks>net8.0</TargetFrameworks>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="BootstrapBlazor.FontAwesome" Version="9.0.2" />
@@ -12,12 +11,11 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<Content Remove="Locales\*.json" />
 		<EmbeddedResource Include="Locales\*.json">
 			<CopyToOutputDirectory>Never</CopyToOutputDirectory>
 		</EmbeddedResource>
 	</ItemGroup>
-	
+
 
 	<ItemGroup>
 		<None Include="..\README.md" Pack="true" PackagePath="\" />
@@ -30,6 +28,16 @@
 		<ProjectReference Include="..\ThingsGateway.Furion\ThingsGateway.Furion.csproj" />
 	</ItemGroup>
 
+
+	<!--<ItemGroup Condition="'$(Configuration)' != 'Debug' ">
+		<None Include="..\BlazorSetParametersAsyncGenerator\tools\*.ps1" PackagePath="tools" Pack="true" Visible="false" />
+		<None Include="..\BlazorSetParametersAsyncGenerator\bin\$(Configuration)\netstandard2.0\BlazorSetParametersAsyncGenerator.dll" PackagePath="analyzers\dotnet\cs" Pack="true" Visible="false" />
+	</ItemGroup>-->
+
+	<ItemGroup>
+		<ProjectReference Include="..\BlazorSetParametersAsyncGenerator\BlazorSetParametersAsyncGenerator.csproj" PrivateAssets="all" OutputItemType="Analyzer" />
+	</ItemGroup>
+
 </Project>
 
 

src/Admin/ThingsGateway.Razor/_Imports.razor

@@ -1,5 +1,4 @@
-
-@using System.Net.Http
+@using System.Net.Http
 @using System.Net.Http.Json
 @using Microsoft.AspNetCore.Components.Forms
 @using Microsoft.AspNetCore.Components.Routing
@@ -16,4 +15,5 @@
 @using BootstrapBlazor.Components
 
 
-@using ThingsGateway.Razor;
+@using ThingsGateway.Razor
+

src/Admin/ThingsGateway.SqlSugar/Sugar/Abstract/SugarProvider/SqlSugarCoreProvider.cs

@@ -7,8 +7,8 @@ namespace ThingsGateway.SqlSugar
     /// </summary>
     public partial class SqlSugarScope : ISqlSugarClient, ITenant
     {
-        private List<ConnectionConfig> _configs;
-        private Action<SqlSugarClient> _configAction;
+        protected List<ConnectionConfig> _configs;
+        protected Action<SqlSugarClient> _configAction;
 
         protected virtual SqlSugarClient GetContext()
         {

src/Admin/ThingsGateway.SqlSugar/Sugar/Infrastructure/InstanceFactory.cs

@@ -161,7 +161,7 @@ namespace ThingsGateway.SqlSugar
             }
             else if (db is SqlSugarScope)
             {
-                db = (db as SqlSugarScope).ScopedContext.Context;
+                db = (db as SqlSugarScope).Context;
             }
             if (!(db is SqlSugarProvider))
             {
@@ -685,17 +685,20 @@ namespace ThingsGateway.SqlSugar
 
         private static Type GetCustomDbType(string className, Type type)
         {
-            if (className.Replace(".", "").Length + 1 == className.Length)
+            //命名空间相关
+            if (className.Replace(".", "").Length + 2 == className.Length)
             {
                 var array = className.Split('.');
-                foreach (var item in UtilMethods.EnumToDictionary<DbType>())
+                if (array.Length >= 3)
                 {
-                    if (array.Last().StartsWith(item.Value.ToString()))
+                    foreach (var item in UtilMethods.EnumToDictionary<DbType>())
                     {
-
-                        var newName = array.First() + "." + item.Value.ToString() + "." + array.Last();
-                        type = GetCustomTypeByClass(newName);
-                        break;
+                        if (array.Last().StartsWith(item.Value.ToString()))
+                        {
+                            var newName = $"{array[0]}.{array[1]}.{item.Value}.{array.Last()}";
+                            type = GetCustomTypeByClass(newName);
+                            break;
+                        }
                     }
                 }
 

src/Admin/ThingsGateway.SqlSugar/Sugar/IntegrationServices/CacheService.cs

@@ -1,4 +1,6 @@
-namespace ThingsGateway.SqlSugar
+using ThingsGateway.NewLife.Caching;
+
+namespace ThingsGateway.SqlSugar
 {
     public class ReflectionInoCacheService : ICacheService
     {
@@ -6,6 +8,7 @@
         {
             ReflectionInoCore<V>.GetInstance().Add(key, value);
         }
+
         public void Add<V>(string key, V value, int cacheDurationInSeconds)
         {
             ReflectionInoCore<V>.GetInstance().Add(key, value, cacheDurationInSeconds);
@@ -38,7 +41,7 @@
     }
     public class ReflectionInoCore<V>
     {
-        readonly System.Collections.Concurrent.ConcurrentDictionary<string, V> InstanceCache = new System.Collections.Concurrent.ConcurrentDictionary<string, V>();
+        readonly MemoryCache InstanceCache = new() { Expire = 1800 };
         private static ReflectionInoCore<V> _instance = null;
         private static readonly object _instanceLock = new object();
         private ReflectionInoCore() { }
@@ -58,10 +61,7 @@
 
         public V Get(string key)
         {
-            if (this.ContainsKey(key))
-                return this.InstanceCache[key];
-            else
-                return default(V);
+            return this.InstanceCache.Get<V>(key);
         }
 
         public static ReflectionInoCore<V> GetInstance()
@@ -89,8 +89,7 @@
 
         public void Remove(string key)
         {
-            V val;
-            this.InstanceCache.TryRemove(key, out val);
+            this.InstanceCache.Remove(key);
         }
 
         public void RemoveAllCache()
@@ -108,13 +107,7 @@
 
         public V GetOrCreate(string cacheKey, Func<V> create)
         {
-            if (this.ContainsKey(cacheKey)) return Get(cacheKey);
-            else
-            {
-                var reval = create();
-                this.Add(cacheKey, reval);
-                return reval;
-            }
+            return InstanceCache.GetOrAdd<V>(cacheKey, (a) => create());
         }
     }
     public static class ReflectionInoHelper

src/Admin/ThingsGateway.SqlSugar/Sugar/SqlSugarScope.cs

@@ -28,7 +28,8 @@ namespace ThingsGateway.SqlSugar
             _configs = configs;
             this._configAction = configAction;
         }
-        public SqlSugarClient ScopedContext { get { return GetContext(); } }
+        public ISqlSugarClient Context => ScopedContext.Context;
+        protected SqlSugarClient ScopedContext { get { return GetContext(); } }
         public SugarActionType SugarActionType { get => ScopedContext.SugarActionType; set => ScopedContext.SugarActionType = value; }
         public MappingTableList MappingTables { get => ScopedContext.MappingTables; set => ScopedContext.MappingTables = value; }
         public MappingColumnList MappingColumns { get => ScopedContext.MappingColumns; set => ScopedContext.MappingColumns = value; }

src/Admin/ThingsGateway.SqlSugar/ThingsGateway.SqlSugar.csproj

@@ -23,7 +23,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="SqlSugarCore.Dm" Version="8.8.0" />
-		<PackageReference Include="SqlSugarCore.Kdbndp" Version="9.3.7.605" />
+		<PackageReference Include="SqlSugarCore.Kdbndp" Version="9.3.7.613" />
 		<PackageReference Include="Microsoft.Data.Sqlite" Version="$(NET9Version)" />
 		<PackageReference Include="MySqlConnector" Version="2.4.0" />
 		<PackageReference Include="Npgsql" Version="9.0.3" />

src/Base1.sln

@@ -0,0 +1,92 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.9.34622.214
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "other", "other", "{0B748352-5D27-4F14-8A20-364034C72867}"
+	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
+		Directory.Build.props = Directory.Build.props
+		..\git_pull.bat = ..\git_pull.bat
+		..\README.md = ..\README.md
+		..\README.zh-CN.md = ..\README.zh-CN.md
+		Version.props = Version.props
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Foundation", "Foundation", "{2AC600BB-4325-4E0A-93A7-B1F53C8E2CA7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ThingsGateway.CSScript", "Foundation\ThingsGateway.CSScript\ThingsGateway.CSScript.csproj", "{506232CE-0FB6-4ACB-96DE-C8C8D075A642}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ThingsGateway.Foundation", "Foundation\ThingsGateway.Foundation\ThingsGateway.Foundation.csproj", "{9D49F8E2-A82C-4E36-8F54-4F45BF3E47C0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ThingsGateway.Foundation.SourceGenerator", "Foundation\ThingsGateway.Foundation.SourceGenerator\ThingsGateway.Foundation.SourceGenerator.csproj", "{E325A64C-2B72-4DD0-8A6C-229B29FB95EB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ThingsGateway.Foundation.Variable", "Foundation\ThingsGateway.Foundation.Variable\ThingsGateway.Foundation.Variable.csproj", "{8EE037EC-ED21-42A0-BE1F-219E9886E43A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Admin", "Admin", "{72C65578-92A5-4E99-9779-27835B12B32F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ThingsGateway.Furion", "Admin\ThingsGateway.Furion\ThingsGateway.Furion.csproj", "{D56A6669-28C5-4A99-89CF-356C7964B8E1}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ThingsGateway.NewLife.X", "Admin\ThingsGateway.NewLife.X\ThingsGateway.NewLife.X.csproj", "{8198BEEA-AC24-4D70-B3D7-2601A803610B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ThingsGateway.Razor", "Admin\ThingsGateway.Razor\ThingsGateway.Razor.csproj", "{93C0CC9A-500E-419A-B896-F36225377D43}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlazorSetParametersAsyncGenerator", "Admin\BlazorSetParametersAsyncGenerator\BlazorSetParametersAsyncGenerator.csproj", "{4C412EC1-8501-8211-5A57-3CEEE7EEA6B3}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{506232CE-0FB6-4ACB-96DE-C8C8D075A642}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{506232CE-0FB6-4ACB-96DE-C8C8D075A642}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{506232CE-0FB6-4ACB-96DE-C8C8D075A642}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{506232CE-0FB6-4ACB-96DE-C8C8D075A642}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9D49F8E2-A82C-4E36-8F54-4F45BF3E47C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9D49F8E2-A82C-4E36-8F54-4F45BF3E47C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9D49F8E2-A82C-4E36-8F54-4F45BF3E47C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9D49F8E2-A82C-4E36-8F54-4F45BF3E47C0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E325A64C-2B72-4DD0-8A6C-229B29FB95EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E325A64C-2B72-4DD0-8A6C-229B29FB95EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E325A64C-2B72-4DD0-8A6C-229B29FB95EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E325A64C-2B72-4DD0-8A6C-229B29FB95EB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8EE037EC-ED21-42A0-BE1F-219E9886E43A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8EE037EC-ED21-42A0-BE1F-219E9886E43A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8EE037EC-ED21-42A0-BE1F-219E9886E43A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8EE037EC-ED21-42A0-BE1F-219E9886E43A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D56A6669-28C5-4A99-89CF-356C7964B8E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D56A6669-28C5-4A99-89CF-356C7964B8E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D56A6669-28C5-4A99-89CF-356C7964B8E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D56A6669-28C5-4A99-89CF-356C7964B8E1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8198BEEA-AC24-4D70-B3D7-2601A803610B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8198BEEA-AC24-4D70-B3D7-2601A803610B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8198BEEA-AC24-4D70-B3D7-2601A803610B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8198BEEA-AC24-4D70-B3D7-2601A803610B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{93C0CC9A-500E-419A-B896-F36225377D43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{93C0CC9A-500E-419A-B896-F36225377D43}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{93C0CC9A-500E-419A-B896-F36225377D43}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{93C0CC9A-500E-419A-B896-F36225377D43}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4C412EC1-8501-8211-5A57-3CEEE7EEA6B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4C412EC1-8501-8211-5A57-3CEEE7EEA6B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4C412EC1-8501-8211-5A57-3CEEE7EEA6B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4C412EC1-8501-8211-5A57-3CEEE7EEA6B3}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{506232CE-0FB6-4ACB-96DE-C8C8D075A642} = {2AC600BB-4325-4E0A-93A7-B1F53C8E2CA7}
+		{9D49F8E2-A82C-4E36-8F54-4F45BF3E47C0} = {2AC600BB-4325-4E0A-93A7-B1F53C8E2CA7}
+		{E325A64C-2B72-4DD0-8A6C-229B29FB95EB} = {2AC600BB-4325-4E0A-93A7-B1F53C8E2CA7}
+		{8EE037EC-ED21-42A0-BE1F-219E9886E43A} = {2AC600BB-4325-4E0A-93A7-B1F53C8E2CA7}
+		{D56A6669-28C5-4A99-89CF-356C7964B8E1} = {72C65578-92A5-4E99-9779-27835B12B32F}
+		{8198BEEA-AC24-4D70-B3D7-2601A803610B} = {72C65578-92A5-4E99-9779-27835B12B32F}
+		{93C0CC9A-500E-419A-B896-F36225377D43} = {72C65578-92A5-4E99-9779-27835B12B32F}
+		{4C412EC1-8501-8211-5A57-3CEEE7EEA6B3} = {72C65578-92A5-4E99-9779-27835B12B32F}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		RESX_NeutralResourcesLanguage = zh-Hans
+		RESX_Rules = {"EnabledRules":[]}
+		SolutionGuid = {199B1B96-4F56-4828-9531-813BA02DB282}
+	EndGlobalSection
+EndGlobal

src/Directory.Build.props

@@ -1,9 +1,10 @@
 <Project>
 
 	<PropertyGroup>
-		<PluginVersion>10.7.58</PluginVersion>
-		<ProPluginVersion>10.7.58</ProPluginVersion>
-		<AuthenticationVersion>2.6.0</AuthenticationVersion>
+		<PluginVersion>10.8.2</PluginVersion>
+		<ProPluginVersion>10.8.2</ProPluginVersion>
+		<AuthenticationVersion>2.8.0</AuthenticationVersion>
+		<SourceGeneratorVersion>10.8.2</SourceGeneratorVersion>
 		<NET8Version>8.0.17</NET8Version>
 		<NET9Version>9.0.6</NET9Version>
 	</PropertyGroup>
@@ -24,7 +25,7 @@
 		<AnalysisModeStyle>None</AnalysisModeStyle>
 
 		<NoWarn>
-			CS8603;CS8618;CS1591;CS8625;CS8602;CS8604;CS8600;CS8601;CS8714;CS8619;CS8629;CS8765;CS8634;CS8621;CS8767;CS8633;CS8620;CS8610;CS8631;CS8605;CS8622;CS8613;NU5100;NU5104;NU1903;NU1902;CA1813;CA1852;CA1822;CA2100;CA2008;CA1812;CA1508;CA1512;CA1513;CA1810;CA1814;CA1815;CA1835;CA1819;CA1823;CA2002;CA5350;CA5351;CA5358;CA5384;CA5392;CA1805;CA1851;CA1510;CA5401;CA2022;CA1848;CA2000;CA5394;CA3003;CA1515;CA1849;CA1863
+			CS8603;CS8618;CS1591;CS8625;CS8602;CS8604;CS8600;CS8601;CS8714;CS8619;CS8629;CS8765;CS8634;CS8621;CS8767;CS8633;CS8620;CS8610;CS8631;CS8605;CS8622;CS8613;NU5100;NU5104;NU1903;NU1902;CA1813;CA1852;CA1822;CA2100;CA2008;CA1812;CA1508;CA1512;CA1513;CA1810;CA1814;CA1815;CA1835;CA1819;CA1823;CA2002;CA5350;CA5351;CA5358;CA5384;CA5392;CA1805;CA1851;CA1510;CA5401;CA2022;CA1848;CA2000;CA5394;CA3003;CA1515;CA1849;CA1863;CA5400
 		</NoWarn>
 		<TargetFrameworks>net8.0;</TargetFrameworks>
 		<LangVersion>13.0</LangVersion>

src/Foundation/ThingsGateway.Foundation.Razor/DebugPages/ChannelComponent.razor

@@ -36,6 +36,7 @@
                     <EditorItem @bind-Field="@context.StopBits" Ignore=@(context.ChannelType!=ChannelTypeEnum.SerialPort) />
                     <EditorItem @bind-Field="@context.DtrEnable" Ignore=@(context.ChannelType!=ChannelTypeEnum.SerialPort) />
                     <EditorItem @bind-Field="@context.RtsEnable" Ignore=@(context.ChannelType!=ChannelTypeEnum.SerialPort) />
+                    <EditorItem @bind-Field="@context.StreamAsync" Ignore=@(context.ChannelType!=ChannelTypeEnum.SerialPort) />
 
 
                     <EditorItem @bind-Field="@context.CacheTimeout" Ignore=@(context.ChannelType==ChannelTypeEnum.UdpSession||context.ChannelType==ChannelTypeEnum.Other) />

src/Foundation/ThingsGateway.Foundation.Razor/DebugPages/LogConsole.razor

@@ -1,6 +1,7 @@
 @using Microsoft.AspNetCore.Components.Web;
 @using Microsoft.AspNetCore.Components.Web.Virtualization
 @using Microsoft.JSInterop;
+@using ThingsGateway.Foundation
 @using ThingsGateway.NewLife.Threading
 @using ThingsGateway.Extension;
 @using BootstrapBlazor.Components

src/Foundation/ThingsGateway.Foundation.Razor/DebugPages/LogConsole.razor.cs

@@ -228,15 +228,3 @@ public partial class LogConsole : IDisposable
         }
     }
 }
-
-public class LogMessage
-{
-    public LogMessage(int level, string message)
-    {
-        Level = level;
-        Message = message;
-    }
-
-    public int Level { get; set; }
-    public string Message { get; set; }
-}

src/Foundation/ThingsGateway.Foundation.Razor/DebugPages/LogMessage.cs

@@ -0,0 +1,25 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+namespace ThingsGateway.Foundation;
+
+/// <inheritdoc/>
+
+public class LogMessage
+{
+    public LogMessage(int level, string message)
+    {
+        Level = level;
+        Message = message;
+    }
+
+    public int Level { get; set; }
+    public string Message { get; set; }
+}

src/Foundation/ThingsGateway.Foundation.Razor/GlobalUsings.cs

@@ -18,3 +18,5 @@ global using System.Diagnostics.CodeAnalysis;
 global using ThingsGateway.Razor;
 
 [assembly: SuppressMessage("Reliability", "CA2007", Justification = "<挂起>", Scope = "module")]
+
+[assembly: BlazorSetParametersAsyncGenerator.GlobalGenerateSetParametersAsync(true)]

src/Foundation/ThingsGateway.Foundation.Razor/Locales/en-US.json

@@ -23,6 +23,7 @@
     "PortName": "COM Port",
     "RemoteUrl": "Remote IP Address",
     "RtsEnable": "Rts",
+    "StreamAsync": "StreamAsync",
     "SaveChannel": "Add/Modify Channel",
     "StopBits": "Stop Bits"
   },
@@ -80,6 +81,7 @@
     "PortName": "PortName",
     "RemoteUrl": "RemoteUrl",
     "RtsEnable": "RtsEnable",
+    "StreamAsync": "StreamAsync",
     "StopBits": "StopBits"
   }
 }

src/Foundation/ThingsGateway.Foundation.Razor/Locales/zh-CN.json

@@ -23,6 +23,7 @@
     "PortName": "COM口",
     "RemoteUrl": "远程url",
     "RtsEnable": "Rts",
+    "StreamAsync": "串口流读写",
     "SaveChannel": "添加/修改通道",
     "StopBits": "停止位"
   },
@@ -80,6 +81,7 @@
     "PortName": "COM口",
     "RemoteUrl": "远程url",
     "RtsEnable": "Rts",
+    "StreamAsync": "串口流读写",
     "StopBits": "停止位"
   }
 }

src/Foundation/ThingsGateway.Foundation.Razor/ThingsGateway.Foundation.Razor.csproj

@@ -4,8 +4,10 @@
 	<Import Project="$(SolutionDir)PackNuget.props" />
 	<PropertyGroup>
 		<TargetFrameworks>net8.0;</TargetFrameworks>
+		<!--<UseRazorSourceGenerator>false</UseRazorSourceGenerator>-->
 	</PropertyGroup>
 	<ItemGroup>
+		<!--<PackageReference Include="ThingsGateway.Razor" Version="$(SourceGeneratorVersion)" />-->
 		<ProjectReference Include="..\..\Admin\ThingsGateway.Razor\ThingsGateway.Razor.csproj" />
 		<ProjectReference Include="..\ThingsGateway.Foundation\ThingsGateway.Foundation.csproj" />
 	</ItemGroup>
@@ -20,8 +22,10 @@
 			<CopyToOutputDirectory>Never</CopyToOutputDirectory>
 		</EmbeddedResource>
 	</ItemGroup>
-	
 
+	<ItemGroup>
+		<ProjectReference Include="..\..\Admin\BlazorSetParametersAsyncGenerator\BlazorSetParametersAsyncGenerator.csproj" PrivateAssets="all" OutputItemType="Analyzer" />
+	</ItemGroup>
 </Project>
 
 

src/Foundation/ThingsGateway.Foundation.Variable/ThingsGateway.Foundation.Variable.csproj

@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<Import Project="$(SolutionDir)PackNuget.props" />
-	<Import Project="$(SolutionDir)Version.props" />
 
 	<PropertyGroup>
 		<TargetFrameworks>netstandard2.0;</TargetFrameworks>
+		<Version>$(SourceGeneratorVersion)</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

src/Foundation/ThingsGateway.Foundation/Channel/ChannelOptionsBase.cs

@@ -68,6 +68,11 @@ namespace ThingsGateway.Foundation
         /// </summary>
         public virtual bool DtrEnable { get; set; } = true;
 
+        /// <summary>
+        /// StreamAsync
+        /// </summary>
+        public virtual bool StreamAsync { get; set; } = false;
+
         /// <summary>
         /// RtsEnable
         /// </summary>

src/Foundation/ThingsGateway.Foundation/Channel/IChannelOptions.cs

@@ -73,6 +73,10 @@ public interface IChannelOptions
     /// </summary>
     bool RtsEnable { get; set; }
 
+    /// <summary>
+    /// StreamAsync
+    /// </summary>
+    bool StreamAsync { get; set; }
 
     #endregion
     /// <summary>

src/Foundation/ThingsGateway.Foundation/Locales/en-US.json

@@ -20,6 +20,7 @@
     "PortName": "PortName",
     "RemoteUrl": "RemoteUrl",
     "RtsEnable": "RtsEnable",
+    "StreamAsync": "StreamAsync",
     "StopBits": "StopBits"
   },
   "ThingsGateway.Foundation.ConverterConfig": {

src/Foundation/ThingsGateway.Foundation/Locales/zh-CN.json

@@ -20,6 +20,7 @@
     "PortName": "COM口",
     "RemoteUrl": "远程url",
     "RtsEnable": "Rts",
+    "StreamAsync": "串口流读写",
     "StopBits": "停止位"
   },
   "ThingsGateway.Foundation.ConverterConfig": {

src/Foundation/ThingsGateway.Foundation/ThingsGateway.Foundation.csproj

@@ -10,8 +10,8 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="$(NET9Version)" />
-		<PackageReference Include="TouchSocket" Version="3.1.7" />
-		<PackageReference Include="TouchSocket.SerialPorts" Version="3.1.7" />
+		<PackageReference Include="TouchSocket" Version="3.1.8" />
+		<PackageReference Include="TouchSocket.SerialPorts" Version="3.1.8" />
 	</ItemGroup>
 
 	<ItemGroup>

src/Gateway/ThingsGateway.Blazor.Diagrams.Core/Core/Behaviors/KeyboardShortcutsBehavior.cs

@@ -24,7 +24,7 @@ public class KeyboardShortcutsBehavior : Behavior
 
     public KeyboardShortcutsBehavior(Diagram diagram) : base(diagram)
     {
-        _shortcuts = new Dictionary<string, Func<Diagram, ValueTask>>(10000, new CaseInsensitiveComparer());
+        _shortcuts = new Dictionary<string, Func<Diagram, ValueTask>>(10, new CaseInsensitiveComparer());
         SetShortcut("Delete", false, false, false, KeyboardShortcutsDefaults.DeleteSelection);
         SetShortcut("g", true, false, true, KeyboardShortcutsDefaults.Grouping);
 

src/Gateway/ThingsGateway.Blazor.Diagrams/GlobalUsings.cs

@@ -11,3 +11,4 @@
 
 global using Microsoft.AspNetCore.Components;
 
+[assembly: BlazorSetParametersAsyncGenerator.GlobalGenerateSetParametersAsync(true)]

src/Gateway/ThingsGateway.Blazor.Diagrams/ThingsGateway.Blazor.Diagrams.csproj

@@ -4,6 +4,7 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+		<!--<UseRazorSourceGenerator>false</UseRazorSourceGenerator>-->
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -26,7 +27,9 @@
 
 	</ItemGroup>
 	<ItemGroup>
-	  <ProjectReference Include="..\ThingsGateway.Blazor.Diagrams.Core\ThingsGateway.Blazor.Diagrams.Core.csproj" />
+		<ProjectReference Include="..\ThingsGateway.Blazor.Diagrams.Core\ThingsGateway.Blazor.Diagrams.Core.csproj" />
+
+		<ProjectReference Include="..\..\Admin\BlazorSetParametersAsyncGenerator\BlazorSetParametersAsyncGenerator.csproj" PrivateAssets="all" OutputItemType="Analyzer" />
 	</ItemGroup>
 	<ItemGroup>
 

src/Gateway/ThingsGateway.Gateway.Application/Common/Tasks/DoTask.cs

@@ -23,16 +23,17 @@ public class DoTask
     /// 取消令牌
     /// </summary>
     private CancellationTokenSource? _cancelTokenSource;
+    private object? _state;
 
-    public DoTask(Func<CancellationToken, ValueTask> doWork, ILog logger, string taskName = null)
+    public DoTask(Func<object?, CancellationToken, Task> doWork, ILog logger, object? state = null, string taskName = null)
     {
-        DoWork = doWork; Logger = logger; TaskName = taskName;
+        DoWork = doWork; Logger = logger; TaskName = taskName; _state = state;
     }
 
     /// <summary>
     /// 执行任务方法
     /// </summary>
-    public Func<CancellationToken, ValueTask> DoWork { get; }
+    public Func<object?, CancellationToken, Task> DoWork { get; }
     private ILog Logger { get; }
     private Task PrivateTask { get; set; }
     private string TaskName { get; }
@@ -74,7 +75,7 @@ public class DoTask
             {
                 if (_cancelTokenSource.IsCancellationRequested)
                     return;
-                await DoWork(_cancelTokenSource.Token).ConfigureAwait(false);
+                await DoWork(_state, _cancelTokenSource.Token).ConfigureAwait(false);
             }
             catch (OperationCanceledException)
             {

src/Gateway/ThingsGateway.Gateway.Application/Common/Tasks/ScheduledTask.cs

@@ -0,0 +1,91 @@
+using TouchSocket.Core;
+
+namespace ThingsGateway.Gateway.Application;
+
+public class ScheduledTask
+{
+    private TimeSpan _interval { get; }
+    private TimeSpan _interval10 = TimeSpan.FromMilliseconds(10);
+    private double _intervalMS { get; }
+    private readonly Func<object?, CancellationToken, Task> _taskFunc;
+    private readonly CancellationToken _token;
+    private Timer? _timer;
+    private object? _state;
+    private ILog LogMessage;
+    private volatile int _isRunning = 0;
+    private volatile int _pendingTriggers = 0;
+
+    public ScheduledTask(TimeSpan interval, Func<object?, CancellationToken, Task> taskFunc, object? state, ILog log, CancellationToken token)
+    {
+        LogMessage = log;
+        _state = state;
+        _interval = interval;
+        _intervalMS = interval.TotalMilliseconds;
+        _taskFunc = taskFunc;
+        _token = token;
+    }
+
+    public void Start()
+    {
+        _timer?.Dispose();
+        _timer = new Timer(TimerCallback, _state, TimeSpan.Zero, _interval);
+    }
+
+    private void TimerCallback(object? state)
+    {
+        _ = Do(state);
+    }
+
+    private async Task Do(object? state)
+    {
+        if (_token.IsCancellationRequested)
+            return;
+
+        Interlocked.Exchange(ref _pendingTriggers, 1);
+
+        if (Interlocked.Exchange(ref _isRunning, 1) == 1)
+            return;
+
+        try
+        {
+            await _taskFunc(state, _token).ConfigureAwait(false);
+        }
+        catch (OperationCanceledException)
+        {
+        }
+        catch (Exception ex)
+        {
+            LogMessage.LogWarning(ex);
+        }
+        finally
+        {
+            Interlocked.Exchange(ref _isRunning, 0);
+        }
+
+        if (Interlocked.Exchange(ref _pendingTriggers, 0) == 1)
+        {
+            if (!_token.IsCancellationRequested)
+            {
+                DelayDo();
+            }
+        }
+    }
+
+    private void DelayDo()
+    {
+        // 延迟触发下一次
+        _timer?.Change(_interval10, _interval);
+    }
+
+    public void Change(int dueTime, int period)
+    {
+        _timer?.Change(dueTime, period);
+    }
+
+    public void Stop()
+    {
+        _timer?.Dispose();
+        _timer = null;
+    }
+
+}

src/Gateway/ThingsGateway.Gateway.Application/Common/Tasks/SmartTriggerScheduler.cs

@@ -41,7 +41,7 @@ public class SmartTriggerScheduler
 
             // 否则启动执行任务
             _isRunning = true;
-            _ = Task.Run(ExecuteLoop); // 开启异步执行循环（非阻塞）
+            _ = Task.Run(ExecuteLoop);
         }
     }
 

src/Gateway/ThingsGateway.Gateway.Application/Common/Tasks/TaskSchedulerLoop.cs

@@ -0,0 +1,34 @@
+namespace ThingsGateway.Gateway.Application;
+
+public class TaskSchedulerLoop
+{
+    public readonly List<ScheduledTask> Tasks;
+
+    public TaskSchedulerLoop(List<ScheduledTask> tasks)
+    {
+        Tasks = tasks;
+    }
+
+    public void Start()
+    {
+        foreach (var task in Tasks)
+        {
+            task.Start();
+        }
+    }
+
+    public void Stop()
+    {
+        foreach (var task in Tasks)
+        {
+            task.Stop();
+        }
+    }
+    public void Change(int dueTime, int period)
+    {
+        foreach (var task in Tasks)
+        {
+            task.Change(dueTime, period);
+        }
+    }
+}

src/Gateway/ThingsGateway.Gateway.Application/Controller/ControlController.cs

@@ -317,6 +317,11 @@ public class ChannelInput
     /// </summary>
     public virtual bool RtsEnable { get; set; }
 
+    /// <summary>
+    /// StreamAsync
+    /// </summary>
+    public virtual bool StreamAsync { get; set; } = false;
+
     /// <summary>
     /// 缓存超时
     /// </summary>

src/Gateway/ThingsGateway.Gateway.Application/Driver/Business/BusinessBase.cs

@@ -171,7 +171,7 @@ public abstract class BusinessBase : DriverBase
         }
     }
 
-    internal override ValueTask StartAsync(CancellationToken cancellationToken)
+    internal override Task StartAsync(CancellationToken cancellationToken)
     {
         TimeTick = new TimeTick(CurrentDevice.IntervalTime);
         return base.StartAsync(cancellationToken);

src/Gateway/ThingsGateway.Gateway.Application/Driver/Business/Cache/Interval/BusinessBaseWithCacheIntervalAlarmModel.cs

@@ -49,8 +49,7 @@ public abstract class BusinessBaseWithCacheIntervalAlarmModel<VarModel, DevModel
 
         GlobalData.AlarmChangedEvent += AlarmValueChange;
         // 解绑全局数据的事件
-        GlobalData.VariableValueChangeEvent -= VariableValueChange;
-        GlobalData.DeviceStatusChangeEvent -= DeviceStatusChange;
+
 
         // 根据业务属性的缓存是否为间隔上传来决定事件绑定
         if (_businessPropertyWithCacheInterval.BusinessUpdateEnum != BusinessUpdateEnum.Interval)
@@ -129,6 +128,7 @@ public abstract class BusinessBaseWithCacheIntervalAlarmModel<VarModel, DevModel
     /// </summary>
     protected override void Dispose(bool disposing)
     {
+
         // 解绑事件
         GlobalData.AlarmChangedEvent -= AlarmValueChange;
         GlobalData.VariableValueChangeEvent -= VariableValueChange;

src/Gateway/ThingsGateway.Gateway.Application/Driver/Business/Cache/Interval/BusinessBaseWithCacheIntervalDeviceModel.cs

@@ -50,10 +50,6 @@ public abstract class BusinessBaseWithCacheIntervalDeviceModel<VarModel, DevMode
 
 
 
-        // 注销全局变量值改变事件和设备状态改变事件的订阅，以防止重复订阅
-        GlobalData.VariableValueChangeEvent -= VariableValueChange;
-        GlobalData.DeviceStatusChangeEvent -= DeviceStatusChange;
-
         // 如果不是间隔上传，则订阅全局变量值改变事件和设备状态改变事件，并触发一次事件处理
         if (_businessPropertyWithCacheInterval.BusinessUpdateEnum != BusinessUpdateEnum.Interval)
         {

src/Gateway/ThingsGateway.Gateway.Application/Driver/Business/Cache/Interval/BusinessBaseWithCacheIntervalVariableModel.cs

@@ -44,7 +44,6 @@ public abstract class BusinessBaseWithCacheIntervalVariableModel<VarModel> : Bus
         _exTTimerTick = new TimeTick(_businessPropertyWithCacheInterval.BusinessInterval);
 
         // 注册变量值变化事件处理程序
-        GlobalData.VariableValueChangeEvent -= VariableValueChange;
         if (_businessPropertyWithCacheInterval.BusinessUpdateEnum != BusinessUpdateEnum.Interval)
         {
             GlobalData.VariableValueChangeEvent += VariableValueChange;
@@ -164,7 +163,7 @@ public abstract class BusinessBaseWithCacheIntervalVariableModel<VarModel> : Bus
     /// </summary>
     /// <param name="variableRuntime">变量运行时对象</param>
     /// <param name="variable">变量数据</param>
-    private void VariableValueChange(VariableRuntime variableRuntime, VariableBasicData variable)
+    protected void VariableValueChange(VariableRuntime variableRuntime, VariableBasicData variable)
     {
         if (CurrentDevice.Pause == true)
             return;

src/Gateway/ThingsGateway.Gateway.Application/Driver/Collect/CollectBase.cs

@@ -53,7 +53,7 @@ public abstract class CollectBase : DriverBase, IRpcDriver
 
         //预热脚本，加速编译
         IdVariableRuntimes.Where(a => !string.IsNullOrWhiteSpace(a.Value.ReadExpressions))
-         .Select(b => b.Value.ReadExpressions).ToHashSet().ParallelForEach(script =>
+         .Select(b => b.Value.ReadExpressions).Distinct().ToArray().ParallelForEach(script =>
          {
              try
              {
@@ -234,16 +234,17 @@ public abstract class CollectBase : DriverBase, IRpcDriver
             return ThreadRunReturnTypeEnum.None;
         }
     }
+    ReadResultCount readResultCount = new();
     /// <summary>
     /// 执行读取等方法，如果插件不支持读取，而是自更新值的话，需重写此方法
     /// </summary>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
-    protected override async ValueTask ProtectedExecuteAsync(CancellationToken cancellationToken)
+    protected override async Task ProtectedExecuteAsync(CancellationToken cancellationToken)
     {
         try
         {
-            ReadResultCount readResultCount = new();
+            readResultCount.Reset();
             if (cancellationToken.IsCancellationRequested)
                 return;
 
@@ -545,6 +546,13 @@ public abstract class CollectBase : DriverBase, IRpcDriver
         public int deviceMethodsVariableSuccessNum = 0;
         public int deviceSourceVariableFailedNum = 0;
         public int deviceSourceVariableSuccessNum = 0;
+        public void Reset()
+        {
+            deviceMethodsVariableFailedNum = 0;
+            deviceMethodsVariableSuccessNum = 0;
+            deviceSourceVariableFailedNum = 0;
+            deviceSourceVariableSuccessNum = 0;
+        }
     }
 
     #region 写入方法
@@ -590,11 +598,11 @@ public abstract class CollectBase : DriverBase, IRpcDriver
 
         try
         {
-
-            // 使用并发方式遍历写入信息列表，并进行异步写入操作
-            await writeInfoLists
+            var list = writeInfoLists
             .Where(a => !results.Any(b => b.Key == a.Key.Name))
-            .ToDictionary(item => item.Key, item => item.Value).ParallelForEachAsync(async (writeInfo, cancellationToken) =>
+            .ToDictionary(item => item.Key, item => item.Value).ToArray();
+            // 使用并发方式遍历写入信息列表，并进行异步写入操作
+            await list.ParallelForEachAsync(async (writeInfo, cancellationToken) =>
         {
             try
             {

src/Gateway/ThingsGateway.Gateway.Application/Driver/Collect/CollectFoundationBase.cs

@@ -177,9 +177,9 @@ public abstract class CollectFoundationBase : CollectBase
 
             // 创建用于存储操作结果的并发字典
             ConcurrentDictionary<string, OperResult> operResults = new();
-
+            var list = writeInfoLists.ToArray();
             // 使用并发方式遍历写入信息列表，并进行异步写入操作
-            await writeInfoLists.ParallelForEachAsync(async (writeInfo, cancellationToken) =>
+            await list.ParallelForEachAsync(async (writeInfo, cancellationToken) =>
             {
                 try
                 {

src/Gateway/ThingsGateway.Gateway.Application/Driver/DriverBase.cs

@@ -237,7 +237,7 @@ public abstract class DriverBase : DisposableObject, IDriver
     /// </summary>
     /// <param name="cancellationToken">取消操作的令牌。</param>
     /// <returns>表示异步操作的任务。</returns>
-    internal virtual async ValueTask StartAsync(CancellationToken cancellationToken)
+    internal virtual async Task StartAsync(CancellationToken cancellationToken)
     {
         // 如果已经执行过初始化，则直接返回
         if (IsStarted)
@@ -426,7 +426,7 @@ public abstract class DriverBase : DisposableObject, IDriver
     /// <summary>
     /// 间隔执行
     /// </summary>
-    protected abstract ValueTask ProtectedExecuteAsync(CancellationToken cancellationToken);
+    protected abstract Task ProtectedExecuteAsync(CancellationToken cancellationToken);
 
 
 

src/Gateway/ThingsGateway.Gateway.Application/Entity/Channel.cs

@@ -137,6 +137,13 @@ public class Channel : ChannelOptionsBase, IPrimaryIdEntity, IBaseDataEntity, IB
     [AutoGenerateColumn(Visible = false, Filterable = true, Sortable = true)]
     public override bool RtsEnable { get; set; }
 
+    /// <summary>
+    /// StreamAsync
+    /// </summary>
+    [SugarColumn(ColumnDescription = "StreamAsync", IsNullable = true)]
+    [AutoGenerateColumn(Visible = false, Filterable = true, Sortable = true)]
+    public override bool StreamAsync { get; set; } = false;
+
     /// <summary>
     /// 缓存超时
     /// </summary>
@@ -203,7 +210,7 @@ public class Channel : ChannelOptionsBase, IPrimaryIdEntity, IBaseDataEntity, IB
     [SugarColumn(ColumnDescription = "创建时间", IsOnlyIgnoreUpdate = true, IsNullable = true)]
     [IgnoreExcel]
     [AutoGenerateColumn(Visible = false, IsVisibleWhenAdd = false, IsVisibleWhenEdit = false)]
-    public virtual DateTime? CreateTime { get; set; }
+    public virtual DateTime CreateTime { get; set; }
 
     /// <summary>
     /// 创建人
@@ -237,7 +244,7 @@ public class Channel : ChannelOptionsBase, IPrimaryIdEntity, IBaseDataEntity, IB
     [SugarColumn(ColumnDescription = "更新时间", IsOnlyIgnoreInsert = true, IsNullable = true)]
     [IgnoreExcel]
     [AutoGenerateColumn(Visible = false, IsVisibleWhenAdd = false, IsVisibleWhenEdit = false)]
-    public virtual DateTime? UpdateTime { get; set; }
+    public virtual DateTime UpdateTime { get; set; }
 
     /// <summary>
     /// 更新人
@@ -245,7 +252,7 @@ public class Channel : ChannelOptionsBase, IPrimaryIdEntity, IBaseDataEntity, IB
     [SugarColumn(ColumnDescription = "更新人", IsOnlyIgnoreInsert = true, IsNullable = true)]
     [IgnoreExcel]
     [AutoGenerateColumn(Ignore = true)]
-    public virtual string? UpdateUser { get; set; }
+    public virtual string UpdateUser { get; set; }
 
     /// <summary>
     /// 修改者Id
@@ -253,7 +260,7 @@ public class Channel : ChannelOptionsBase, IPrimaryIdEntity, IBaseDataEntity, IB
     [SugarColumn(ColumnDescription = "修改者Id", IsOnlyIgnoreInsert = true, IsNullable = true)]
     [IgnoreExcel]
     [AutoGenerateColumn(Ignore = true)]
-    public virtual long? UpdateUserId { get; set; }
+    public virtual long UpdateUserId { get; set; }
 
     /// <summary>
     /// 排序码
@@ -261,7 +268,7 @@ public class Channel : ChannelOptionsBase, IPrimaryIdEntity, IBaseDataEntity, IB
     [SugarColumn(ColumnDescription = "排序码", IsNullable = true)]
     [AutoGenerateColumn(Visible = false, DefaultSort = true, Sortable = true, DefaultSortOrder = SortOrder.Asc)]
     [IgnoreExcel]
-    public int? SortCode { get; set; }
+    public int SortCode { get; set; }
 
     /// <summary>
     /// 导入验证专用

src/Gateway/ThingsGateway.Gateway.Application/Entity/Variable.cs

@@ -32,6 +32,86 @@ public class Variable : BaseDataEntity, IValidatableObject
 {
 
 
+
+    /// <summary>
+    /// 导入验证专用
+    /// </summary>
+    [System.Text.Json.Serialization.JsonIgnore]
+    [Newtonsoft.Json.JsonIgnore]
+    internal long Row;
+    private double hAlarmCode = 50;
+    private double lAlarmCode = 10;
+    private double hHAlarmCode = 90;
+    private double lLAlarmCode = 0;
+    private long deviceId;
+    private int? arrayLength;
+    private int alarmDelay;
+    private ProtectTypeEnum protectType = ProtectTypeEnum.ReadWrite;
+    private DataTypeEnum dataType = DataTypeEnum.Int16;
+
+
+
+    /// <summary>
+    /// 导入验证专用
+    /// </summary>
+    [System.Text.Json.Serialization.JsonIgnore]
+    [Newtonsoft.Json.JsonIgnore]
+    internal bool IsUp;
+    private bool enable = true;
+    public bool DynamicVariable;
+    private bool rpcWriteEnable = true;
+    private bool saveValue = false;
+    private bool boolOpenAlarmEnable;
+    private bool boolCloseAlarmEnable;
+    private bool hAlarmEnable;
+    private bool hHAlarmEnable;
+    private bool lLAlarmEnable;
+    private bool lAlarmEnable;
+    private bool customAlarmEnable;
+
+    private object _value;
+    private string name;
+    private string collectGroup = string.Empty;
+    private string businessGroup;
+    private string description;
+    private string unit;
+    private string intervalTime;
+    private string registerAddress;
+    private string otherMethod;
+    private string readExpressions;
+    private string writeExpressions;
+    private string boolOpenRestrainExpressions;
+    private string boolOpenAlarmText;
+    private string boolCloseRestrainExpressions;
+    private string boolCloseAlarmText;
+    private string hRestrainExpressions;
+    private string hAlarmText;
+    private Dictionary<long, Dictionary<string, string>>? variablePropertys;
+    private string hHRestrainExpressions;
+    private string hHAlarmText;
+    private string lRestrainExpressions;
+    private string lAlarmText;
+
+    private string lLRestrainExpressions;
+    private string lLAlarmText;
+    private string customRestrainExpressions;
+    private string customAlarmText;
+    private string customAlarmCode;
+    private string remark1;
+    private string remark2;
+    private string remark3;
+    private string remark4;
+    private string remark5;
+
+    /// <summary>
+    /// 变量额外属性Json
+    /// </summary>
+    [System.Text.Json.Serialization.JsonIgnore]
+    [Newtonsoft.Json.JsonIgnore]
+    [AdaptIgnore]
+    public ConcurrentDictionary<long, ModelValueValidateForm>? VariablePropertyModels;
+
+
     /// <summary>
     /// 设备
     /// </summary>
@@ -40,7 +120,7 @@ public class Variable : BaseDataEntity, IValidatableObject
     [IgnoreExcel]
     [Required]
     [NotNull]
-    public virtual long DeviceId { get; set; }
+    public virtual long DeviceId { get => deviceId; set => deviceId = value; }
 
     /// <summary>
     /// 变量名称
@@ -48,112 +128,107 @@ public class Variable : BaseDataEntity, IValidatableObject
     [SugarColumn(ColumnDescription = "变量名称", IsNullable = false)]
     [AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true, Order = 1)]
     [Required]
-    public virtual string Name { get; set; }
+    public virtual string Name { get => name; set => name = value; }
 
     /// <summary>
     /// 采集组
     /// </summary>
     [SugarColumn(ColumnDescription = "采集组", IsNullable = true)]
     [AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true, Order = 1)]
-    public virtual string CollectGroup { get; set; } = string.Empty;
-
+    public virtual string CollectGroup { get => collectGroup; set => collectGroup = value; }
     /// <summary>
     /// 分组名称
     /// </summary>
     [SugarColumn(ColumnDescription = "分组名称", IsNullable = true)]
     [AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true, Order = 1)]
-    public virtual string BusinessGroup { get; set; }
+    public virtual string BusinessGroup { get => businessGroup; set => businessGroup = value; }
 
     /// <summary>
     /// 描述
     /// </summary>
     [SugarColumn(ColumnDescription = "描述", Length = 200, IsNullable = true)]
     [AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true, Order = 2)]
-    public string? Description { get; set; }
+    public string Description { get => description; set => description = value; }
 
     /// <summary>
     /// 单位
     /// </summary>
     [SugarColumn(ColumnDescription = "单位", Length = 200, IsNullable = true)]
     [AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true, Order = 3)]
-    public virtual string? Unit { get; set; }
+    public virtual string Unit { get => unit; set => unit = value; }
 
     /// <summary>
     /// 间隔时间
     /// </summary>
     [SugarColumn(ColumnDescription = "间隔时间", IsNullable = true)]
     [AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true)]
-    public virtual string? IntervalTime { get; set; }
+    public virtual string IntervalTime { get => intervalTime; set => intervalTime = value; }
 
     /// <summary>
     /// 变量地址，可能带有额外的信息，比如<see cref="DataFormatEnum"/> ，以;分割
     /// </summary>
     [SugarColumn(ColumnDescription = "变量地址", Length = 200, IsNullable = true)]
     [AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true)]
-    public string? RegisterAddress { get; set; }
+    public string RegisterAddress { get => registerAddress; set => registerAddress = value; }
 
     /// <summary>
     /// 数组长度
     /// </summary>
     [SugarColumn(ColumnDescription = "数组长度", IsNullable = true)]
     [AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true)]
-    public int? ArrayLength { get; set; }
+    public int? ArrayLength { get => arrayLength; set => arrayLength = value; }
 
     /// <summary>
     /// 其他方法，若不为空，此时RegisterAddress为方法参数
     /// </summary>
     [SugarColumn(ColumnDescription = "特殊方法", Length = 200, IsNullable = true)]
     [AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true)]
-    public string? OtherMethod { get; set; }
+    public string OtherMethod { get => otherMethod; set => otherMethod = value; }
 
     /// <summary>
     /// 使能
     /// </summary>
     [SugarColumn(ColumnDescription = "使能")]
     [AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true)]
-    public virtual bool Enable { get; set; } = true;
-
+    public virtual bool Enable { get => enable; set => enable = value; }
     /// <summary>
     /// 读写权限
     /// </summary>
     [SugarColumn(ColumnDescription = "读写权限", IsNullable = false)]
     [AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true)]
-    public virtual ProtectTypeEnum ProtectType { get; set; } = ProtectTypeEnum.ReadWrite;
-
+    public virtual ProtectTypeEnum ProtectType { get => protectType; set => protectType = value; }
     /// <summary>
     /// 数据类型
     /// </summary>
     [SugarColumn(ColumnDescription = "数据类型")]
     [AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true)]
-    public virtual DataTypeEnum DataType { get; set; } = DataTypeEnum.Int16;
-
+    public virtual DataTypeEnum DataType { get => dataType; set => dataType = value; }
     /// <summary>
     /// 读取表达式
     /// </summary>
     [SugarColumn(ColumnDescription = "读取表达式", Length = 1000, IsNullable = true)]
     [AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true)]
-    public virtual string? ReadExpressions { get; set; }
+    public virtual string ReadExpressions { get => readExpressions; set => readExpressions = value; }
 
     /// <summary>
     /// 写入表达式
     /// </summary>
     [SugarColumn(ColumnDescription = "写入表达式", Length = 1000, IsNullable = true)]
     [AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true)]
-    public virtual string? WriteExpressions { get; set; }
+    public virtual string WriteExpressions { get => writeExpressions; set => writeExpressions = value; }
 
     /// <summary>
     /// 是否允许远程Rpc写入
     /// </summary>
     [SugarColumn(ColumnDescription = "远程写入", IsNullable = true)]
     [AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true)]
-    public virtual bool RpcWriteEnable { get; set; } = true;
-
+    public virtual bool RpcWriteEnable { get => rpcWriteEnable; set => rpcWriteEnable = value; }
     /// <summary>
     /// 初始值
     /// </summary>
     [SugarColumn(IsJson = true, ColumnDataType = StaticConfig.CodeFirst_BigString, ColumnDescription = "初始值", IsNullable = true)]
     [AutoGenerateColumn(Ignore = true)]
-    public object? InitValue
+    public object InitValue
     {
         get
         {
@@ -167,22 +242,20 @@ public class Variable : BaseDataEntity, IValidatableObject
                 _value = null;
         }
     }
-    private object? _value;
 
     /// <summary>
     /// 保存初始值
     /// </summary>
     [SugarColumn(ColumnDescription = "保存初始值", IsNullable = true)]
     [AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true)]
-    public virtual bool SaveValue { get; set; } = false;
-
+    public virtual bool SaveValue { get => saveValue; set => saveValue = value; }
     /// <summary>
     /// 变量额外属性Json
     /// </summary>
     [SugarColumn(IsJson = true, ColumnDataType = StaticConfig.CodeFirst_BigString, ColumnDescription = "变量属性Json", IsNullable = true)]
     [IgnoreExcel]
     [AutoGenerateColumn(Ignore = true)]
-    public Dictionary<long, Dictionary<string, string>>? VariablePropertys { get; set; }
+    public Dictionary<long, Dictionary<string, string>>? VariablePropertys { get => variablePropertys; set => variablePropertys = value; }
 
     #region 报警
     /// <summary>
@@ -190,189 +263,189 @@ public class Variable : BaseDataEntity, IValidatableObject
     /// </summary>
     [SugarColumn(ColumnDescription = "报警延时")]
     [AutoGenerateColumn(Visible = false, Filterable = true, Sortable = true)]
-    public int AlarmDelay { get; set; }
+    public int AlarmDelay { get => alarmDelay; set => alarmDelay = value; }
 
     /// <summary>
     /// 布尔开报警使能
     /// </summary>
     [SugarColumn(ColumnDescription = "布尔开报警使能")]
     [AutoGenerateColumn(Visible = false, Filterable = true, Sortable = true)]
-    public bool BoolOpenAlarmEnable { get; set; }
+    public bool BoolOpenAlarmEnable { get => boolOpenAlarmEnable; set => boolOpenAlarmEnable = value; }
 
     /// <summary>
     /// 布尔开报警约束
     /// </summary>
     [SugarColumn(ColumnDescription = "布尔开报警约束", IsNullable = true)]
     [AutoGenerateColumn(Visible = false, Filterable = true, Sortable = true)]
-    public string? BoolOpenRestrainExpressions { get; set; }
+    public string BoolOpenRestrainExpressions { get => boolOpenRestrainExpressions; set => boolOpenRestrainExpressions = value; }
 
     /// <summary>
     /// 布尔开报警文本
     /// </summary>
     [SugarColumn(ColumnDescription = "布尔开报警文本", IsNullable = true)]
     [AutoGenerateColumn(Visible = false, Filterable = true, Sortable = true)]
-    public string? BoolOpenAlarmText { get; set; }
+    public string BoolOpenAlarmText { get => boolOpenAlarmText; set => boolOpenAlarmText = value; }
 
     /// <summary>
     /// 布尔关报警使能
     /// </summary>
     [SugarColumn(ColumnDescription = "布尔关报警使能")]
     [AutoGenerateColumn(Visible = false, Filterable = true, Sortable = true)]
-    public bool BoolCloseAlarmEnable { get; set; }
+    public bool BoolCloseAlarmEnable { get => boolCloseAlarmEnable; set => boolCloseAlarmEnable = value; }
 
     /// <summary>
     /// 布尔关报警约束
     /// </summary>
     [SugarColumn(ColumnDescription = "布尔关报警约束", IsNullable = true)]
     [AutoGenerateColumn(Visible = false, Filterable = true, Sortable = true)]
-    public string? BoolCloseRestrainExpressions { get; set; }
+    public string BoolCloseRestrainExpressions { get => boolCloseRestrainExpressions; set => boolCloseRestrainExpressions = value; }
 
     /// <summary>
     /// 布尔关报警文本
     /// </summary>
     [SugarColumn(ColumnDescription = "布尔关报警文本", IsNullable = true)]
     [AutoGenerateColumn(Visible = false, Filterable = true, Sortable = true)]
-    public string? BoolCloseAlarmText { get; set; }
+    public string BoolCloseAlarmText { get => boolCloseAlarmText; set => boolCloseAlarmText = value; }
 
     /// <summary>
     /// 高报使能
     /// </summary>
     [SugarColumn(ColumnDescription = "高报使能")]
     [AutoGenerateColumn(Visible = false, Filterable = true, Sortable = true)]
-    public bool HAlarmEnable { get; set; }
+    public bool HAlarmEnable { get => hAlarmEnable; set => hAlarmEnable = value; }
 
     /// <summary>
     /// 高报约束
     /// </summary>
     [SugarColumn(ColumnDescription = "高报约束", IsNullable = true)]
     [AutoGenerateColumn(Visible = false, Filterable = true, Sortable = true)]
-    public string? HRestrainExpressions { get; set; }
+    public string HRestrainExpressions { get => hRestrainExpressions; set => hRestrainExpressions = value; }
 
     /// <summary>
     /// 高报文本
     /// </summary>
     [SugarColumn(ColumnDescription = "高报文本", IsNullable = true)]
     [AutoGenerateColumn(Visible = false, Filterable = true, Sortable = true)]
-    public string? HAlarmText { get; set; }
+    public string HAlarmText { get => hAlarmText; set => hAlarmText = value; }
 
     /// <summary>
     /// 高限值
     /// </summary>
     [SugarColumn(ColumnDescription = "高限值", IsNullable = true)]
     [AutoGenerateColumn(Visible = false, Filterable = true, Sortable = true)]
-    public double? HAlarmCode { get; set; }
+    public double HAlarmCode { get => hAlarmCode; set => hAlarmCode = value; }
 
     /// <summary>
     /// 高高报使能
     /// </summary>
     [SugarColumn(ColumnDescription = "高高报使能")]
     [AutoGenerateColumn(Visible = false, Filterable = true, Sortable = true)]
-    public bool HHAlarmEnable { get; set; }
+    public bool HHAlarmEnable { get => hHAlarmEnable; set => hHAlarmEnable = value; }
 
     /// <summary>
     /// 高高报约束
     /// </summary>
     [SugarColumn(ColumnDescription = "高高报约束", IsNullable = true)]
     [AutoGenerateColumn(Visible = false, Filterable = true, Sortable = true)]
-    public string? HHRestrainExpressions { get; set; }
+    public string HHRestrainExpressions { get => hHRestrainExpressions; set => hHRestrainExpressions = value; }
 
     /// <summary>
     /// 高高报文本
     /// </summary>
     [SugarColumn(ColumnDescription = "高高报文本", IsNullable = true)]
     [AutoGenerateColumn(Visible = false, Filterable = true, Sortable = true)]
-    public string? HHAlarmText { get; set; }
+    public string HHAlarmText { get => hHAlarmText; set => hHAlarmText = value; }
 
     /// <summary>
     /// 高高限值
     /// </summary>
     [SugarColumn(ColumnDescription = "高高限值", IsNullable = true)]
     [AutoGenerateColumn(Visible = false, Filterable = true, Sortable = true)]
-    public double? HHAlarmCode { get; set; }
+    public double HHAlarmCode { get => hHAlarmCode; set => hHAlarmCode = value; }
 
     /// <summary>
     /// 低报使能
     /// </summary>
     [SugarColumn(ColumnDescription = "低报使能")]
     [AutoGenerateColumn(Visible = false, Filterable = true, Sortable = true)]
-    public bool LAlarmEnable { get; set; }
+    public bool LAlarmEnable { get => lAlarmEnable; set => lAlarmEnable = value; }
 
     /// <summary>
     /// 低报约束
     /// </summary>
     [SugarColumn(ColumnDescription = "低报约束", IsNullable = true)]
     [AutoGenerateColumn(Visible = false, Filterable = true, Sortable = true)]
-    public string? LRestrainExpressions { get; set; }
+    public string LRestrainExpressions { get => lRestrainExpressions; set => lRestrainExpressions = value; }
 
     /// <summary>
     /// 低报文本
     /// </summary>
     [SugarColumn(ColumnDescription = "低报文本", IsNullable = true)]
     [AutoGenerateColumn(Visible = false, Filterable = true, Sortable = true)]
-    public string? LAlarmText { get; set; }
+    public string LAlarmText { get => lAlarmText; set => lAlarmText = value; }
 
     /// <summary>
     /// 低限值
     /// </summary>
     [SugarColumn(ColumnDescription = "低限值", IsNullable = true)]
     [AutoGenerateColumn(Visible = false, Filterable = true, Sortable = true)]
-    public double? LAlarmCode { get; set; }
+    public double LAlarmCode { get => lAlarmCode; set => lAlarmCode = value; }
 
     /// <summary>
     /// 低低报使能
     /// </summary>
     [SugarColumn(ColumnDescription = "低低报使能")]
     [AutoGenerateColumn(Visible = false, Filterable = true, Sortable = true)]
-    public bool LLAlarmEnable { get; set; }
+    public bool LLAlarmEnable { get => lLAlarmEnable; set => lLAlarmEnable = value; }
 
     /// <summary>
     /// 低低报约束
     /// </summary>
     [SugarColumn(ColumnDescription = "低低报约束", IsNullable = true)]
     [AutoGenerateColumn(Visible = false, Filterable = true, Sortable = true)]
-    public string? LLRestrainExpressions { get; set; }
+    public string LLRestrainExpressions { get => lLRestrainExpressions; set => lLRestrainExpressions = value; }
 
     /// <summary>
     /// 低低报文本
     /// </summary>
     [SugarColumn(ColumnDescription = "低低报文本", IsNullable = true)]
     [AutoGenerateColumn(Visible = false, Filterable = true, Sortable = true)]
-    public string? LLAlarmText { get; set; }
+    public string LLAlarmText { get => lLAlarmText; set => lLAlarmText = value; }
 
     /// <summary>
     /// 低低限值
     /// </summary>
     [SugarColumn(ColumnDescription = "低低限值", IsNullable = true)]
     [AutoGenerateColumn(Visible = false, Filterable = true, Sortable = true)]
-    public double? LLAlarmCode { get; set; }
+    public double LLAlarmCode { get => lLAlarmCode; set => lLAlarmCode = value; }
 
     /// <summary>
     /// 自定义报警使能
     /// </summary>
     [SugarColumn(ColumnDescription = "自定义报警使能")]
     [AutoGenerateColumn(Visible = false, Filterable = true, Sortable = true)]
-    public bool CustomAlarmEnable { get; set; }
+    public bool CustomAlarmEnable { get => customAlarmEnable; set => customAlarmEnable = value; }
 
     /// <summary>
     /// 自定义报警条件约束
     /// </summary>
     [SugarColumn(ColumnDescription = "自定义报警条件约束", IsNullable = true)]
     [AutoGenerateColumn(Visible = false, Filterable = true, Sortable = true)]
-    public string? CustomRestrainExpressions { get; set; }
+    public string CustomRestrainExpressions { get => customRestrainExpressions; set => customRestrainExpressions = value; }
 
     /// <summary>
     /// 自定义文本
     /// </summary>
     [SugarColumn(ColumnDescription = "自定义文本", IsNullable = true)]
     [AutoGenerateColumn(Visible = false, Filterable = true, Sortable = true)]
-    public string? CustomAlarmText { get; set; }
+    public string CustomAlarmText { get => customAlarmText; set => customAlarmText = value; }
 
     /// <summary>
     /// 自定义报警条件
     /// </summary>
     [SugarColumn(ColumnDescription = "自定义报警条件", IsNullable = true)]
     [AutoGenerateColumn(Visible = false, Filterable = true, Sortable = true)]
-    public string? CustomAlarmCode { get; set; }
+    public string CustomAlarmCode { get => customAlarmCode; set => customAlarmCode = value; }
 
     #endregion 报警
 
@@ -383,64 +456,38 @@ public class Variable : BaseDataEntity, IValidatableObject
     /// </summary>
     [SugarColumn(ColumnDescription = "自定义1", Length = 200, IsNullable = true)]
     [AutoGenerateColumn(Visible = false, Filterable = true, Sortable = true)]
-    public string? Remark1 { get; set; }
+    public string Remark1 { get => remark1; set => remark1 = value; }
 
     /// <summary>
     /// 自定义
     /// </summary>
     [SugarColumn(ColumnDescription = "自定义2", Length = 200, IsNullable = true)]
     [AutoGenerateColumn(Visible = false, Filterable = true, Sortable = true)]
-    public string? Remark2 { get; set; }
+    public string Remark2 { get => remark2; set => remark2 = value; }
 
     /// <summary>
     /// 自定义
     /// </summary>
     [SugarColumn(ColumnDescription = "自定义3", Length = 200, IsNullable = true)]
     [AutoGenerateColumn(Visible = false, Filterable = true, Sortable = true)]
-    public string? Remark3 { get; set; }
+    public string Remark3 { get => remark3; set => remark3 = value; }
 
     /// <summary>
     /// 自定义
     /// </summary>
     [SugarColumn(ColumnDescription = "自定义4", Length = 200, IsNullable = true)]
     [AutoGenerateColumn(Visible = false, Filterable = true, Sortable = true)]
-    public string? Remark4 { get; set; }
+    public string Remark4 { get => remark4; set => remark4 = value; }
 
     /// <summary>
     /// 自定义
     /// </summary>
     [SugarColumn(ColumnDescription = "自定义5", Length = 200, IsNullable = true)]
     [AutoGenerateColumn(Visible = false, Filterable = true, Sortable = true)]
-    public string? Remark5 { get; set; }
+    public string Remark5 { get => remark5; set => remark5 = value; }
 
     #endregion 备用字段
 
-    /// <summary>
-    /// 导入验证专用
-    /// </summary>
-    [System.Text.Json.Serialization.JsonIgnore]
-    [Newtonsoft.Json.JsonIgnore]
-    internal bool IsUp;
-
-    /// <summary>
-    /// 导入验证专用
-    /// </summary>
-    [System.Text.Json.Serialization.JsonIgnore]
-    [Newtonsoft.Json.JsonIgnore]
-    internal long Row;
-
-    /// <summary>
-    /// 变量额外属性Json
-    /// </summary>
-    [System.Text.Json.Serialization.JsonIgnore]
-    [Newtonsoft.Json.JsonIgnore]
-    [AdaptIgnore]
-    public ConcurrentDictionary<long, ModelValueValidateForm>? VariablePropertyModels;
-
-    /// <summary>
-    /// 动态变量
-    /// </summary>
-    public bool DynamicVariable;
 
     public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
     {
@@ -448,22 +495,7 @@ public class Variable : BaseDataEntity, IValidatableObject
         {
             yield return new ValidationResult("Both RegisterAddress and OtherMethod cannot be empty or null.", new[] { nameof(RegisterAddress), nameof(OtherMethod) });
         }
-        if (HHAlarmEnable && HHAlarmCode == null)
-        {
-            yield return new ValidationResult("HHAlarmCode cannot be null when HHAlarmEnable is true", new[] { nameof(HHAlarmCode) });
-        }
-        if (HAlarmEnable && HAlarmCode == null)
-        {
-            yield return new ValidationResult("HAlarmCode cannot be null when HAlarmEnable is true", new[] { nameof(HAlarmCode) });
-        }
-        if (LAlarmEnable && LAlarmCode == null)
-        {
-            yield return new ValidationResult("LAlarmCode cannot be null when LAlarmEnable is true", new[] { nameof(LAlarmCode) });
-        }
-        if (LLAlarmEnable && LLAlarmCode == null)
-        {
-            yield return new ValidationResult("LLAlarmCode cannot be null when LLAlarmEnable is true", new[] { nameof(LLAlarmCode) });
-        }
+
 
         if (HHAlarmEnable && HAlarmEnable && HHAlarmCode <= HAlarmCode)
         {

src/Gateway/ThingsGateway.Gateway.Application/Extensions/ParallelExtensions.cs

@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+namespace ThingsGateway.Gateway.Application;
+
+/// <summary>
+/// 扩展
+/// </summary>
+[ThingsGateway.DependencyInjection.SuppressSniffer]
+public static class ParallelExtension
+{
+
+    /// <summary>
+    /// 异步执行指定的操作，并指定最大并行度和取消标志
+    /// </summary>
+    /// <typeparam name="T">集合元素类型</typeparam>
+    /// <param name="source">要操作的集合</param>
+    /// <param name="body">异步执行的操作</param>
+    /// <param name="cancellationToken">取消操作的标志</param>
+    /// <returns>表示异步操作的任务</returns>
+    public static Task ParallelForEachStreamedAsync<T>(this IEnumerable<T> source, Func<T, CancellationToken, ValueTask> body, CancellationToken cancellationToken = default)
+    {
+        return ParallelForEachStreamedAsync(source, body, Environment.ProcessorCount, cancellationToken);
+    }
+
+    public static Task ParallelForEachStreamedAsync<T>(this IEnumerable<T> source, Func<T, CancellationToken, ValueTask> body, int parallelCount, CancellationToken cancellationToken = default)
+    {
+        // 创建并行操作的选项对象，设置最大并行度和取消标志
+        var options = new ParallelOptions();
+        options.CancellationToken = cancellationToken;
+        options.MaxDegreeOfParallelism = parallelCount == 0 ? 1 : parallelCount;
+        // 使用 Parallel.ForEachAsync 异步执行指定的操作，并返回表示异步操作的任务
+        return Parallel.ForEachAsync(source, options, body);
+    }
+}

src/Gateway/ThingsGateway.Gateway.Application/GlobalData/GlobalData.cs

@@ -171,7 +171,7 @@ public static class GlobalData
 
     public static IEnumerable<VariableRuntime> GetEnableVariables()
     {
-        return IdDevices.SelectMany(a => a.Value.VariableRuntimes).Where(a => a.Value.Enable).Select(a => a.Value);
+        return IdDevices.SelectMany(a => a.Value.VariableRuntimes).Where(a => a.Value?.Enable == true).Select(a => a.Value);
     }
 
 

src/Gateway/ThingsGateway.Gateway.Application/Job/LogJob.cs

@@ -33,14 +33,14 @@ public class LogJob : IJob
 
     private static async Task DeleteRpcLog(int daysAgo, CancellationToken stoppingToken)
     {
-        using var db = DbContext.Db.GetConnectionScopeWithAttr<RpcLog>().CopyNew();
+        using var db = DbContext.GetDB<RpcLog>();
         var time = DateTime.Now.AddDays(-daysAgo);
         await db.DeleteableWithAttr<RpcLog>().Where(u => u.LogTime < time).ExecuteCommandAsync(stoppingToken).ConfigureAwait(false); // 删除操作日志
     }
 
     private static async Task DeleteBackendLog(int daysAgo, CancellationToken stoppingToken)
     {
-        using var db = DbContext.Db.GetConnectionScopeWithAttr<BackendLog>().CopyNew();
+        using var db = DbContext.GetDB<BackendLog>();
         var time = DateTime.Now.AddDays(-daysAgo);
         await db.DeleteableWithAttr<BackendLog>().Where(u => u.LogTime < time).ExecuteCommandAsync(stoppingToken).ConfigureAwait(false); // 删除操作日志
     }

src/Gateway/ThingsGateway.Gateway.Application/Locales/en-US.json

@@ -266,6 +266,7 @@
     "PortName": "PortName",
     "RemoteUrl": "RemoteUrl",
     "RtsEnable": "RtsEnable",
+    "StreamAsync": "StreamAsync",
     "SaveChannel": "Add/Modify Channel",
     "SortCode": "SortCode",
     "StopBits": "StopBits",

src/Gateway/ThingsGateway.Gateway.Application/Locales/zh-CN.json

@@ -265,6 +265,7 @@
     "PortName": "COM口",
     "RemoteUrl": "远程url",
     "RtsEnable": "Rts",
+    "StreamAsync": "串口流读写",
     "SaveChannel": "添加/修改通道",
     "SortCode": "排序",
     "StopBits": "停止位",

src/Gateway/ThingsGateway.Gateway.Application/Logging/BackendLogDatabaseLoggingWriter.cs

@@ -65,7 +65,7 @@ public class BackendLogDatabaseLoggingWriter : IDatabaseLoggingWriter
             if (flush)
             {
                 // 如果SqlSugar客户端未初始化，则进行初始化
-                SqlSugarClient ??= DbContext.Db.GetConnectionScopeWithAttr<BackendLog>().CopyNew();
+                SqlSugarClient ??= DbContext.GetDB<BackendLog>();
 
                 // 异步执行入库操作
                 await SqlSugarClient.InsertableWithAttr(_logQueues.ToListWithDequeue()).ExecuteCommandAsync().ConfigureAwait(false);

src/Gateway/ThingsGateway.Gateway.Application/Model/VariableRunTime.cs

@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 using Mapster;
 
 using Newtonsoft.Json.Linq;
@@ -17,131 +15,41 @@ using Newtonsoft.Json.Linq;
 using ThingsGateway.Gateway.Application.Extensions;
 using ThingsGateway.NewLife.Extension;
 using ThingsGateway.NewLife.Json.Extension;
-using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Gateway.Application;
 
 /// <summary>
 /// 变量运行态
 /// </summary>
-public class VariableRuntime : Variable, IVariable, IDisposable
+public partial class VariableRuntime : Variable, IVariable, IDisposable
 {
-    [SugarColumn(ColumnDescription = "排序码", IsNullable = true)]
-    [AutoGenerateColumn(Visible = false, DefaultSort = false, Sortable = true)]
-    [IgnoreExcel]
-    public override int? SortCode { get; set; }
+    private DateTime? prepareEventTime;
+    private EventTypeEnum? eventType;
+
+    private AlarmTypeEnum? alarmType { get; set; }
+
+    private int index;
+    private int sortCode;
+    private DateTime changeTime = DateTime.UnixEpoch.ToLocalTime();
+    private DateTime alarmTime;
+    private DateTime eventTime;
+    private DateTime collectTime = DateTime.UnixEpoch.ToLocalTime();
 
     private bool _isOnline;
     private bool _isOnlineChanged;
-    protected object _value;
-
-    /// <summary>
-    /// 变化时间
-    /// </summary>
-    [AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true, Order = 5)]
-    public DateTime ChangeTime { get; private set; } = DateTime.UnixEpoch.ToLocalTime();
-
-    /// <summary>
-    /// 所在采集设备
-    /// </summary>
-    [Newtonsoft.Json.JsonIgnore]
-    [System.Text.Json.Serialization.JsonIgnore]
-    [AutoGenerateColumn(Ignore = true)]
-    public DeviceRuntime DeviceRuntime { get; set; }
-
-    /// <summary>
-    /// VariableSource
-    /// </summary>
-    [Newtonsoft.Json.JsonIgnore]
-    [System.Text.Json.Serialization.JsonIgnore]
-    [AdaptIgnore]
-    [AutoGenerateColumn(Ignore = true)]
-    public IVariableSource VariableSource { get; set; }
-
-    /// <summary>
-    /// VariableMethod
-    /// </summary>
-    [Newtonsoft.Json.JsonIgnore]
-    [System.Text.Json.Serialization.JsonIgnore]
-    [AdaptIgnore]
-    [AutoGenerateColumn(Ignore = true)]
-    public VariableMethod VariableMethod { get; set; }
-
-    /// <summary>
-    /// 采集时间
-    /// </summary>
-    [AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true, Order = 5)]
-    public DateTime CollectTime { get; private set; } = DateTime.UnixEpoch.ToLocalTime();
-
-    /// <summary>
-    /// 设备名称
-    /// </summary>
-    [AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true, Order = 4)]
-    public string DeviceName => DeviceRuntime?.Name;
-
-    /// <summary>
-    /// 是否在线
-    /// </summary>
-    [AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true, Order = 5)]
-    public bool IsOnline
-    {
-        get
-        {
-            return _isOnline;
-        }
-        private set
-        {
-            if (IsOnline != value)
-            {
-                _isOnlineChanged = true;
-            }
-            else
-            {
-                _isOnlineChanged = false;
-            }
-            _isOnline = value;
-        }
-    }
 
+    private string alarmLimit;
+    private string alarmText;
+    private string alarmCode;
     private string _lastErrorMessage;
-
-    /// <summary>
-    /// <inheritdoc/>
-    /// </summary>
-    [AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true, Order = 5)]
-    public string LastErrorMessage
-    {
-        get
-        {
-            if (_isOnline == false)
-                return _lastErrorMessage ?? VariableSource?.LastErrorMessage ?? VariableMethod?.LastErrorMessage;
-            else
-                return null;
-        }
-    }
-
-    /// <summary>
-    /// 上次值
-    /// </summary>
-    [AutoGenerateColumn(Visible = false, Order = 6)]
-    public object LastSetValue { get; internal set; }
-
-    /// <summary>
-    /// 原始值
-    /// </summary>
-    [AutoGenerateColumn(Visible = false, Order = 6)]
-    public object RawValue { get; internal set; }
-
-    /// <summary>
-    /// 实时值
-    /// </summary>
-    [AutoGenerateColumn(Visible = true, Order = 6)]
-    public object Value { get => _value; set => _value = value; }
-    /// <summary>
-    /// 实时值
-    /// </summary>
-    [AutoGenerateColumn(Visible = true, Order = 6)]
-    public string RuntimeType => Value?.GetType()?.ToString();
+    private string recoveryCode;
+    private object _value;
+    private object lastSetValue;
+    private object rawValue;
+    private DeviceRuntime deviceRuntime;
+    private IVariableSource variableSource;
+    private VariableMethod variableMethod;
+    private IThingsGatewayBitConverter thingsGatewayBitConverter;
 
     /// <summary>
     /// 设置变量值与时间/质量戳
@@ -252,92 +160,6 @@ public class VariableRuntime : Variable, IVariable, IDisposable
     }
 
 
-    #region LoadSourceRead
-
-    /// <summary>
-    /// 这个参数值由自动打包方法写入<see cref="IDevice.LoadSourceRead{T}(IEnumerable{IVariable}, int, string)"/>
-    /// </summary>
-    [AutoGenerateColumn(Visible = false)]
-    public int Index { get; set; }
-
-    /// <summary>
-    /// 这个参数值由自动打包方法写入<see cref="IDevice.LoadSourceRead{T}(IEnumerable{IVariable}, int, string)"/>
-    /// </summary>
-    [Newtonsoft.Json.JsonIgnore]
-    [System.Text.Json.Serialization.JsonIgnore]
-    [AutoGenerateColumn(Ignore = true)]
-    public IThingsGatewayBitConverter ThingsGatewayBitConverter { get; set; }
-
-    #endregion LoadSourceRead
-
-    #region 报警
-
-    /// <summary>
-    /// 报警值
-    /// </summary>
-    [AutoGenerateColumn(Visible = false)]
-    public string AlarmCode { get; set; }
-    /// <summary>
-    /// 恢复值
-    /// </summary>
-    [AutoGenerateColumn(Visible = false)]
-    public string RecoveryCode { get; set; }
-
-    /// <summary>
-    /// 报警使能
-    /// </summary>
-    [AutoGenerateColumn(Visible = false, Filterable = true, Sortable = true)]
-    public bool AlarmEnable
-    {
-        get
-        {
-            return LAlarmEnable || LLAlarmEnable || HAlarmEnable || HHAlarmEnable || BoolOpenAlarmEnable || BoolCloseAlarmEnable || CustomAlarmEnable;
-        }
-    }
-
-    /// <summary>
-    /// 报警限值
-    /// </summary>
-    [AutoGenerateColumn(Visible = false)]
-    public string AlarmLimit { get; set; }
-
-    /// <summary>
-    /// 报警文本
-    /// </summary>
-    [AutoGenerateColumn(Visible = false)]
-    public string AlarmText { get; set; }
-
-    /// <summary>
-    /// 报警时间
-    /// </summary>
-    [AutoGenerateColumn(Visible = false)]
-    public DateTime AlarmTime { get; set; }
-
-    /// <summary>
-    /// 报警类型
-    /// </summary>
-    [AutoGenerateColumn(Visible = false)]
-    public AlarmTypeEnum? AlarmType { get; set; }
-
-    /// <summary>
-    /// 事件时间
-    /// </summary>
-    [AutoGenerateColumn(Visible = false)]
-    public DateTime EventTime { get; set; }
-    /// <summary>
-    /// 事件时间
-    /// </summary>
-    [AutoGenerateColumn(Ignore = true)]
-    internal DateTime? PrepareEventTime { get; set; }
-
-    /// <summary>
-    /// 事件类型
-    /// </summary>
-    [AutoGenerateColumn(Visible = false)]
-    public EventTypeEnum? EventType { get; set; }
-
-    #endregion 报警
-
     public void Init(DeviceRuntime deviceRuntime)
     {
 

src/Gateway/ThingsGateway.Gateway.Application/Model/VariableRunTime.property.cs

@@ -0,0 +1,243 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+using BootstrapBlazor.Components;
+
+using Mapster;
+
+using ThingsGateway.SqlSugar;
+
+namespace ThingsGateway.Gateway.Application;
+
+/// <summary>
+/// 变量运行态
+/// </summary>
+public partial class VariableRuntime : Variable, IVariable, IDisposable
+{
+
+
+
+
+    #region 属性
+    /// <summary>
+    /// 事件类型
+    /// </summary>
+    [AutoGenerateColumn(Visible = false)]
+    public EventTypeEnum? EventType { get => eventType; set => eventType = value; }
+
+    /// <summary>
+    /// 报警类型
+    /// </summary>
+    [AutoGenerateColumn(Visible = false)]
+    public AlarmTypeEnum? AlarmType { get => alarmType; set => alarmType = value; }
+
+
+    /// <summary>
+    /// 报警值
+    /// </summary>
+    [AutoGenerateColumn(Visible = false)]
+    public string AlarmCode { get => alarmCode; set => alarmCode = value; }
+
+
+    /// <summary>
+    /// 恢复值
+    /// </summary>
+    [AutoGenerateColumn(Visible = false)]
+    public string RecoveryCode { get => recoveryCode; set => recoveryCode = value; }
+
+    /// <summary>
+    /// 这个参数值由自动打包方法写入<see cref="IDevice.LoadSourceRead{T}(IEnumerable{IVariable}, int, string)"/>
+    /// </summary>
+    [AutoGenerateColumn(Visible = false)]
+    public int Index { get => index; set => index = value; }
+    /// <summary>
+    /// 事件时间
+    /// </summary>
+    [AutoGenerateColumn(Ignore = true)]
+    internal DateTime? PrepareEventTime { get => prepareEventTime; set => prepareEventTime = value; }
+
+    /// <summary>
+    /// 变化时间
+    /// </summary>
+    [AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true, Order = 5)]
+    public DateTime ChangeTime { get => changeTime; set => changeTime = value; }
+
+    /// <summary>
+    /// 报警时间
+    /// </summary>
+    [AutoGenerateColumn(Visible = false)]
+    public DateTime AlarmTime { get => alarmTime; set => alarmTime = value; }
+
+
+    /// <summary>
+    /// 事件时间
+    /// </summary>
+    [AutoGenerateColumn(Visible = false)]
+    public DateTime EventTime { get => eventTime; set => eventTime = value; }
+
+
+    /// <summary>
+    /// 采集时间
+    /// </summary>
+    [AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true, Order = 5)]
+    public DateTime CollectTime { get => collectTime; set => collectTime = value; }
+
+
+    [SugarColumn(ColumnDescription = "排序码", IsNullable = true)]
+    [AutoGenerateColumn(Visible = false, DefaultSort = false, Sortable = true)]
+    [IgnoreExcel]
+    public override int SortCode { get => sortCode; set => sortCode = value; }
+
+
+    /// <summary>
+    /// 上次值
+    /// </summary>
+    [AutoGenerateColumn(Visible = false, Order = 6)]
+    public object LastSetValue { get => lastSetValue; set => lastSetValue = value; }
+
+    /// <summary>
+    /// 原始值
+    /// </summary>
+    [AutoGenerateColumn(Visible = false, Order = 6)]
+    public object RawValue { get => rawValue; set => rawValue = value; }
+
+
+
+    /// <summary>
+    /// 所在采集设备
+    /// </summary>
+    [Newtonsoft.Json.JsonIgnore]
+    [System.Text.Json.Serialization.JsonIgnore]
+    [AutoGenerateColumn(Ignore = true)]
+    public DeviceRuntime DeviceRuntime { get => deviceRuntime; set => deviceRuntime = value; }
+
+    /// <summary>
+    /// VariableSource
+    /// </summary>
+    [Newtonsoft.Json.JsonIgnore]
+    [System.Text.Json.Serialization.JsonIgnore]
+    [AdaptIgnore]
+    [AutoGenerateColumn(Ignore = true)]
+    public IVariableSource VariableSource { get => variableSource; set => variableSource = value; }
+
+    /// <summary>
+    /// VariableMethod
+    /// </summary>
+    [Newtonsoft.Json.JsonIgnore]
+    [System.Text.Json.Serialization.JsonIgnore]
+    [AdaptIgnore]
+    [AutoGenerateColumn(Ignore = true)]
+    public VariableMethod VariableMethod { get => variableMethod; set => variableMethod = value; }
+
+
+
+    /// <summary>
+    /// 这个参数值由自动打包方法写入<see cref="IDevice.LoadSourceRead{T}(IEnumerable{IVariable}, int, string)"/>
+    /// </summary>
+    [Newtonsoft.Json.JsonIgnore]
+    [System.Text.Json.Serialization.JsonIgnore]
+    [AutoGenerateColumn(Ignore = true)]
+    public IThingsGatewayBitConverter ThingsGatewayBitConverter { get => thingsGatewayBitConverter; set => thingsGatewayBitConverter = value; }
+
+
+
+
+    /// <summary>
+    /// 设备名称
+    /// </summary>
+    [AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true, Order = 4)]
+    public string DeviceName => DeviceRuntime?.Name;
+
+    /// <summary>
+    /// 是否在线
+    /// </summary>
+    [AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true, Order = 5)]
+    public bool IsOnline
+    {
+        get
+        {
+            return _isOnline;
+        }
+        private set
+        {
+            if (IsOnline != value)
+            {
+                _isOnlineChanged = true;
+            }
+            else
+            {
+                _isOnlineChanged = false;
+            }
+            _isOnline = value;
+        }
+    }
+
+
+    /// <summary>
+    /// <inheritdoc/>
+    /// </summary>
+    [AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true, Order = 5)]
+    public string LastErrorMessage
+    {
+        get
+        {
+            if (_isOnline == false)
+                return _lastErrorMessage ?? VariableSource?.LastErrorMessage ?? VariableMethod?.LastErrorMessage;
+            else
+                return null;
+        }
+    }
+
+
+    /// <summary>
+    /// 实时值
+    /// </summary>
+    [AutoGenerateColumn(Visible = true, Order = 6)]
+    public string RuntimeType => Value?.GetType()?.ToString();
+
+    /// <summary>
+    /// 实时值
+    /// </summary>
+    [AutoGenerateColumn(Visible = true, Order = 6)]
+    public object Value { get => _value; set => _value = value; }
+
+
+
+
+
+
+    /// <summary>
+    /// 报警使能
+    /// </summary>
+    [AutoGenerateColumn(Visible = false, Filterable = true, Sortable = true)]
+    public bool AlarmEnable
+    {
+        get
+        {
+            return LAlarmEnable || LLAlarmEnable || HAlarmEnable || HHAlarmEnable || BoolOpenAlarmEnable || BoolCloseAlarmEnable || CustomAlarmEnable;
+        }
+    }
+
+    /// <summary>
+    /// 报警限值
+    /// </summary>
+    [AutoGenerateColumn(Visible = false)]
+    public string AlarmLimit { get => alarmLimit; set => alarmLimit = value; }
+
+    /// <summary>
+    /// 报警文本
+    /// </summary>
+    [AutoGenerateColumn(Visible = false)]
+    public string AlarmText { get => alarmText; set => alarmText = value; }
+
+    #endregion
+
+}
+

src/Gateway/ThingsGateway.Gateway.Application/Services/Channel/ChannelRuntimeService.cs

@@ -93,15 +93,15 @@ public class ChannelRuntimeService : IChannelRuntimeService
         {
             await WaitLock.WaitAsync(cancellationToken).ConfigureAwait(false);
 
-            ids = ids.ToHashSet();
-            var result = await GlobalData.ChannelService.DeleteChannelAsync(ids).ConfigureAwait(false);
+            var array = ids.ToArray();
+            var result = await GlobalData.ChannelService.DeleteChannelAsync(array).ConfigureAwait(false);
 
-            var changedDriver = RuntimeServiceHelper.DeleteChannelRuntime(ids);
+            var changedDriver = RuntimeServiceHelper.DeleteChannelRuntime(array);
 
             //根据条件重启通道线程
             if (restart)
             {
-                await GlobalData.ChannelThreadManage.RemoveChannelAsync(ids).ConfigureAwait(false);
+                await GlobalData.ChannelThreadManage.RemoveChannelAsync(array).ConfigureAwait(false);
 
                 await RuntimeServiceHelper.ChangedDriverAsync(changedDriver, _logger, cancellationToken).ConfigureAwait(false);
             }

src/Gateway/ThingsGateway.Gateway.Application/Services/Device/DeviceRuntimeService.cs

@@ -101,12 +101,12 @@ public class DeviceRuntimeService : IDeviceRuntimeService
             await WaitLock.WaitAsync(cancellationToken).ConfigureAwait(false);
 
 
-            ids = ids.ToHashSet();
+            var devids = ids.ToHashSet();
 
-            var result = await GlobalData.DeviceService.DeleteDeviceAsync(ids).ConfigureAwait(false);
+            var result = await GlobalData.DeviceService.DeleteDeviceAsync(devids).ConfigureAwait(false);
 
             //根据条件重启通道线程
-            var deviceRuntimes = GlobalData.IdDevices.Where(a => ids.Contains(a.Key)).Select(a => a.Value).ToList();
+            var deviceRuntimes = GlobalData.IdDevices.Where(a => devids.Contains(a.Key)).Select(a => a.Value).ToList();
 
             ConcurrentHashSet<IDriver> changedDriver = RuntimeServiceHelper.DeleteDeviceRuntime(deviceRuntimes);
 

src/Gateway/ThingsGateway.Gateway.Application/Services/GatewayMonitor/AlarmManage/AlarmHostedService.cs

@@ -396,50 +396,60 @@ internal sealed class AlarmHostedService : BackgroundService, IAlarmHostedServic
     /// <param name="cancellation">取消任务的 CancellationToken</param>
     private async Task DoWork(CancellationToken cancellation)
     {
-        try
+        while (!cancellation.IsCancellationRequested)
         {
-            if (!GlobalData.StartBusinessChannelEnable)
-                return;
 
-            //Stopwatch stopwatch = Stopwatch.StartNew();
-            // 遍历设备变量列表
-
-            GlobalData.AlarmEnableIdVariables.ParallelForEach((kv, state, index) =>
+            try
             {
+                if (!GlobalData.StartBusinessChannelEnable)
+                    return;
+
+                //Stopwatch stopwatch = Stopwatch.StartNew();
+                // 遍历设备变量列表
+
+                if (!GlobalData.AlarmEnableIdVariables.IsEmpty)
                 {
-                    // 如果取消请求已经被触发，则结束任务
-                    if (cancellation.IsCancellationRequested)
-                        return;
+                    var list = GlobalData.AlarmEnableIdVariables.Select(a => a.Value).ToArray();
+                    list.ParallelForEach((item, state, index) =>
+                {
+                    {
+                        // 如果取消请求已经被触发，则结束任务
+                        if (cancellation.IsCancellationRequested)
+                            return;
 
-                    var item = kv.Value;
+                        // 如果该变量的报警功能未启用，则跳过该变量
+                        if (!item.AlarmEnable)
+                            return;
 
-                    // 如果该变量的报警功能未启用，则跳过该变量
-                    if (!item.AlarmEnable)
-                        return;
+                        // 如果该变量离线，则跳过该变量
+                        if (!item.IsOnline)
+                            return;
 
-                    // 如果该变量离线，则跳过该变量
-                    if (!item.IsOnline)
-                        return;
-
-                    // 对该变量进行报警分析
-                    AlarmAnalysis(item);
+                        // 对该变量进行报警分析
+                        AlarmAnalysis(item);
 
 
+                    }
+                });
+                }
+                else
+                {
+                    await Task.Delay(5000, cancellation).ConfigureAwait(false);
                 }
-            });
 
 
-            //stopwatch.Stop();
-            //_logger.LogInformation("报警分析耗时：" + stopwatch.ElapsedMilliseconds + "ms");
-        }
-        catch (Exception ex)
-        {
-            _logger.LogWarning(ex, "Alarm analysis fail");
-        }
-        finally
-        {
-            // 延迟一段时间，避免过于频繁地执行任务
-            await Task.Delay(50, cancellation).ConfigureAwait(false);
+                //stopwatch.Stop();
+                //_logger.LogInformation("报警分析耗时：" + stopwatch.ElapsedMilliseconds + "ms");
+            }
+            catch (Exception ex)
+            {
+                _logger.LogWarning(ex, "Alarm analysis fail");
+            }
+            finally
+            {
+                // 延迟一段时间，避免过于频繁地执行任务
+                await Task.Delay(50, cancellation).ConfigureAwait(false);
+            }
         }
     }
 
@@ -447,10 +457,9 @@ internal sealed class AlarmHostedService : BackgroundService, IAlarmHostedServic
     protected override async Task ExecuteAsync(CancellationToken stoppingToken)
     {
         _logger.LogInformation(AppResource.RealAlarmTaskStart);
-        while (!stoppingToken.IsCancellationRequested)
-        {
-            await DoWork(stoppingToken).ConfigureAwait(false);
-        }
+
+        await DoWork(stoppingToken).ConfigureAwait(false);
+
     }
 
 }

src/Gateway/ThingsGateway.Gateway.Application/Services/GatewayMonitor/ChannelManage/ChannelThreadManage.cs

@@ -34,7 +34,7 @@ internal sealed class ChannelThreadManage : IChannelThreadManage
     /// 移除指定通道
     /// </summary>
     /// <param name="channelIds">要移除的通道ID</param>
-    private async Task PrivateRemoveChannelsAsync(IEnumerable<long> channelIds)
+    private async Task PrivateRemoveChannelsAsync(IList<long> channelIds)
     {
 
         await channelIds.ParallelForEachAsync(async (channelId, token) =>
@@ -64,7 +64,7 @@ internal sealed class ChannelThreadManage : IChannelThreadManage
         {
             await NewChannelLock.WaitAsync().ConfigureAwait(false);
 
-            await PrivateRemoveChannelsAsync(Enumerable.Repeat(channelId, 1)).ConfigureAwait(false);
+            await PrivateRemoveChannelsAsync([channelId]).ConfigureAwait(false);
         }
         finally
         {
@@ -77,7 +77,7 @@ internal sealed class ChannelThreadManage : IChannelThreadManage
     /// 移除指定通道
     /// </summary>
     /// <param name="channelIds">要移除的通道ID</param>
-    public async Task RemoveChannelAsync(IEnumerable<long> channelIds)
+    public async Task RemoveChannelAsync(IList<long> channelIds)
     {
         try
         {
@@ -94,9 +94,9 @@ internal sealed class ChannelThreadManage : IChannelThreadManage
 
 
 
-    private async Task PrivateRestartChannelAsync(IEnumerable<ChannelRuntime> channelRuntimes)
+    private async Task PrivateRestartChannelAsync(IList<ChannelRuntime> channelRuntimes)
     {
-        await PrivateRemoveChannelsAsync(channelRuntimes.Select(a => a.Id)).ConfigureAwait(false);
+        await PrivateRemoveChannelsAsync(channelRuntimes.Select(a => a.Id).ToArray()).ConfigureAwait(false);
 
         await channelRuntimes.ParallelForEachAsync(async (channelRuntime, token) =>
         {
@@ -128,7 +128,7 @@ internal sealed class ChannelThreadManage : IChannelThreadManage
 
                 deviceThreadManage.ChannelThreadManage = this;
 
-                await deviceThreadManage.RestartDeviceAsync(channelRuntime.DeviceRuntimes.Select(a => a.Value), false).ConfigureAwait(false);
+                await deviceThreadManage.RestartDeviceAsync(channelRuntime.DeviceRuntimes.Select(a => a.Value).ToList(), false).ConfigureAwait(false);
 
             }
             catch (Exception ex)
@@ -149,7 +149,7 @@ internal sealed class ChannelThreadManage : IChannelThreadManage
         try
         {
             await NewChannelLock.WaitAsync().ConfigureAwait(false);
-            await PrivateRestartChannelAsync(Enumerable.Repeat(channelRuntime, 1)).ConfigureAwait(false);
+            await PrivateRestartChannelAsync([channelRuntime]).ConfigureAwait(false);
         }
         finally
         {
@@ -160,7 +160,7 @@ internal sealed class ChannelThreadManage : IChannelThreadManage
     /// <summary>
     /// 向当前通道添加设备
     /// </summary>
-    public async Task RestartChannelAsync(IEnumerable<ChannelRuntime> channelRuntimes)
+    public async Task RestartChannelAsync(IList<ChannelRuntime> channelRuntimes)
     {
 
         try

src/Gateway/ThingsGateway.Gateway.Application/Services/GatewayMonitor/ChannelManage/IChannelThreadManage.cs

@@ -17,8 +17,8 @@ public interface IChannelThreadManage
     ConcurrentDictionary<long, IDeviceThreadManage> DeviceThreadManages { get; }
 
     Task RestartChannelAsync(ChannelRuntime channelRuntime);
-    Task RestartChannelAsync(IEnumerable<ChannelRuntime> channelRuntimes);
+    Task RestartChannelAsync(IList<ChannelRuntime> channelRuntimes);
 
-    Task RemoveChannelAsync(IEnumerable<long> channelIds);
+    Task RemoveChannelAsync(IList<long> channelIds);
     Task RemoveChannelAsync(long channelId);
 }

src/Gateway/ThingsGateway.Gateway.Application/Services/GatewayMonitor/DeviceManage/DeviceThreadManage.cs

@@ -39,7 +39,7 @@ internal sealed class DeviceThreadManage : IAsyncDisposable, IDeviceThreadManage
 
     static DeviceThreadManage()
     {
-        Task.Factory.StartNew(async () => await SetCycleInterval().ConfigureAwait(false), TaskCreationOptions.LongRunning);
+        Task.Factory.StartNew(SetCycleInterval, TaskCreationOptions.LongRunning);
     }
 
     private static async Task SetCycleInterval()
@@ -235,7 +235,7 @@ internal sealed class DeviceThreadManage : IAsyncDisposable, IDeviceThreadManage
         try
         {
             await NewDeviceLock.WaitAsync().ConfigureAwait(false);
-            await PrivateRestartDeviceAsync(Enumerable.Repeat(deviceRuntime, 1), deleteCache).ConfigureAwait(false);
+            await PrivateRestartDeviceAsync([deviceRuntime], deleteCache).ConfigureAwait(false);
         }
         finally
         {
@@ -246,7 +246,7 @@ internal sealed class DeviceThreadManage : IAsyncDisposable, IDeviceThreadManage
     /// <summary>
     /// 向当前通道添加设备
     /// </summary>
-    public async Task RestartDeviceAsync(IEnumerable<DeviceRuntime> deviceRuntimes, bool deleteCache)
+    public async Task RestartDeviceAsync(IList<DeviceRuntime> deviceRuntimes, bool deleteCache)
     {
 
         try
@@ -260,12 +260,12 @@ internal sealed class DeviceThreadManage : IAsyncDisposable, IDeviceThreadManage
         }
     }
 
-    private async Task PrivateRestartDeviceAsync(IEnumerable<DeviceRuntime> deviceRuntimes, bool deleteCache)
+    private async Task PrivateRestartDeviceAsync(IList<DeviceRuntime> deviceRuntimes, bool deleteCache)
     {
         try
         {
 
-            await PrivateRemoveDevicesAsync(deviceRuntimes.Select(a => a.Id)).ConfigureAwait(false);
+            await PrivateRemoveDevicesAsync(deviceRuntimes.Select(a => a.Id).ToArray()).ConfigureAwait(false);
 
             if (Disposed)
             {
@@ -307,7 +307,7 @@ internal sealed class DeviceThreadManage : IAsyncDisposable, IDeviceThreadManage
                         }
                         else
                         {
-                            await PrivateRemoveDevicesAsync(Enumerable.Repeat(redundantDeviceRuntime.Id, 1)).ConfigureAwait(false);
+                            await PrivateRemoveDevicesAsync([redundantDeviceRuntime.Id]).ConfigureAwait(false);
                         }
                         redundantDeviceThreadManage.LogMessage?.LogInformation($"The device {redundantDeviceRuntime.Name} is standby and no communication tasks are created");
 
@@ -385,14 +385,20 @@ internal sealed class DeviceThreadManage : IAsyncDisposable, IDeviceThreadManage
                     }
                 }
 
-                // 初始化业务线程
-                var driverTask = new DoTask(t => DoWork(driver, t), driver.LogMessage, null);
-                DriverTasks.TryAdd(driver.DeviceId, driverTask);
-
                 token.Register(driver.Stop);
 
-                driverTask.Start(token);
 
+                if (driver.IsInitSuccess)
+                {
+
+                    // 初始化业务线程
+                    var driverTask = new DoTask(DoWork, driver.LogMessage, driver);
+                    DriverTasks.TryAdd(driver.DeviceId, driverTask);
+
+
+                    driverTask.Start(token);
+
+                }
 
             }).ConfigureAwait(false);
 
@@ -423,7 +429,7 @@ internal sealed class DeviceThreadManage : IAsyncDisposable, IDeviceThreadManage
         {
             await NewDeviceLock.WaitAsync().ConfigureAwait(false);
 
-            await PrivateRemoveDevicesAsync(Enumerable.Repeat(deviceId, 1)).ConfigureAwait(false);
+            await PrivateRemoveDevicesAsync([deviceId]).ConfigureAwait(false);
         }
         finally
         {
@@ -436,7 +442,7 @@ internal sealed class DeviceThreadManage : IAsyncDisposable, IDeviceThreadManage
     /// 移除指定设备
     /// </summary>
     /// <param name="deviceIds">要移除的设备ID</param>
-    public async Task RemoveDeviceAsync(IEnumerable<long> deviceIds)
+    public async Task RemoveDeviceAsync(IList<long> deviceIds)
     {
         try
         {
@@ -455,7 +461,7 @@ internal sealed class DeviceThreadManage : IAsyncDisposable, IDeviceThreadManage
     /// 移除指定设备
     /// </summary>
     /// <param name="deviceIds">要移除的设备ID</param>
-    private async Task PrivateRemoveDevicesAsync(IEnumerable<long> deviceIds)
+    private async Task PrivateRemoveDevicesAsync(IList<long> deviceIds)
     {
         try
         {
@@ -463,12 +469,12 @@ internal sealed class DeviceThreadManage : IAsyncDisposable, IDeviceThreadManage
             await deviceIds.ParallelForEachAsync(async (deviceId, cancellationToken) =>
             {
                 // 查找具有指定设备ID的驱动程序对象
-                if (!Drivers.TryRemove(deviceId, out var driver)) return;
-                if (!DriverTasks.TryRemove(deviceId, out var task)) return;
-
-                if (IsCollectChannel == true)
+                if (Drivers.TryRemove(deviceId, out var driver))
                 {
-                    saveVariableRuntimes.AddRange(driver.IdVariableRuntimes.Where(a => a.Value.SaveValue && !a.Value.DynamicVariable).Select(a => a.Value));
+                    if (IsCollectChannel == true)
+                    {
+                        saveVariableRuntimes.AddRange(driver.IdVariableRuntimes.Where(a => a.Value.SaveValue && !a.Value.DynamicVariable).Select(a => a.Value));
+                    }
                 }
 
                 // 取消驱动程序的操作
@@ -480,7 +486,12 @@ internal sealed class DeviceThreadManage : IAsyncDisposable, IDeviceThreadManage
                         token.Dispose();
                     }
                 }
-                await task.StopAsync().ConfigureAwait(false);
+
+                if (DriverTasks.TryRemove(deviceId, out var task))
+                {
+                    await task.StopAsync().ConfigureAwait(false);
+                }
+
             }).ConfigureAwait(false);
 
 
@@ -532,16 +543,16 @@ internal sealed class DeviceThreadManage : IAsyncDisposable, IDeviceThreadManage
         return driver;
     }
 
-
-    private async ValueTask DoWork(DriverBase driver, CancellationToken token)
+    private static async Task DoWork(object? state, CancellationToken token)
     {
         try
         {
+            if (state is not DriverBase driver) return;
             // 只有当驱动成功初始化后才执行操作
             if (driver.IsInitSuccess)
             {
                 if (!driver.IsStarted)
-                    await driver.StartAsync(token).ConfigureAwait(false); // 调用驱动的启动前异步方法，如果已经执行，会直接返回
+                    await driver.StartAsync(token).ConfigureAwait(false);
 
                 var result = await driver.ExecuteAsync(token).ConfigureAwait(false); // 执行驱动的异步执行操作
 
@@ -549,7 +560,7 @@ internal sealed class DeviceThreadManage : IAsyncDisposable, IDeviceThreadManage
                 if (result == ThreadRunReturnTypeEnum.None)
                 {
                     // 如果驱动处于离线状态且为采集驱动，则根据配置的间隔时间进行延迟
-                    if (driver.CurrentDevice.DeviceStatus == DeviceStatusEnum.OffLine && IsCollectChannel == true)
+                    if (driver.CurrentDevice.DeviceStatus == DeviceStatusEnum.OffLine && driver.IsCollectDevice == true)
                     {
                         var collectBase = (CollectBase)driver;
                         if (collectBase.CollectProperties.ReIntervalTime > 0)
@@ -643,7 +654,8 @@ internal sealed class DeviceThreadManage : IAsyncDisposable, IDeviceThreadManage
     {
         //传入变量
         //newDeviceRuntime.VariableRuntimes.ParallelForEach(a => a.Value.SafeDispose());
-        deviceRuntime.VariableRuntimes.ParallelForEach(a => a.Value.Init(newDeviceRuntime));
+        var list = deviceRuntime.VariableRuntimes.Select(a => a.Value).ToArray();
+        list.ParallelForEach(a => a.Init(newDeviceRuntime));
         GlobalData.VariableRuntimeDispatchService.Dispatch(null);
     }
 
@@ -729,7 +741,7 @@ internal sealed class DeviceThreadManage : IAsyncDisposable, IDeviceThreadManage
             channelRuntime.DeviceThreadManage.LogMessage?.LogInformation($"Device {newDeviceRuntime.Name} switched to primary channel");
 
             //需要重启业务线程
-            var businessDeviceRuntimes = GlobalData.IdDevices.Where(a => a.Value.Driver is BusinessBase).Where(a => ((BusinessBase)a.Value.Driver).CollectDevices.ContainsKey(a.Key) == true).Select(a => a.Value);
+            var businessDeviceRuntimes = GlobalData.IdDevices.Where(a => a.Value.Driver is BusinessBase).Where(a => ((BusinessBase)a.Value.Driver).CollectDevices.ContainsKey(a.Key) == true).Select(a => a.Value).ToArray();
             await businessDeviceRuntimes.ParallelForEachAsync(async (businessDeviceRuntime, token) =>
               {
                   if (businessDeviceRuntime.Driver != null)
@@ -886,7 +898,7 @@ internal sealed class DeviceThreadManage : IAsyncDisposable, IDeviceThreadManage
             GlobalData.DeviceStatusChangeEvent -= GlobalData_DeviceStatusChangeEvent;
             await NewDeviceLock.WaitAsync().ConfigureAwait(false);
             _logger?.TryDispose();
-            await PrivateRemoveDevicesAsync(Drivers.Keys).ConfigureAwait(false);
+            await PrivateRemoveDevicesAsync(Drivers.Select(a => a.Key).ToArray()).ConfigureAwait(false);
             if (Channel?.Collects.Count == 0)
                 Channel?.SafeDispose();
 

src/Gateway/ThingsGateway.Gateway.Application/Services/GatewayMonitor/DeviceManage/IDeviceThreadManage.cs

@@ -24,9 +24,9 @@ public interface IDeviceThreadManage : IAsyncDisposable
 
     Task SetLogAsync(LogLevel? logLevel = null, bool upDataBase = true);
     Task RestartDeviceAsync(DeviceRuntime deviceRuntime, bool deleteCache);
-    Task RestartDeviceAsync(IEnumerable<DeviceRuntime> deviceRuntimes, bool deleteCache);
+    Task RestartDeviceAsync(IList<DeviceRuntime> deviceRuntimes, bool deleteCache);
 
-    Task RemoveDeviceAsync(IEnumerable<long> deviceIds);
+    Task RemoveDeviceAsync(IList<long> deviceIds);
     Task RemoveDeviceAsync(long deviceId);
     Task DeviceRedundantThreadAsync(long deviceId, CancellationToken cancellationToken);
 }

src/Gateway/ThingsGateway.Gateway.Application/Services/GatewayMonitor/GatewayMonitorHostedService.cs

@@ -55,7 +55,7 @@ internal sealed class GatewayMonitorHostedService : BackgroundService, IGatewayM
                     {
                         item.Init(channelRuntime);
 
-                        var varRuntimes = variableRuntimes.Where(x => x.DeviceId == item.Id);
+                        var varRuntimes = variableRuntimes.Where(x => x.DeviceId == item.Id).ToArray();
 
                         varRuntimes.ParallelForEach(varItem =>
                         {

src/Gateway/ThingsGateway.Gateway.Application/Services/Management/Management/RedundancyHostedService.cs

@@ -134,10 +134,7 @@ internal sealed class RedundancyHostedService : BackgroundService, IRedundancyHo
     /// <summary>
     /// 主站
     /// </summary>
-    /// <param name="tcpDmtpService">服务</param>
-    /// <param name="syncInterval">同步间隔</param>
-    /// <param name="stoppingToken">取消任务的 CancellationToken</param>
-    private async ValueTask DoMasterWork(TcpDmtpService tcpDmtpService, int syncInterval, CancellationToken stoppingToken)
+    private async Task DoMasterWork(object? state, CancellationToken stoppingToken)
     {
         // 延迟一段时间，避免过于频繁地执行任务
         await Task.Delay(500, stoppingToken).ConfigureAwait(false);
@@ -154,7 +151,7 @@ internal sealed class RedundancyHostedService : BackgroundService, IRedundancyHo
 
             try
             {
-                if (tcpDmtpService.Clients.Count != 0)
+                if (TcpDmtpService.Clients.Count != 0)
                 {
                     online = true;
                 }
@@ -163,7 +160,7 @@ internal sealed class RedundancyHostedService : BackgroundService, IRedundancyHo
                 {
                     var deviceRunTimes = GlobalData.ReadOnlyIdDevices.Where(a => a.Value.IsCollect == true).Select(a => a.Value).Adapt<List<DeviceDataWithValue>>();
 
-                    foreach (var item in tcpDmtpService.Clients)
+                    foreach (var item in TcpDmtpService.Clients)
                     {
                         // 将 GlobalData.CollectDevices 和 GlobalData.Variables 同步到从站
                         await item.GetDmtpRpcActor().InvokeAsync(
@@ -178,7 +175,7 @@ internal sealed class RedundancyHostedService : BackgroundService, IRedundancyHo
                 // 输出警告日志，指示同步数据到从站时发生错误
                 LogMessage?.LogWarning(ex, "Synchronize data to standby site error");
             }
-            await Task.Delay(syncInterval, stoppingToken).ConfigureAwait(false);
+            await Task.Delay(RedundancyOptions.SyncInterval, stoppingToken).ConfigureAwait(false);
         }
         catch (OperationCanceledException)
         {
@@ -195,10 +192,7 @@ internal sealed class RedundancyHostedService : BackgroundService, IRedundancyHo
     /// <summary>
     /// 从站
     /// </summary>
-    /// <param name="tcpDmtpClient">服务</param>
-    /// <param name="redundancy">冗余配置</param>
-    /// <param name="stoppingToken">取消任务的 CancellationToken</param>
-    private async ValueTask DoSlaveWork(TcpDmtpClient tcpDmtpClient, RedundancyOptions redundancy, CancellationToken stoppingToken)
+    private async Task DoSlaveWork(object? state, CancellationToken stoppingToken)
     {
         // 延迟一段时间，避免过于频繁地执行任务
         await Task.Delay(5000, stoppingToken).ConfigureAwait(false);
@@ -215,31 +209,31 @@ internal sealed class RedundancyHostedService : BackgroundService, IRedundancyHo
 
             try
             {
-                await tcpDmtpClient.TryConnectAsync().ConfigureAwait(false);
+                await TcpDmtpClient.TryConnectAsync().ConfigureAwait(false);
 
                 {
                     // 初始化读取错误计数器
                     var readErrorCount = 0;
                     // 当读取错误次数小于最大错误计数时循环执行
-                    while (readErrorCount < redundancy.MaxErrorCount)
+                    while (readErrorCount < RedundancyOptions.MaxErrorCount)
                     {
                         try
                         {
                             // 发送 Ping 请求以检查设备是否在线，超时时间为 10000 毫秒
-                            online = await tcpDmtpClient.PingAsync(10000).ConfigureAwait(false);
+                            online = await TcpDmtpClient.PingAsync(10000).ConfigureAwait(false);
                             if (online)
                                 break;
                             else
                             {
                                 readErrorCount++;
-                                await Task.Delay(redundancy.SyncInterval, stoppingToken).ConfigureAwait(false);
+                                await Task.Delay(RedundancyOptions.SyncInterval, stoppingToken).ConfigureAwait(false);
                             }
                         }
                         catch
                         {
                             // 捕获异常，增加读取错误计数器
                             readErrorCount++;
-                            await Task.Delay(redundancy.SyncInterval, stoppingToken).ConfigureAwait(false);
+                            await Task.Delay(RedundancyOptions.SyncInterval, stoppingToken).ConfigureAwait(false);
                         }
                     }
                 }
@@ -254,7 +248,7 @@ internal sealed class RedundancyHostedService : BackgroundService, IRedundancyHo
                 else
                 {
                     // 如果设备在线
-                    LogMessage?.LogTrace($"Ping ActiveStation {redundancy.MasterUri} success");
+                    LogMessage?.LogTrace($"Ping ActiveStation {RedundancyOptions.MasterUri} success");
                     await StandbyAsync().ConfigureAwait(false);
                 }
             }
@@ -328,9 +322,10 @@ internal sealed class RedundancyHostedService : BackgroundService, IRedundancyHo
     private WaitLock _switchLock = new();
 
     /// <inheritdoc/>
-    protected override Task ExecuteAsync(CancellationToken stoppingToken)
+    protected override async Task ExecuteAsync(CancellationToken stoppingToken)
     {
-        return StartRedundancyTaskAsync();
+        await Task.Yield();
+        await StartRedundancyTaskAsync().ConfigureAwait(false);
     }
 
     public async Task<OperResult> StartRedundancyTaskAsync()
@@ -348,12 +343,11 @@ internal sealed class RedundancyHostedService : BackgroundService, IRedundancyHo
             {
                 if (RedundancyOptions.IsMaster)
                 {
-                    RedundancyTask = new DoTask(a => DoMasterWork(TcpDmtpService, RedundancyOptions.SyncInterval, a), LogMessage); // 创建新的任务
+                    RedundancyTask = new DoTask(DoMasterWork, LogMessage); // 创建新的任务
                 }
                 else
                 {
-
-                    RedundancyTask = new DoTask(a => DoSlaveWork(TcpDmtpClient, RedundancyOptions, a), LogMessage); // 创建新的任务
+                    RedundancyTask = new DoTask(DoSlaveWork, LogMessage); // 创建新的任务
                 }
 
                 RedundancyTask?.Start(default); // 启动任务

src/Gateway/ThingsGateway.Gateway.Application/Services/Management/Update/Services/UpdateZipFileHostedService.cs

@@ -47,6 +47,7 @@ internal sealed class UpdateZipFileHostedService : BackgroundService, IUpdateZip
 
     protected override async Task ExecuteAsync(CancellationToken stoppingToken)
     {
+        await Task.Yield();
 
         TcpDmtpClient = await GetTcpDmtpClient().ConfigureAwait(false);
         var upgradeServerOptions = App.GetOptions<UpgradeServerOptions>();