优化UI刷新

Signed-off-by: Diego <2248356998@qq.com>

src/Admin/ThingsGateway.Admin.Application/Services/MessageService/SignalR/Provider/UserIdProvider.cs

@@ -11,8 +11,6 @@
 using Microsoft.AspNetCore.Http.Connections.Features;
 using Microsoft.AspNetCore.SignalR;
 
-using Yitter.IdGenerator;
-
 namespace ThingsGateway.Admin.Application;
 
 /// <summary>
@@ -28,7 +26,7 @@ public class UserIdProvider : IUserIdProvider
 
         if (UserId > 0)
         {
-            return $"{UserId}{SysHub.Separate}{YitIdHelper.NextId()}";//返回用户ID
+            return $"{UserId}{SysHub.Separate}{CommonUtils.GetSingleId()}";//返回用户ID
         }
 
         return connection.ConnectionId;

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

@@ -101,10 +101,13 @@ public class Startup : AppStartup
         try
         {
             using var db = DbContext.GetDB<SysOperateLog>();
-            if (!db.DbMaintenance.IsAnyIndex("idx_operatelog_optime_date"))
+            if (db.CurrentConnectionConfig.DbType == SqlSugar.DbType.Sqlite)
             {
-                var indexsql = "CREATE INDEX idx_operatelog_optime_date ON sys_operatelog(strftime('%Y-%m-%d', OpTime));";
-                db.Ado.ExecuteCommand(indexsql);
+                if (!db.DbMaintenance.IsAnyIndex("idx_operatelog_optime_date"))
+                {
+                    var indexsql = "CREATE INDEX idx_operatelog_optime_date ON sys_operatelog(strftime('%Y-%m-%d', OpTime));";
+                    db.Ado.ExecuteCommand(indexsql);
+                }
             }
         }
         catch { }

src/Admin/ThingsGateway.AdminServer/Program/Startup.cs

@@ -29,7 +29,6 @@ using ThingsGateway.Admin.Application;
 using ThingsGateway.Admin.Razor;
 using ThingsGateway.Extension;
 using ThingsGateway.NewLife.Caching;
-using ThingsGateway.NewLife.Extension;
 
 namespace ThingsGateway.AdminServer;
 
@@ -161,7 +160,8 @@ public class Startup : AppStartup
         {
             options.WriteFilter = (logMsg) =>
             {
-                if (logMsg.Message.IsNullOrEmpty()) return false;
+                if (App.HostApplicationLifetime.ApplicationStopping.IsCancellationRequested && logMsg.LogLevel >= LogLevel.Warning) return false;
+                if (string.IsNullOrEmpty(logMsg.Message)) return false;
                 else return true;
             };
 

src/Admin/ThingsGateway.Furion/App/App.cs

@@ -71,13 +71,25 @@ public static class App
     /// </summary>
     public static IServiceProvider RootServices => InternalApp.RootServices;
 
+    private static IHostApplicationLifetime hostApplicationLifetime;
+    public static IHostApplicationLifetime HostApplicationLifetime
+    {
+        get
+        {
+            if ((hostApplicationLifetime == null))
+            {
+                hostApplicationLifetime = RootServices?.GetService<IHostApplicationLifetime>();
+            }
+            return hostApplicationLifetime;
+        }
+    }
+
     private static IStringLocalizerFactory? stringLocalizerFactory;
 
     /// <summary>
     /// 本地化服务工厂
     /// </summary>
     public static IStringLocalizerFactory? StringLocalizerFactory
-
     {
         get
         {

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

@@ -7,7 +7,7 @@
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="BootstrapBlazor.FontAwesome" Version="9.0.2" />
-		<PackageReference Include="BootstrapBlazor" Version="9.6.4" />
+		<PackageReference Include="BootstrapBlazor" Version="9.7.0" />
 		<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
 	</ItemGroup>
 

src/Directory.Build.props

@@ -1,8 +1,8 @@
 <Project>
 
 	<PropertyGroup>
-		<PluginVersion>10.6.26</PluginVersion>
-		<ProPluginVersion>10.6.26</ProPluginVersion>
+		<PluginVersion>10.6.32</PluginVersion>
+		<ProPluginVersion>10.6.32</ProPluginVersion>
 		<AuthenticationVersion>2.1.8</AuthenticationVersion>
 	</PropertyGroup>
 

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

@@ -6,7 +6,8 @@
 @using BootstrapBlazor.Components
 @namespace ThingsGateway.Debug
 
-<Card HeaderText=@HeaderText class=@("w-100") style=@($"{CardStyle}")>
+
+    <Card HeaderText=@HeaderText class=@("w-100 h-100") style=@($"display: flex; flex: 1;{CardStyle}")>
     <HeaderTemplate>
         <div class="flex-fill">
         </div>
@@ -36,7 +37,7 @@
 
     </HeaderTemplate>
     <BodyTemplate>
-        <div style=@($"height:{HeightString};overflow-y:scroll")>
+                <div style=@($"height:{HeightString};overflow-y:scroll;flex-fill;")>
             <Virtualize Items="CurrentMessages??new  List<LogMessage>()" Context="itemMessage" ItemSize="60" OverscanCount=2>
                 <ItemContent>
                     @*       <Tooltip Placement="Placement.Bottom" Title=@itemMessage.Message.Substring(0, Math.Min(itemMessage.Message.Length, 500))> *@
@@ -56,4 +57,3 @@
 </Card>
 
 
-

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

@@ -39,7 +39,7 @@ public partial class LogConsole : IDisposable
     public string HeaderText { get; set; } = "Log";
 
     [Parameter]
-    public string HeightString { get; set; } = "calc(100% - 50px)";
+    public string HeightString { get; set; } = "100%";
 
     [Parameter, EditorRequired]
     public string LogPath { get; set; }

src/Foundation/ThingsGateway.Foundation/Channel/Plugin/HeartbeatAndReceivePlugin.cs

@@ -61,14 +61,14 @@ internal sealed class HeartbeatAndReceivePlugin : PluginBase, ITcpConnectedPlugi
         {
             return;//此处可判断，如果为服务器，则不用使用心跳。
         }
-
+        if (HeartbeatTime > 0)
+            SendHeartbeat = true;
         HeartbeatTime = Math.Max(HeartbeatTime, 1000);
 
         if (DtuId.IsNullOrWhiteSpace()) return;
 
         if (client is ITcpClient tcpClient)
         {
-            SendHeartbeat = true;
             await tcpClient.SendAsync(DtuIdByte).ConfigureAwait(false);
 
             if (Task == null)

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

@@ -0,0 +1,82 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+namespace ThingsGateway.Gateway.Application;
+
+public class SmartTriggerScheduler
+{
+    private readonly object _lock = new();          // 锁对象，保证线程安全
+    private readonly Func<Task> _action;                // 实际要执行的操作
+    private readonly TimeSpan _delay;               // 执行间隔（冷却时间）
+
+    private bool _isRunning = false;                // 当前是否有调度任务在运行
+    private bool _hasPending = false;               // 在等待期间是否有新的触发
+
+    // 构造函数，传入要执行的方法和最小执行间隔
+    public SmartTriggerScheduler(Func<Task> action, TimeSpan minimumInterval)
+    {
+        _action = action ?? throw new ArgumentNullException(nameof(action));
+        _delay = minimumInterval;
+    }
+
+    // 外部调用的触发方法（高频调用的地方调用这个）
+    public void Trigger()
+    {
+        lock (_lock)
+        {
+
+            if (_isRunning)
+            {
+                // 如果正在执行中，标记为“等待处理”，之后再执行一次
+                _hasPending = true;
+                return;
+            }
+
+            // 否则启动执行任务
+            _isRunning = true;
+            _ = Task.Run(ExecuteLoop); // 开启异步执行循环（非阻塞）
+        }
+    }
+
+    // 实际执行动作的循环逻辑
+    private async Task ExecuteLoop()
+    {
+        while (true)
+        {
+            Func<Task> actionToRun = null;
+
+            // 拷贝 _action，并清除等待标记
+            lock (_lock)
+            {
+                _hasPending = false;       // 当前这一轮已经处理了触发
+                actionToRun = _action;     // 拷贝要执行的逻辑（避免锁内执行）
+            }
+
+            // 执行外部提供的方法
+            await actionToRun().ConfigureAwait(false);
+
+            // 等待 delay 时间，进入冷却期
+            await Task.Delay(_delay).ConfigureAwait(false);
+
+            lock (_lock)
+            {
+                // 冷却期后检查是否在这段时间内有新的触发
+                if (!_hasPending)
+                {
+                    // 没有新的触发了，结束执行循环
+                    _isRunning = false;
+                    return;
+                }
+
+                // 有新的触发，继续下一轮循环（再执行一次）
+            }
+        }
+    }
+}

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

@@ -8,6 +8,8 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
+using BootstrapBlazor.Components;
+
 using Mapster;
 
 using System.Collections.Concurrent;
@@ -205,6 +207,30 @@ public static class GlobalData
 
     #region 单例服务
 
+
+    private static IDispatchService<ChannelRuntime> channelRuntimeDispatchService;
+    public static IDispatchService<ChannelRuntime> ChannelDeviceRuntimeDispatchService
+    {
+        get
+        {
+            if (channelRuntimeDispatchService == null)
+                channelRuntimeDispatchService = App.GetService<IDispatchService<ChannelRuntime>>();
+
+            return channelRuntimeDispatchService;
+        }
+    }
+    private static IDispatchService<VariableRuntime> variableRuntimeDispatchService;
+    public static IDispatchService<VariableRuntime> VariableRuntimeDispatchService
+    {
+        get
+        {
+            if (variableRuntimeDispatchService == null)
+                variableRuntimeDispatchService = App.GetService<IDispatchService<VariableRuntime>>();
+
+            return variableRuntimeDispatchService;
+        }
+    }
+
     private static ISysUserService sysUserService;
     public static ISysUserService SysUserService
     {

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

@@ -1,464 +0,0 @@
-//------------------------------------------------------------------------------
-//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
-//  此代码版权（除特别声明外的代码）归作者本人Diego所有
-//  源代码使用协议遵循本仓库的开源协议及附加协议
-//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
-//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
-//  使用文档：https://thingsgateway.cn/
-//  QQ群：605534569
-//------------------------------------------------------------------------------
-
-using System.Collections;
-
-namespace ThingsGateway.Gateway.Application;
-
-public class ThreadSafeStringDictionary<T> : IDictionary<string, T>, IReadOnlyDictionary<string, T>
-{
-    private const int DEFAULT_PARTITIONS = 128;
-    private readonly Dictionary<string, T>[] _partitions;
-    private readonly object[] _partitionLocks;
-    private readonly IEqualityComparer<string> _comparer;
-
-    public ThreadSafeStringDictionary() : this(DEFAULT_PARTITIONS, null) { }
-
-    public ThreadSafeStringDictionary(int partitionCount, IEqualityComparer<string> comparer)
-    {
-        if (partitionCount < 1)
-            throw new ArgumentOutOfRangeException(nameof(partitionCount));
-
-        _partitions = new Dictionary<string, T>[partitionCount];
-        _partitionLocks = new object[partitionCount];
-        _comparer = comparer ?? StringComparer.Ordinal;
-
-        for (int i = 0; i < partitionCount; i++)
-        {
-            _partitions[i] = new Dictionary<string, T>(_comparer);
-            _partitionLocks[i] = new object();
-        }
-    }
-
-    private int GetPartitionIndex(string key)
-    {
-        if (key == null) throw new ArgumentNullException(nameof(key));
-        return Math.Abs(_comparer.GetHashCode(key)) % _partitions.Length;
-    }
-
-    // 基本操作
-    public T this[string key]
-    {
-        get
-        {
-            int index = GetPartitionIndex(key);
-            lock (_partitionLocks[index])
-            {
-                return _partitions[index][key];
-            }
-        }
-        set
-        {
-            int index = GetPartitionIndex(key);
-            lock (_partitionLocks[index])
-            {
-                _partitions[index][key] = value;
-            }
-        }
-    }
-
-    public ICollection<string> Keys => GetAllItems().Select(kv => kv.Key).ToList();
-    public ICollection<T> Values => GetAllItems().Select(kv => kv.Value).ToList();
-
-    public int Count
-    {
-        get
-        {
-            int count = 0;
-            for (int i = 0; i < _partitions.Length; i++)
-            {
-                lock (_partitionLocks[i])
-                {
-                    count += _partitions[i].Count;
-                }
-            }
-            return count;
-        }
-    }
-
-    public bool IsReadOnly => false;
-
-    IEnumerable<string> IReadOnlyDictionary<string, T>.Keys => Keys;
-
-    IEnumerable<T> IReadOnlyDictionary<string, T>.Values => Values;
-
-    public void Add(string key, T value)
-    {
-        int index = GetPartitionIndex(key);
-        lock (_partitionLocks[index])
-        {
-            _partitions[index].Add(key, value);
-        }
-    }
-
-    public void Add(KeyValuePair<string, T> item) => Add(item.Key, item.Value);
-
-    public void Clear()
-    {
-        for (int i = 0; i < _partitions.Length; i++)
-        {
-            lock (_partitionLocks[i])
-            {
-                _partitions[i].Clear();
-            }
-        }
-    }
-
-    public bool Contains(KeyValuePair<string, T> item)
-    {
-        int index = GetPartitionIndex(item.Key);
-        lock (_partitionLocks[index])
-        {
-            return _partitions[index].TryGetValue(item.Key, out var value) &&
-                   EqualityComparer<T>.Default.Equals(value, item.Value);
-        }
-    }
-
-    public bool ContainsKey(string key)
-    {
-        int index = GetPartitionIndex(key);
-        lock (_partitionLocks[index])
-        {
-            return _partitions[index].ContainsKey(key);
-        }
-    }
-
-    public bool Remove(string key)
-    {
-        int index = GetPartitionIndex(key);
-        lock (_partitionLocks[index])
-        {
-            return _partitions[index].Remove(key);
-        }
-    }
-
-    public bool Remove(KeyValuePair<string, T> item)
-    {
-        int index = GetPartitionIndex(item.Key);
-        lock (_partitionLocks[index])
-        {
-            if (_partitions[index].TryGetValue(item.Key, out var value) &&
-                EqualityComparer<T>.Default.Equals(value, item.Value))
-            {
-                return _partitions[index].Remove(item.Key);
-            }
-            return false;
-        }
-    }
-
-    public bool TryGetValue(string key, out T value)
-    {
-        int index = GetPartitionIndex(key);
-        lock (_partitionLocks[index])
-        {
-            return _partitions[index].TryGetValue(key, out value);
-        }
-    }
-
-    public void CopyTo(KeyValuePair<string, T>[] array, int arrayIndex)
-    {
-        if (array == null) throw new ArgumentNullException(nameof(array));
-        if (arrayIndex < 0) throw new ArgumentOutOfRangeException(nameof(arrayIndex));
-        if (array.Length - arrayIndex < Count) throw new ArgumentException("Target array too small");
-
-        foreach (var item in GetAllItems())
-        {
-            array[arrayIndex++] = item;
-        }
-    }
-
-    // 枚举器实现
-    public IEnumerator<KeyValuePair<string, T>> GetEnumerator()
-    {
-        return GetAllItems().GetEnumerator();
-    }
-
-    IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
-
-    public void AddRange(IEnumerable<KeyValuePair<string, T>> items)
-    {
-        var grouped = items.GroupBy(item => GetPartitionIndex(item.Key));
-
-        foreach (var group in grouped)
-        {
-            lock (_partitionLocks[group.Key])
-            {
-                foreach (var item in group)
-                {
-                    _partitions[group.Key][item.Key] = item.Value;
-                }
-            }
-        }
-    }
-
-    public Dictionary<string, T> GetSnapshot()
-    {
-        var snapshot = new Dictionary<string, T>(_comparer);
-
-        for (int i = 0; i < _partitions.Length; i++)
-        {
-            lock (_partitionLocks[i])
-            {
-                foreach (var kvp in _partitions[i])
-                {
-                    snapshot[kvp.Key] = kvp.Value;
-                }
-            }
-        }
-
-        return snapshot;
-    }
-
-    private IEnumerable<KeyValuePair<string, T>> GetAllItems()
-    {
-        for (int i = 0; i < _partitions.Length; i++)
-        {
-            lock (_partitionLocks[i])
-            {
-                foreach (var item in _partitions[i]) // 直接枚举原字典
-                {
-                    yield return item;
-                }
-            }
-        }
-    }
-}
-
-public class ThreadSafeLongDictionary<T> : IDictionary<long, T>, IReadOnlyDictionary<long, T>
-{
-    private const int DEFAULT_PARTITIONS = 128;
-    private readonly Dictionary<long, T>[] _partitions;
-    private readonly object[] _partitionLocks;
-
-    public ThreadSafeLongDictionary() : this(DEFAULT_PARTITIONS) { }
-
-    public ThreadSafeLongDictionary(int partitionCount)
-    {
-        if (partitionCount < 1)
-            throw new ArgumentOutOfRangeException(nameof(partitionCount));
-
-        _partitions = new Dictionary<long, T>[partitionCount];
-        _partitionLocks = new object[partitionCount];
-
-        for (int i = 0; i < partitionCount; i++)
-        {
-            _partitions[i] = new Dictionary<long, T>();
-            _partitionLocks[i] = new object();
-        }
-    }
-
-    private int GetPartitionIndex(long key)
-    {
-        // 使用混合哈希算法减少碰撞
-        uint hash = (uint)key;
-        hash = ((hash >> 16) ^ hash) * 0x45d9f3b;
-        hash = ((hash >> 16) ^ hash) * 0x45d9f3b;
-        hash = (hash >> 16) ^ hash;
-        return (int)(hash % _partitions.Length);
-    }
-
-    public T this[long key]
-    {
-        get
-        {
-            int index = GetPartitionIndex(key);
-            lock (_partitionLocks[index])
-            {
-                return _partitions[index][key];
-            }
-        }
-        set
-        {
-            int index = GetPartitionIndex(key);
-            lock (_partitionLocks[index])
-            {
-                _partitions[index][key] = value;
-            }
-        }
-    }
-
-    public ICollection<long> Keys => GetAllItems().Select(kv => kv.Key).ToList();
-    public ICollection<T> Values => GetAllItems().Select(kv => kv.Value).ToList();
-
-    public int Count
-    {
-        get
-        {
-            int count = 0;
-            for (int i = 0; i < _partitions.Length; i++)
-            {
-                lock (_partitionLocks[i])
-                {
-                    count += _partitions[i].Count;
-                }
-            }
-            return count;
-        }
-    }
-
-    public bool IsReadOnly => false;
-
-    IEnumerable<long> IReadOnlyDictionary<long, T>.Keys => Keys;
-
-    IEnumerable<T> IReadOnlyDictionary<long, T>.Values => Values;
-
-    public void Add(long key, T value)
-    {
-        int index = GetPartitionIndex(key);
-        lock (_partitionLocks[index])
-        {
-            _partitions[index].Add(key, value);
-        }
-    }
-
-    public void Add(KeyValuePair<long, T> item) => Add(item.Key, item.Value);
-
-    public void Clear()
-    {
-        for (int i = 0; i < _partitions.Length; i++)
-        {
-            lock (_partitionLocks[i])
-            {
-                _partitions[i].Clear();
-            }
-        }
-    }
-
-    public bool Contains(KeyValuePair<long, T> item)
-    {
-        int index = GetPartitionIndex(item.Key);
-        lock (_partitionLocks[index])
-        {
-            return _partitions[index].TryGetValue(item.Key, out var value) &&
-                   EqualityComparer<T>.Default.Equals(value, item.Value);
-        }
-    }
-
-    public bool ContainsKey(long key)
-    {
-        int index = GetPartitionIndex(key);
-        lock (_partitionLocks[index])
-        {
-            return _partitions[index].ContainsKey(key);
-        }
-    }
-
-    public bool Remove(long key)
-    {
-        int index = GetPartitionIndex(key);
-        lock (_partitionLocks[index])
-        {
-            return _partitions[index].Remove(key);
-        }
-    }
-
-    public bool Remove(KeyValuePair<long, T> item)
-    {
-        int index = GetPartitionIndex(item.Key);
-        lock (_partitionLocks[index])
-        {
-            if (_partitions[index].TryGetValue(item.Key, out var value) &&
-                EqualityComparer<T>.Default.Equals(value, item.Value))
-            {
-                return _partitions[index].Remove(item.Key);
-            }
-            return false;
-        }
-    }
-
-    public bool TryGetValue(long key, out T value)
-    {
-        int index = GetPartitionIndex(key);
-        lock (_partitionLocks[index])
-        {
-            return _partitions[index].TryGetValue(key, out value);
-        }
-    }
-
-    public void CopyTo(KeyValuePair<long, T>[] array, int arrayIndex)
-    {
-        if (array == null) throw new ArgumentNullException(nameof(array));
-        if (arrayIndex < 0) throw new ArgumentOutOfRangeException(nameof(arrayIndex));
-        if (array.Length - arrayIndex < Count) throw new ArgumentException("Target array too small");
-
-        foreach (var item in GetAllItems())
-        {
-            array[arrayIndex++] = item;
-        }
-    }
-
-    public IEnumerator<KeyValuePair<long, T>> GetEnumerator()
-    {
-        return GetAllItems().GetEnumerator();
-    }
-
-    IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
-
-    public void AddRange(IEnumerable<KeyValuePair<long, T>> items)
-    {
-        var grouped = items.GroupBy(item => GetPartitionIndex(item.Key));
-
-        foreach (var group in grouped)
-        {
-            lock (_partitionLocks[group.Key])
-            {
-                foreach (var item in group)
-                {
-                    _partitions[group.Key][item.Key] = item.Value;
-                }
-            }
-        }
-    }
-
-    public Dictionary<long, T> GetSnapshot()
-    {
-        var snapshot = new Dictionary<long, T>();
-
-        for (int i = 0; i < _partitions.Length; i++)
-        {
-            lock (_partitionLocks[i])
-            {
-                foreach (var kvp in _partitions[i])
-                {
-                    snapshot[kvp.Key] = kvp.Value;
-                }
-            }
-        }
-
-        return snapshot;
-    }
-
-    private IEnumerable<KeyValuePair<long, T>> GetAllItems()
-    {
-        for (int i = 0; i < _partitions.Length; i++)
-        {
-            lock (_partitionLocks[i])
-            {
-                foreach (var item in _partitions[i])
-                {
-                    yield return item;
-                }
-            }
-        }
-    }
-
-    public string GetPartitionStats()
-    {
-        var stats = new System.Text.StringBuilder();
-        for (int i = 0; i < _partitions.Length; i++)
-        {
-            lock (_partitionLocks[i])
-            {
-                stats.AppendLine($"Partition {i}: {_partitions[i].Count} items");
-            }
-        }
-        return stats.ToString();
-    }
-}

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

@@ -241,7 +241,7 @@ public class DeviceRuntime : Device, IDisposable
 
         ChannelRuntime = channelRuntime;
         ChannelRuntime?.DeviceRuntimes?.TryRemove(Id, out _);
-        ChannelRuntime.DeviceRuntimes.TryAdd(Id, this);
+        ChannelRuntime?.DeviceRuntimes?.TryAdd(Id, this);
 
         GlobalData.IdDevices.TryRemove(Id, out _);
         GlobalData.IdDevices.TryAdd(Id, this);

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

@@ -17,8 +17,6 @@ using Microsoft.Extensions.Logging;
 
 using ThingsGateway.NewLife;
 
-using TouchSocket.Core;
-
 namespace ThingsGateway.Gateway.Application;
 
 public class ChannelRuntimeService : IChannelRuntimeService
@@ -199,9 +197,7 @@ public class ChannelRuntimeService : IChannelRuntimeService
 
     public async Task RestartChannelAsync(IEnumerable<ChannelRuntime> oldChannelRuntimes)
     {
-        oldChannelRuntimes.SelectMany(a => a.DeviceRuntimes.SelectMany(a => a.Value.VariableRuntimes)).ParallelForEach(a => a.Value.SafeDispose());
-        oldChannelRuntimes.SelectMany(a => a.DeviceRuntimes).ParallelForEach(a => a.Value.SafeDispose());
-        oldChannelRuntimes.ParallelForEach(a => a.SafeDispose());
+        RuntimeServiceHelper.RemoveOldChannelRuntimes(oldChannelRuntimes);
         var ids = oldChannelRuntimes.Select(a => a.Id).ToHashSet();
         try
         {
@@ -229,4 +225,5 @@ public class ChannelRuntimeService : IChannelRuntimeService
         }
     }
 
+
 }

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

@@ -33,16 +33,6 @@ namespace ThingsGateway.Gateway.Application;
 
 internal sealed class ChannelService : BaseService<Channel>, IChannelService
 {
-    private readonly IDispatchService<Channel> _dispatchService;
-
-    /// <inheritdoc cref="IChannelService"/>
-    public ChannelService(
-    IDispatchService<Channel>? dispatchService
-        )
-    {
-        _dispatchService = dispatchService;
-    }
-
     #region CURD
 
     /// <inheritdoc/>
@@ -181,7 +171,6 @@ internal sealed class ChannelService : BaseService<Channel>, IChannelService
     public void DeleteChannelFromCache()
     {
         App.CacheService.Remove(ThingsGatewayCacheConst.Cache_Channel);//删除通道缓存
-        _dispatchService.Dispatch(new());
     }
 
     /// <summary>

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

@@ -35,15 +35,11 @@ internal sealed class DeviceService : BaseService<Device>, IDeviceService
 {
     private readonly IChannelService _channelService;
     private readonly IPluginService _pluginService;
-    private readonly IDispatchService<Device> _dispatchService;
 
-    public DeviceService(
-    IDispatchService<Device> dispatchService
-        )
+    public DeviceService()
     {
         _channelService = App.RootServices.GetRequiredService<IChannelService>();
         _pluginService = App.RootServices.GetRequiredService<IPluginService>();
-        _dispatchService = dispatchService;
     }
 
 
@@ -195,7 +191,6 @@ internal sealed class DeviceService : BaseService<Device>, IDeviceService
     public void DeleteDeviceFromCache()
     {
         App.CacheService.Remove(ThingsGatewayCacheConst.Cache_Device);//删除设备缓存
-        _dispatchService.Dispatch(new());
     }
 
     /// <summary>

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

@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 using Microsoft.Extensions.Logging;
 
 using System.Collections.Concurrent;
@@ -21,17 +19,6 @@ namespace ThingsGateway.Gateway.Application;
 internal sealed class ChannelThreadManage : IChannelThreadManage
 {
     private ILogger _logger;
-    private IDispatchService<ChannelRuntime> channelRuntimeDispatchService;
-    private IDispatchService<ChannelRuntime> ChannelRuntimeDispatchService
-    {
-        get
-        {
-            if (channelRuntimeDispatchService == null)
-                channelRuntimeDispatchService = App.GetService<IDispatchService<ChannelRuntime>>();
-
-            return channelRuntimeDispatchService;
-        }
-    }
 
     public ChannelThreadManage()
     {
@@ -78,7 +65,6 @@ internal sealed class ChannelThreadManage : IChannelThreadManage
             await NewChannelLock.WaitAsync().ConfigureAwait(false);
 
             await PrivateRemoveChannelsAsync(Enumerable.Repeat(channelId, 1)).ConfigureAwait(false);
-            ChannelRuntimeDispatchService.Dispatch(null);
         }
         finally
         {
@@ -98,7 +84,6 @@ internal sealed class ChannelThreadManage : IChannelThreadManage
             await NewChannelLock.WaitAsync().ConfigureAwait(false);
 
             await PrivateRemoveChannelsAsync(channelIds).ConfigureAwait(false);
-            ChannelRuntimeDispatchService.Dispatch(null);
         }
         finally
         {
@@ -165,7 +150,6 @@ internal sealed class ChannelThreadManage : IChannelThreadManage
         {
             await NewChannelLock.WaitAsync().ConfigureAwait(false);
             await PrivateRestartChannelAsync(Enumerable.Repeat(channelRuntime, 1)).ConfigureAwait(false);
-            ChannelRuntimeDispatchService.Dispatch(null);
         }
         finally
         {
@@ -183,7 +167,6 @@ internal sealed class ChannelThreadManage : IChannelThreadManage
         {
             await NewChannelLock.WaitAsync().ConfigureAwait(false);
             await PrivateRestartChannelAsync(channelRuntimes).ConfigureAwait(false);
-            ChannelRuntimeDispatchService.Dispatch(null);
         }
         finally
         {

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

@@ -38,17 +38,6 @@ internal sealed class DeviceThreadManage : IAsyncDisposable, IDeviceThreadManage
     /// </summary>
     public static volatile int CycleInterval = ManageHelper.ChannelThreadOptions.MaxCycleInterval;
 
-    private IDispatchService<DeviceRuntime> devicelRuntimeDispatchService;
-    private IDispatchService<DeviceRuntime> DeviceRuntimeDispatchService
-    {
-        get
-        {
-            if (devicelRuntimeDispatchService == null)
-                devicelRuntimeDispatchService = App.GetService<IDispatchService<DeviceRuntime>>();
-
-            return devicelRuntimeDispatchService;
-        }
-    }
     static DeviceThreadManage()
     {
         Task.Factory.StartNew(async () => await SetCycleInterval().ConfigureAwait(false), TaskCreationOptions.LongRunning);
@@ -250,7 +239,6 @@ internal sealed class DeviceThreadManage : IAsyncDisposable, IDeviceThreadManage
         {
             await NewDeviceLock.WaitAsync().ConfigureAwait(false);
             await PrivateRestartDeviceAsync(Enumerable.Repeat(deviceRuntime, 1), deleteCache).ConfigureAwait(false);
-            DeviceRuntimeDispatchService.Dispatch(null);
         }
         finally
         {
@@ -268,7 +256,6 @@ internal sealed class DeviceThreadManage : IAsyncDisposable, IDeviceThreadManage
         {
             await NewDeviceLock.WaitAsync().ConfigureAwait(false);
             await PrivateRestartDeviceAsync(deviceRuntimes, deleteCache).ConfigureAwait(false);
-            DeviceRuntimeDispatchService.Dispatch(null);
         }
         finally
         {
@@ -440,7 +427,6 @@ internal sealed class DeviceThreadManage : IAsyncDisposable, IDeviceThreadManage
             await NewDeviceLock.WaitAsync().ConfigureAwait(false);
 
             await PrivateRemoveDevicesAsync(Enumerable.Repeat(deviceId, 1)).ConfigureAwait(false);
-            DeviceRuntimeDispatchService.Dispatch(null);
         }
         finally
         {
@@ -460,7 +446,6 @@ internal sealed class DeviceThreadManage : IAsyncDisposable, IDeviceThreadManage
             await NewDeviceLock.WaitAsync().ConfigureAwait(false);
 
             await PrivateRemoveDevicesAsync(deviceIds).ConfigureAwait(false);
-            DeviceRuntimeDispatchService.Dispatch(null);
         }
         finally
         {
@@ -662,6 +647,7 @@ internal sealed class DeviceThreadManage : IAsyncDisposable, IDeviceThreadManage
         //传入变量
         //newDeviceRuntime.VariableRuntimes.ParallelForEach(a => a.Value.SafeDispose());
         deviceRuntime.VariableRuntimes.ParallelForEach(a => a.Value.Init(newDeviceRuntime));
+        GlobalData.VariableRuntimeDispatchService.Dispatch(null);
     }
 
     /// <inheritdoc/>
@@ -740,6 +726,8 @@ internal sealed class DeviceThreadManage : IAsyncDisposable, IDeviceThreadManage
                 LogMessage?.LogWarning($"device {newDeviceRuntime.Name} cannot found channel with id{newDeviceRuntime.ChannelId}");
 
             newDeviceRuntime.Init(channelRuntime);
+            GlobalData.ChannelDeviceRuntimeDispatchService.Dispatch(null);
+
             await channelRuntime.DeviceThreadManage.RestartDeviceAsync(newDeviceRuntime, false).ConfigureAwait(false);
             channelRuntime.DeviceThreadManage.LogMessage?.LogInformation($"Device {newDeviceRuntime.Name} switched to primary channel");
 

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

@@ -71,6 +71,9 @@ internal sealed class GatewayMonitorHostedService : BackgroundService, IGatewayM
                 }
             }
 
+            GlobalData.ChannelDeviceRuntimeDispatchService.Dispatch(null);
+            GlobalData.VariableRuntimeDispatchService.Dispatch(null);
+
             await ChannelThreadManage.RestartChannelAsync(channelRuntimes).ConfigureAwait(false);
 
 

src/Gateway/ThingsGateway.Gateway.Application/Services/Plugin/PluginService.cs

@@ -25,8 +25,6 @@ using ThingsGateway.NewLife;
 
 using TouchSocket.Core;
 
-using Yitter.IdGenerator;
-
 namespace ThingsGateway.Gateway.Application;
 
 /// <summary>
@@ -518,7 +516,7 @@ internal sealed class PluginService : IPluginService
     {
         var fileInfo = new FileInfo(path);
         if (fileInfo.Exists)
-            fileInfo.MoveTo($"{path}{YitIdHelper.NextId()}{DelEx}", true);
+            fileInfo.MoveTo($"{path}{CommonUtils.GetSingleId()}{DelEx}", true);
         else
             return false;
         return true;
@@ -598,7 +596,7 @@ internal sealed class PluginService : IPluginService
             }
             _ = Task.Run(() =>
             {
-                _dispatchService.Dispatch(new());
+                _dispatchService.Dispatch(null);
             });
         }
     }

src/Gateway/ThingsGateway.Gateway.Application/Services/RuntimeServiceHelper.cs

@@ -51,6 +51,9 @@ internal static class RuntimeServiceHelper
                 logger.LogWarning(ex, "Init Channel");
             }
         }
+        GlobalData.ChannelDeviceRuntimeDispatchService.Dispatch(null);
+        GlobalData.VariableRuntimeDispatchService.Dispatch(null);
+
     }
 
     public static void Init(List<ChannelRuntime> newChannelRuntimes)
@@ -72,6 +75,7 @@ internal static class RuntimeServiceHelper
             }
 
         }
+        GlobalData.ChannelDeviceRuntimeDispatchService.Dispatch(null);
     }
 
 
@@ -104,6 +108,10 @@ internal static class RuntimeServiceHelper
                 logger.LogWarning(ex, "Init Device");
             }
         }
+
+        GlobalData.ChannelDeviceRuntimeDispatchService.Dispatch(null);
+        GlobalData.VariableRuntimeDispatchService.Dispatch(null);
+
     }
 
     public static void Init(List<DeviceRuntime> newDeviceRuntimes)
@@ -124,6 +132,10 @@ internal static class RuntimeServiceHelper
                 deviceRuntime.VariableRuntimes.ParallelForEach(a => a.Value.Init(newDeviceRuntime));
             }
         }
+
+        GlobalData.ChannelDeviceRuntimeDispatchService.Dispatch(null);
+        GlobalData.VariableRuntimeDispatchService.Dispatch(null);
+
     }
     public static void Init(List<VariableRuntime> newVariableRuntimes)
     {
@@ -138,10 +150,20 @@ internal static class RuntimeServiceHelper
                 newVariableRuntime.Init(deviceRuntime);
             }
         }
+        GlobalData.VariableRuntimeDispatchService.Dispatch(null);
     }
 
 
+    public static void RemoveOldChannelRuntimes(IEnumerable<ChannelRuntime> oldChannelRuntimes)
+    {
+        oldChannelRuntimes.SelectMany(a => a.DeviceRuntimes.SelectMany(a => a.Value.VariableRuntimes)).ParallelForEach(a => a.Value.Dispose());
+        oldChannelRuntimes.SelectMany(a => a.DeviceRuntimes).ParallelForEach(a => a.Value.Dispose());
+        oldChannelRuntimes.ParallelForEach(a => a.Dispose());
 
+        GlobalData.ChannelDeviceRuntimeDispatchService.Dispatch(null);
+        GlobalData.VariableRuntimeDispatchService.Dispatch(null);
+
+    }
 
     public static async Task<List<ChannelRuntime>> GetNewChannelRuntimesAsync(HashSet<long> ids)
     {
@@ -179,6 +201,8 @@ internal static class RuntimeServiceHelper
             });
             deviceRuntime.Dispose();
         }
+        GlobalData.ChannelDeviceRuntimeDispatchService.Dispatch(null);
+        GlobalData.VariableRuntimeDispatchService.Dispatch(null);
 
         return changedDriver;
     }
@@ -222,6 +246,10 @@ internal static class RuntimeServiceHelper
 
         }
 
+
+        GlobalData.ChannelDeviceRuntimeDispatchService.Dispatch(null);
+        GlobalData.VariableRuntimeDispatchService.Dispatch(null);
+
         return changedDriver;
     }
 
@@ -332,6 +360,7 @@ internal static class RuntimeServiceHelper
             }
         }
 
+        GlobalData.VariableRuntimeDispatchService.Dispatch(null);
     }
 
 
@@ -350,6 +379,7 @@ internal static class RuntimeServiceHelper
                 }
             }
         }
+        GlobalData.VariableRuntimeDispatchService.Dispatch(null);
     }
 
 }

src/Gateway/ThingsGateway.Gateway.Application/Services/Variable/VariableRuntimeService.cs

@@ -202,7 +202,6 @@ public class VariableRuntimeService : IVariableRuntimeService
                     await RuntimeServiceHelper.ChangedDriverAsync(_logger, cancellationToken).ConfigureAwait(false);
                 }
 
-                App.GetService<IDispatchService<DeviceRuntime>>().Dispatch(null);
             }
         }
         finally

src/Gateway/ThingsGateway.Gateway.Application/Services/Variable/VariableService.cs

@@ -36,20 +36,13 @@ internal sealed class VariableService : BaseService<Variable>, IVariableService
     private readonly IChannelService _channelService;
     private readonly IDeviceService _deviceService;
     private readonly IPluginService _pluginService;
-    private readonly IDispatchService<bool> _allDispatchService;
-    private readonly IDispatchService<Variable> _dispatchService;
 
     /// <inheritdoc cref="IVariableService"/>
-    public VariableService(
-   IDispatchService<Variable> dispatchService,
-   IDispatchService<bool> allDispatchService
-        )
+    public VariableService()
     {
         _channelService = App.RootServices.GetRequiredService<IChannelService>();
         _pluginService = App.RootServices.GetRequiredService<IPluginService>();
         _deviceService = App.RootServices.GetRequiredService<IDeviceService>();
-        _dispatchService = dispatchService;
-        _allDispatchService = allDispatchService;
     }
 
     #region 测试
@@ -230,7 +223,6 @@ internal sealed class VariableService : BaseService<Variable>, IVariableService
         {
             _channelService.DeleteChannelFromCache();//刷新缓存
             _deviceService.DeleteDeviceFromCache();
-            _allDispatchService.Dispatch(new());
             DeleteVariableCache();
         }
         else
@@ -297,7 +289,6 @@ internal sealed class VariableService : BaseService<Variable>, IVariableService
         }
         finally
         {
-            _dispatchService.Dispatch(new());
 
         }
     }
@@ -318,7 +309,6 @@ internal sealed class VariableService : BaseService<Variable>, IVariableService
              .ToList();
 
             var result = (await db.Updateable(data).UpdateColumns(differences.Select(a => a.Key).ToArray()).ExecuteCommandAsync().ConfigureAwait(false)) > 0;
-            _dispatchService.Dispatch(new());
             if (result)
                 DeleteVariableCache();
             return result;
@@ -341,7 +331,6 @@ internal sealed class VariableService : BaseService<Variable>, IVariableService
 
         if (result > 0)
             DeleteVariableCache();
-        _dispatchService.Dispatch(new());
     }
 
     [OperDesc("DeleteVariable", isRecordPar: false, localizerType: typeof(Variable))]
@@ -354,7 +343,6 @@ internal sealed class VariableService : BaseService<Variable>, IVariableService
                           .WhereIF(dataScope != null && dataScope?.Count > 0, u => dataScope.Contains(u.CreateOrgId))//在指定机构列表查询
              .WhereIF(dataScope?.Count == 0, u => u.CreateUserId == UserManager.UserId)
              .ExecuteCommandAsync().ConfigureAwait(false)) > 0;
-        _dispatchService.Dispatch(new());
 
         if (result)
             DeleteVariableCache();
@@ -428,7 +416,6 @@ internal sealed class VariableService : BaseService<Variable>, IVariableService
 
         if (await base.SaveAsync(input, type).ConfigureAwait(false))
         {
-            _dispatchService.Dispatch(new());
             DeleteVariableCache();
             return true;
         }
@@ -493,7 +480,6 @@ internal sealed class VariableService : BaseService<Variable>, IVariableService
         using var db = GetDB();
         await db.BulkCopyAsync(insertData, 100000).ConfigureAwait(false);
         await db.BulkUpdateAsync(upData, 100000).ConfigureAwait(false);
-        _dispatchService.Dispatch(new());
         DeleteVariableCache();
         return variables.Select(a => a.Id).ToHashSet();
     }

src/Gateway/ThingsGateway.Gateway.Application/Startup.cs

@@ -133,10 +133,14 @@ public class Startup : AppStartup
         try
         {
             using var db = DbContext.GetDB<BackendLog>();
-            if (!db.DbMaintenance.IsAnyIndex("idx_backendlog_logtime_date"))
+            if (db.CurrentConnectionConfig.DbType == SqlSugar.DbType.Sqlite)
             {
-                var indexsql = "CREATE INDEX idx_backendlog_logtime_date ON backend_log(strftime('%Y-%m-%d', LogTime));";
-                db.Ado.ExecuteCommand(indexsql);
+
+                if (!db.DbMaintenance.IsAnyIndex("idx_backendlog_logtime_date"))
+                {
+                    var indexsql = "CREATE INDEX idx_backendlog_logtime_date ON backend_log(strftime('%Y-%m-%d', LogTime));";
+                    db.Ado.ExecuteCommand(indexsql);
+                }
             }
         }
         catch { }
@@ -144,10 +148,14 @@ public class Startup : AppStartup
         try
         {
             using var db = DbContext.GetDB<RpcLog>();
-            if (!db.DbMaintenance.IsAnyIndex("idx_rpclog_logtime_date"))
+            if (db.CurrentConnectionConfig.DbType == SqlSugar.DbType.Sqlite)
             {
-                var indexsql = "CREATE INDEX idx_rpclog_logtime_date ON rpc_log(strftime('%Y-%m-%d', LogTime));";
-                db.Ado.ExecuteCommand(indexsql);
+
+                if (!db.DbMaintenance.IsAnyIndex("idx_rpclog_logtime_date"))
+                {
+                    var indexsql = "CREATE INDEX idx_rpclog_logtime_date ON rpc_log(strftime('%Y-%m-%d', LogTime));";
+                    db.Ado.ExecuteCommand(indexsql);
+                }
             }
         }
         catch { }

src/Gateway/ThingsGateway.Gateway.Application/ThingsGateway.Gateway.Application.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
 	<Import Project="$(SolutionDir)Version.props" />
 	<Import Project="$(SolutionDir)PackNuget.props" />
@@ -10,8 +10,7 @@
 		<PackageReference Include="Rougamo.Fody" Version="5.0.0" />
 		<PackageReference Include="TouchSocket.Dmtp" Version="3.1.5" />
 		<PackageReference Include="TouchSocket.WebApi.Swagger" Version="3.1.5" />
-		<!--<PackageReference Include="ThingsGateway.Authentication" Version="$(AuthenticationVersion)" />-->
-		<ProjectReference Include="..\..\PluginPro\ThingsGateway.Authentication\ThingsGateway.Authentication.csproj" />
+		<PackageReference Include="ThingsGateway.Authentication" Version="$(AuthenticationVersion)" />
 
 	</ItemGroup>
 

src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Channel/ChannelCopyComponent.razor.cs

@@ -10,10 +10,9 @@
 
 using Mapster;
 
+using ThingsGateway.Admin.Application;
 using ThingsGateway.Gateway.Application;
 
-using Yitter.IdGenerator;
-
 namespace ThingsGateway.Gateway.Razor;
 
 public partial class ChannelCopyComponent
@@ -54,14 +53,14 @@ public partial class ChannelCopyComponent
             for (int i = 0; i < CopyCount; i++)
             {
                 Channel channel = Model.Adapt<Channel>();
-                channel.Id = YitIdHelper.NextId();
+                channel.Id = CommonUtils.GetSingleId();
                 channel.Name = $"{CopyChannelNamePrefix}{CopyChannelNameSuffixNumber + i}";
 
                 int index = 0;
                 foreach (var item in Devices)
                 {
                     Device device = item.Key.Adapt<Device>();
-                    device.Id = YitIdHelper.NextId();
+                    device.Id = CommonUtils.GetSingleId();
                     device.Name = $"{channel.Name}_{CopyDeviceNamePrefix}{CopyDeviceNameSuffixNumber + (index++)}";
                     device.ChannelId = channel.Id;
                     List<Variable> variables = new();
@@ -69,7 +68,7 @@ public partial class ChannelCopyComponent
                     foreach (var variable in item.Value)
                     {
                         Variable v = variable.Adapt<Variable>();
-                        v.Id = YitIdHelper.NextId();
+                        v.Id = CommonUtils.GetSingleId();
                         v.DeviceId = device.Id;
                         variables.Add(v);
                     }

src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Channel/ChannelRuntimeInfo1.razor.cs

@@ -43,10 +43,7 @@ public partial class ChannelRuntimeInfo1 : IDisposable
         {
             try
             {
-                await InvokeAsync(() =>
-                {
-                    StateHasChanged();
-                });
+                await InvokeAsync(StateHasChanged);
             }
             catch (Exception ex)
             {

src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Channel/ChannelTable.razor.cs

@@ -51,7 +51,7 @@ public partial class ChannelTable : IDisposable
             try
             {
                 if (table != null)
-                    await table.QueryAsync();
+                    await InvokeAsync(table.QueryAsync);
             }
             catch (Exception ex)
             {
@@ -59,7 +59,7 @@ public partial class ChannelTable : IDisposable
             }
             finally
             {
-                await Task.Delay(1000);
+                await Task.Delay(5000);
             }
         }
     }
@@ -115,7 +115,7 @@ public partial class ChannelTable : IDisposable
             {
 
                 await Task.Run(() =>GlobalData.ChannelRuntimeService.CopyAsync(channels,devices,AutoRestartThread, default));
-                    await table.QueryAsync();
+                    await InvokeAsync(table.QueryAsync);
 
             }},
             {nameof(ChannelCopyComponent.Model),oneModel },

src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/ChannelDeviceTree.razor.cs

@@ -17,7 +17,6 @@ using SqlSugar;
 
 using ThingsGateway.Admin.Razor;
 using ThingsGateway.Gateway.Application;
-using ThingsGateway.NewLife;
 using ThingsGateway.NewLife.Extension;
 using ThingsGateway.NewLife.Json.Extension;
 
@@ -127,7 +126,7 @@ public partial class ChannelDeviceTree
              {nameof(ChannelEditComponent.OnValidSubmit), async () =>
             {
                 await Task.Run(() =>GlobalData.ChannelRuntimeService.SaveChannelAsync(oneModel,itemChangedType,AutoRestartThread));
-               await Notify();
+               ////await Notify();
             }},
             {nameof(ChannelEditComponent.Model),oneModel },
             {nameof(ChannelEditComponent.ValidateEnable),true },
@@ -175,7 +174,7 @@ public partial class ChannelDeviceTree
             {
 
                 await Task.Run(() =>GlobalData.ChannelRuntimeService.CopyAsync(channels,devices,AutoRestartThread, default));
-                    await Notify();
+                    //await Notify();
 
             }},
             {nameof(ChannelCopyComponent.Model),oneModel },
@@ -252,7 +251,7 @@ public partial class ChannelDeviceTree
                 Spinner.SetRun(true);
                 await Task.Run(() => GlobalData.ChannelRuntimeService.BatchEditAsync(changedModels, oldModel, oneModel,AutoRestartThread));
 
-              await Notify();
+              //await Notify();
                 await InvokeAsync(() =>
                 {
 
@@ -304,7 +303,7 @@ public partial class ChannelDeviceTree
     }
 finally
                 {
-               await Notify();
+               //await Notify();
             await InvokeAsync( ()=>
             {
 
@@ -422,7 +421,7 @@ finally
                 Spinner.SetRun(true);
 
                 await Task.Run(() => GlobalData.ChannelRuntimeService.DeleteChannelAsync(modelIds.Select(a => a.Id), AutoRestartThread, default));
-                await Notify();
+                //await Notify();
                 await InvokeAsync(() =>
                 {
                     Spinner.SetRun(false);
@@ -466,7 +465,7 @@ finally
 
                 var key = await GlobalData.GetCurrentUserChannels().ConfigureAwait(false);
                 await Task.Run(() => GlobalData.ChannelRuntimeService.DeleteChannelAsync(key.Select(a => a.Id), AutoRestartThread, default));
-                await Notify();
+                //await Notify();
                 await InvokeAsync(() =>
                 {
                     Spinner.SetRun(false);
@@ -592,7 +591,7 @@ EventCallback.Factory.Create<MouseEventArgs>(this, async e =>
 
             });
             await Task.Run(() => GlobalData.ChannelRuntimeService.ImportChannelAsync(value, AutoRestartThread));
-            await Notify();
+            //await Notify();
             await InvokeAsync(() =>
             {
                 Spinner.SetRun(false);
@@ -647,7 +646,7 @@ EventCallback.Factory.Create<MouseEventArgs>(this, async e =>
             {
 
                 await Task.Run(() =>GlobalData.DeviceRuntimeService.CopyAsync(devices,AutoRestartThread, default));
-               await Notify();
+               //await Notify();
 
             }},
             {nameof(DeviceCopyComponent.Model),oneModel },
@@ -697,7 +696,7 @@ EventCallback.Factory.Create<MouseEventArgs>(this, async e =>
              {nameof(DeviceEditComponent.OnValidSubmit), async () =>
              {
                  await Task.Run(() =>GlobalData.DeviceRuntimeService.SaveDeviceAsync(oneModel,itemChangedType, AutoRestartThread));
-               await Notify();
+               //await Notify();
             }},
             {nameof(DeviceEditComponent.Model),oneModel },
             {nameof(DeviceEditComponent.AutoRestartThread),AutoRestartThread },
@@ -783,7 +782,7 @@ EventCallback.Factory.Create<MouseEventArgs>(this, async e =>
 
                 });
                 await Task.Run(() =>GlobalData.DeviceRuntimeService.BatchEditAsync(changedModels,oldModel,oneModel,AutoRestartThread));
-                await Notify();
+                //await Notify();
                          await InvokeAsync(() =>
             {
                                 Spinner.SetRun(false);
@@ -832,7 +831,7 @@ EventCallback.Factory.Create<MouseEventArgs>(this, async e =>
     }
 finally
                 {
-                await Notify();
+                //await Notify();
                                  await InvokeAsync( ()=>
             {
 
@@ -955,7 +954,7 @@ EventCallback.Factory.Create<MouseEventArgs>(this, async e =>
                 Spinner.SetRun(true);
 
                 await Task.Run(() => GlobalData.DeviceRuntimeService.DeleteDeviceAsync(modelIds.Select(a => a.Id), AutoRestartThread, default));
-                await Notify();
+                //await Notify();
                 await InvokeAsync(() =>
                 {
                     Spinner.SetRun(false);
@@ -1002,7 +1001,7 @@ EventCallback.Factory.Create<MouseEventArgs>(this, async e =>
                 var data = await GlobalData.GetCurrentUserDevices().ConfigureAwait(false);
 
                 await Task.Run(() => GlobalData.DeviceRuntimeService.DeleteDeviceAsync(data.Select(a => a.Id), AutoRestartThread, default));
-                await Notify();
+                //await Notify();
                 await InvokeAsync(() =>
                 {
                     Spinner.SetRun(false);
@@ -1136,7 +1135,7 @@ EventCallback.Factory.Create<MouseEventArgs>(this, async e =>
             });
 
             await Task.Run(() => GlobalData.DeviceRuntimeService.ImportDeviceAsync(value, AutoRestartThread));
-            await Notify();
+            //await Notify();
             await InvokeAsync(() =>
             {
                 Spinner.SetRun(false);
@@ -1210,6 +1209,8 @@ EventCallback.Factory.Create<MouseEventArgs>(this, async e =>
     private ChannelDeviceTreeItem UnknownItem = new() { ChannelDevicePluginType = ChannelDevicePluginTypeEnum.PluginType, PluginType = null };
 
     private TreeViewItem<ChannelDeviceTreeItem> UnknownTreeViewItem;
+
+    SmartTriggerScheduler? scheduler;
     protected override async Task OnInitializedAsync()
     {
 
@@ -1264,8 +1265,8 @@ EventCallback.Factory.Create<MouseEventArgs>(this, async e =>
 
         Items = ZItem;
         ChannelRuntimeDispatchService.Subscribe(Refresh);
-        DeviceRuntimeDispatchService.Subscribe(Refresh);
 
+        scheduler = new SmartTriggerScheduler(Notify, TimeSpan.FromMilliseconds(3000));
 
         _ = Task.Run(async () =>
         {
@@ -1289,43 +1290,20 @@ EventCallback.Factory.Create<MouseEventArgs>(this, async e =>
         await base.OnInitializedAsync();
     }
 
-    private WaitLock WaitLock = new();
-
-    private volatile bool _isExecuting = false;
 
     private async Task Notify()
     {
-        if (_isExecuting) return;
-        try
+        if (Disposed) return;
+        await OnClickSearch(SearchText);
+
+        Value = GetValue(Value);
+        if (ChannelDeviceChanged != null)
         {
-            await WaitLock.WaitAsync();
-
-            if (_isExecuting) return;
-
-            _isExecuting = true;
-
-            try
-            {
-                if (Disposed) return;
-                await OnClickSearch(SearchText);
-
-                Value = GetValue(Value);
-                if (ChannelDeviceChanged != null)
-                {
-                    await ChannelDeviceChanged.Invoke(Value);
-                }
-                await InvokeAsync(StateHasChanged);
-            }
-            finally
-            {
-                await Task.Delay(1000);
-                _isExecuting = false;
-            }
-        }
-        finally
-        {
-            WaitLock.Release();
+            await ChannelDeviceChanged.Invoke(Value);
         }
+        await InvokeAsync(StateHasChanged);
+
+
     }
 
     private static ChannelDeviceTreeItem GetValue(ChannelDeviceTreeItem channelDeviceTreeItem)
@@ -1354,18 +1332,15 @@ EventCallback.Factory.Create<MouseEventArgs>(this, async e =>
 
 
 
-    private async Task Refresh(DispatchEntry<DeviceRuntime> entry)
+    private Task Refresh(DispatchEntry<ChannelRuntime> entry)
     {
-        await Notify();
+        scheduler.Trigger();
+        return Task.CompletedTask;
     }
-    private async Task Refresh(DispatchEntry<ChannelRuntime> entry)
-    {
-        await Notify();
-    }
-    [Inject]
-    private IDispatchService<DeviceRuntime> DeviceRuntimeDispatchService { get; set; }
+
     [Inject]
     private IDispatchService<ChannelRuntime> ChannelRuntimeDispatchService { get; set; }
+
     private string SearchText;
 
     private async Task<List<TreeViewItem<ChannelDeviceTreeItem>>> OnClickSearch(string searchText)
@@ -1523,7 +1498,6 @@ EventCallback.Factory.Create<MouseEventArgs>(this, async e =>
     {
         Disposed = true;
         ChannelRuntimeDispatchService.UnSubscribe(Refresh);
-        DeviceRuntimeDispatchService.UnSubscribe(Refresh);
         return base.DisposeAsync(disposing);
     }
 

src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Device/DeviceCopyComponent.razor.cs

@@ -10,10 +10,9 @@
 
 using Mapster;
 
+using ThingsGateway.Admin.Application;
 using ThingsGateway.Gateway.Application;
 
-using Yitter.IdGenerator;
-
 namespace ThingsGateway.Gateway.Razor;
 
 public partial class DeviceCopyComponent
@@ -50,14 +49,14 @@ public partial class DeviceCopyComponent
             for (int i = 0; i < CopyCount; i++)
             {
                 Device device = Model.Adapt<Device>();
-                device.Id = YitIdHelper.NextId();
+                device.Id = CommonUtils.GetSingleId();
                 device.Name = $"{CopyDeviceNamePrefix}{CopyDeviceNameSuffixNumber + i}";
                 List<Variable> variables = new();
 
                 foreach (var item in Variables)
                 {
                     Variable v = item.Adapt<Variable>();
-                    v.Id = YitIdHelper.NextId();
+                    v.Id = CommonUtils.GetSingleId();
                     v.DeviceId = device.Id;
                     variables.Add(v);
                 }

src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Device/DeviceRuntimeInfo1.razor.cs

@@ -88,9 +88,9 @@ public partial class DeviceRuntimeInfo1 : IDisposable
         {
             try
             {
+                OnParametersSet();
                 await InvokeAsync(() =>
                 {
-                    OnParametersSet();
                     StateHasChanged();
                 });
             }

src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Device/DeviceTable.razor.cs

@@ -51,7 +51,7 @@ public partial class DeviceTable : IDisposable
             try
             {
                 if (table != null)
-                    await table.QueryAsync();
+                    await InvokeAsync(table.QueryAsync);
             }
             catch (Exception ex)
             {
@@ -59,7 +59,7 @@ public partial class DeviceTable : IDisposable
             }
             finally
             {
-                await Task.Delay(1000);
+                await Task.Delay(5000);
             }
         }
     }
@@ -115,7 +115,7 @@ public partial class DeviceTable : IDisposable
             {
 
                 await Task.Run(() =>GlobalData.DeviceRuntimeService.CopyAsync(devices,AutoRestartThread, default));
-                    await table.QueryAsync();
+                    await InvokeAsync(table.QueryAsync);
 
             }},
             {nameof(DeviceCopyComponent.Model),oneModel },
@@ -353,7 +353,7 @@ finally
                 await InvokeAsync(async () =>
                 {
                     await ToastService.Default();
-                    await InvokeAsync(table.QueryAsync);
+                    await table.QueryAsync();
                 });
             });
         }

src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/GatewayMonitorPage.razor

@@ -24,7 +24,7 @@
         </FirstPaneTemplate>
         <SecondPaneTemplate>
 
-            <div class="h-100 ms-1">
+            <div class="h-100 ms-1" style="display: flex;  flex-direction: column;">
                 <GatewayInfo AutoRestartThread=AutoRestartThread SelectModel=SelectModel ShowChannelRuntime=ShowChannelRuntime ShowDeviceRuntime=ShowDeviceRuntime ShowType=ShowType VariableRuntimes=VariableRuntimes ChannelRuntimes="ChannelRuntimes" DeviceRuntimes="DeviceRuntimes" />
             </div>
 

src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Variable/VariableCopyComponent.razor.cs

@@ -10,10 +10,9 @@
 
 using Mapster;
 
+using ThingsGateway.Admin.Application;
 using ThingsGateway.Gateway.Application;
 
-using Yitter.IdGenerator;
-
 namespace ThingsGateway.Gateway.Razor;
 
 public partial class VariableCopyComponent
@@ -47,7 +46,7 @@ public partial class VariableCopyComponent
                 var variable = Model.Adapt<List<Variable>>();
                 foreach (var item in variable)
                 {
-                    item.Id = YitIdHelper.NextId();
+                    item.Id = CommonUtils.GetSingleId();
                     item.Name = $"{CopyVariableNamePrefix}{CopyVariableNameSuffixNumber + i}";
                     variables.Add(item);
                 }

src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Variable/VariableRuntimeInfo.razor

@@ -21,6 +21,7 @@
             ShowExtendButtons=true
             ShowToolbar="true"
             ShowExportButton
+            IsAutoRefresh
             ShowDefaultButtons=true
             ShowSearch=false
             ExtendButtonColumnWidth=220

src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Variable/VariableRuntimeInfo.razor.cs

@@ -39,11 +39,16 @@ public partial class VariableRuntimeInfo : IDisposable
     public void Dispose()
     {
         Disposed = true;
+        VariableRuntimeDispatchService.UnSubscribe(Refresh);
         GC.SuppressFinalize(this);
     }
 
     protected override void OnInitialized()
     {
+        VariableRuntimeDispatchService.Subscribe(Refresh);
+
+        scheduler = new SmartTriggerScheduler(Notify, TimeSpan.FromMilliseconds(3000));
+
         _ = RunTimerAsync();
         base.OnInitialized();
     }
@@ -62,6 +67,23 @@ public partial class VariableRuntimeInfo : IDisposable
         }
         return Task.FromResult(ret);
     }
+    [Inject]
+    private IDispatchService<VariableRuntime> VariableRuntimeDispatchService { get; set; }
+    private SmartTriggerScheduler scheduler;
+
+
+    private Task Refresh(DispatchEntry<VariableRuntime> entry)
+    {
+        scheduler.Trigger();
+        return Task.CompletedTask;
+    }
+
+    private async Task Notify()
+    {
+        if (Disposed) return;
+        if (table != null)
+            await InvokeAsync(table.QueryAsync);
+    }
 
 
     private async Task RunTimerAsync()
@@ -70,8 +92,10 @@ public partial class VariableRuntimeInfo : IDisposable
         {
             try
             {
-                if (table != null)
-                    await table.QueryAsync();
+                //if (table != null)
+                //    await table.QueryAsync();
+
+                await InvokeAsync(StateHasChanged);
             }
             catch (Exception ex)
             {

src/Gateway/ThingsGateway.Management/Pages/RedundancyOptionsHeader.razor.cs

@@ -31,8 +31,14 @@ public partial class RedundancyOptionsHeader : IDisposable
         {
             while (!Disposed)
             {
-                await InvokeAsync(StateHasChanged);
-                await Task.Delay(3000);
+                try
+                {
+                    await InvokeAsync(StateHasChanged);
+                }
+                finally
+                {
+                    await Task.Delay(3000);
+                }
             }
         });
         return base.OnInitializedAsync();

src/Gateway/ThingsGateway.Management/Pages/RedundancyOptionsPage.razor

@@ -15,7 +15,7 @@
 
         <EditComponent ItemsPerRow=1 Model="Model" OnSave="OnSaveRedundancy" />
 
-        <Button IsDisabled=@(Model.IsMaster) OnClick="ForcedSync">@RedundancyLocalizer["ForcedSync"]</Button>
+        <Button IsDisabled=@(Model.IsMaster||(!Model.Enable)) OnClick="ForcedSync">@RedundancyLocalizer["ForcedSync"]</Button>
     </div>
     <div class="col-12 col-md-6 h-100">
 

src/Gateway/ThingsGateway.Management/Pages/UpdateZipFilePage.razor

@@ -5,26 +5,34 @@
 
 <div class="h-100">
     <DefaultTable TItem="UpdateZipFile"
-                AutoGenerateColumns="true"
-                ShowDefaultButtons=false
-                EditDialogSize="Size.Large"
-                AllowResizing="true"
-                IsFixedHeader=true
-                ShowAddButton="false"
-                ShowRefresh="true"
-                ShowEmpty="true"
-                ShowSearch="false"
-                IsMultipleSelect=false
-                ShowExtendEditButton=false
-                ShowExtendDeleteButton=false
-                ShowExtendButtons=true
-                ShowDeleteButton="false"
-                ShowEditButton="false"
-                ShowAdvancedSearch=false
-                OnQueryAsync="OnQueryAsync">
+                  AutoGenerateColumns="true"
+                  ShowDefaultButtons=false
+                  EditDialogSize="Size.Large"
+                  AllowResizing="true"
+                  IsFixedHeader=true
+                  ShowAddButton="false"
+                  ShowRefresh="true"
+                  ShowEmpty="true"
+                  ShowSearch="false"
+                  IsMultipleSelect=false
+                  ShowExtendEditButton=false
+                  ShowExtendDeleteButton=false
+                  ShowExtendButtons=true
+                  ShowDeleteButton="false"
+                  ShowEditButton="false"
+                  ShowAdvancedSearch=false
+                  OnQueryAsync="OnQueryAsync">
+
+
+
+        @*         <TableToolbarTemplate>
+            <TableToolbarButton TItem="UpdateZipFile" Color="Color.Info" Icon="fa fa-plus" Text="test"
+                                OnClickCallback="a=>ShowInfo(a.FirstOrDefault())" />
+
+        </TableToolbarTemplate> *@
 
         <RowButtonTemplate>
-            <TableCellButton Size="Size.ExtraSmall" Color="Color.Success" Icon="fa-solid fa-people-roof" Text="@ManagementLocalizer["Info"]" OnClick="()=>ShowInfo(context)" />
+            <TableCellButton Size="Size.ExtraSmall" Color="Color.Success" Icon="fa-solid fa-people-roof" Text="@ManagementLocalizer["Info"]" OnClick="() => ShowInfo(context)" />
         </RowButtonTemplate>
 
     </DefaultTable>

src/Gateway/ThingsGateway.RulesEngine/Page/RulesPage.razor.cs

@@ -167,15 +167,15 @@ public partial class RulesPage
 
     private async Task Notify()
     {
-        var current = ExecutionContext.Capture();
         try
         {
-            ExecutionContext.Restore(context);
+            if (table != null)
+                await table.QueryAsync();
             await InvokeAsync(StateHasChanged);
         }
         finally
         {
-            ExecutionContext.Restore(current);
+
         }
     }
 

src/Gateway/ThingsGateway.RulesEngine/Page/RulesStatus.razor

@@ -13,7 +13,7 @@
 {
     <LogConsole LogLevel=@(_rules.Log.LogLevel) LogLevelChanged="(a)=>{
 _rules.Log.LogLevel=a;
-}" LogPath=@_rules.Log.LogPath HeaderText="@_rules.Rules.Name" HeightString="calc(100vh - var(--bs-header-height) - var(--bb-layout-header-height) - 130px)"></LogConsole>
+}" LogPath=@_rules.Log.LogPath HeaderText="@_rules.Rules.Name"></LogConsole>
 }
 
 

src/Gateway/ThingsGateway.RulesEngine/Services/RulesEngineHostedService.cs

@@ -35,9 +35,12 @@ internal sealed class RulesEngineHostedService : BackgroundService, IRulesEngine
     internal const string LogPathFormat = "Logs/RulesEngineLog/{0}";
     internal const string LogDir = "Logs/RulesEngineLog";
     private readonly ILogger _logger;
+    private IDispatchService<Rules> dispatchService;
+
     /// <inheritdoc cref="RulesEngineHostedService"/>
     public RulesEngineHostedService(ILogger<RulesEngineHostedService> logger, IStringLocalizer<RulesEngineHostedService> localizer)
     {
+        dispatchService = App.GetService<IDispatchService<Rules>>();
         _logger = logger;
         Localizer = localizer;
     }
@@ -60,8 +63,7 @@ internal sealed class RulesEngineHostedService : BackgroundService, IRulesEngine
             {
                 var data = Init(rules);
                 await Start(data.rulesLog, data.blazorDiagram, TokenSource.Token).ConfigureAwait(false);
-                var service = App.GetService<IDispatchService<Rules>>();
-                service.Dispatch(new());
+                dispatchService.Dispatch(null);
             }
 
         }
@@ -89,8 +91,7 @@ internal sealed class RulesEngineHostedService : BackgroundService, IRulesEngine
                     BlazorDiagrams.Remove(del.Key);
                 }
             }
-            var service = App.GetService<IDispatchService<Rules>>();
-            service.Dispatch(new());
+            dispatchService.Dispatch(null);
         }
         finally
         {
@@ -198,8 +199,8 @@ internal sealed class RulesEngineHostedService : BackgroundService, IRulesEngine
             var item = Init(rules);
             await Start(item.rulesLog, item.blazorDiagram, cancellationToken).ConfigureAwait(false);
         }
-        var service = App.GetService<IDispatchService<Rules>>();
-        service.Dispatch(new());
+        dispatchService.Dispatch(null);
+
 
         _ = Task.Factory.StartNew(async () =>
         {

src/Plugin/ThingsGateway.Foundation.Modbus/Helper/PackHelper.cs

@@ -51,7 +51,7 @@ public class PackHelper
             // 获取变量的位偏移量
             //if (item.DataType == DataTypeEnum.Boolean)
             item.Index = device.GetBitOffsetDefault(address);
-            if (item.DataType == DataTypeEnum.Byte)
+            if (item.DataType == DataTypeEnum.Byte && !(item.ArrayLength > 1))
                 item.Index += (item.Index % 2 == 0) ? 1 : -1;
         }
 

src/Plugin/ThingsGateway.Plugin.Synchronization/Synchronization/Synchronization.cs

@@ -12,6 +12,7 @@ using Mapster;
 
 using Newtonsoft.Json.Linq;
 
+using ThingsGateway.Admin.Application;
 using ThingsGateway.Extension.Generic;
 using ThingsGateway.Foundation;
 
@@ -60,11 +61,8 @@ public partial class Synchronization : BusinessBase, IRpcDriver
 
     protected override async ValueTask ProtectedExecuteAsync(CancellationToken cancellationToken)
     {
-
         try
         {
-
-
             if (_driverPropertys.IsServer)
             {
                 if (_tcpDmtpService.ServerState != ServerState.Running)
@@ -129,6 +127,7 @@ public partial class Synchronization : BusinessBase, IRpcDriver
 
 
                     // 如果 online 为 true，表示设备在线
+                    if (online)
                     {
                         var deviceRunTimes = CollectDevices.Where(a => a.Value.IsCollect == true).Select(a => a.Value).Adapt<List<DeviceDataWithValue>>();
 
@@ -258,10 +257,7 @@ public partial class Synchronization : BusinessBase, IRpcDriver
                     var data = await _tcpDmtpClient.GetDmtpRpcActor().InvokeTAsync<List<DataWithDatabase>>(
                                        nameof(ReverseCallbackServer.GetData), waitInvoke).ConfigureAwait(false);
 
-                    data.ForEach(a => a.Channel.Enable = false);
-                    await GlobalData.ChannelRuntimeService.CopyAsync(data.Select(a => a.Channel).ToList(), data.SelectMany(a => a.DeviceVariables).ToDictionary(a => a.Device, a => a.Variables), true, cancellationToken).ConfigureAwait(false);
-
-                    LogMessage?.LogTrace($"ForcedSync data success");
+                    await Add(data, cancellationToken).ConfigureAwait(false);
 
                 }
             }
@@ -277,10 +273,10 @@ public partial class Synchronization : BusinessBase, IRpcDriver
                     foreach (var item in _tcpDmtpService.Clients)
                     {
                         var data = await item.GetDmtpRpcActor().InvokeTAsync<List<DataWithDatabase>>(nameof(ReverseCallbackServer.GetData), waitInvoke).ConfigureAwait(false);
-                        data.ForEach(a => a.Channel.Enable = false);
 
-                        await GlobalData.ChannelRuntimeService.CopyAsync(data.Select(a => a.Channel).ToList(), data.SelectMany(a => a.DeviceVariables).ToDictionary(a => a.Device, a => a.Variables), true, cancellationToken).ConfigureAwait(false);
-                        LogMessage?.LogTrace($"{item.GetIPPort()}: ForcedSync data success");
+
+                        await Add(data, cancellationToken).ConfigureAwait(false);
+
                     }
 
                 }
@@ -300,6 +296,27 @@ public partial class Synchronization : BusinessBase, IRpcDriver
         }
 
     }
+    private async Task Add(List<DataWithDatabase> data, CancellationToken cancellationToken)
+    {
+        data.ForEach(a =>
+        {
+            a.Channel.Enable = false;
+            a.Channel.Id = CommonUtils.GetSingleId();
+            a.DeviceVariables.ForEach(b =>
+            {
+                b.Device.ChannelId = a.Channel.Id;
+                b.Device.Id = CommonUtils.GetSingleId();
+                b.Variables.ForEach(c =>
+                {
+                    c.DeviceId = b.Device.Id;
+                    c.Id = 0;
+                });
+            });
+        });
+        await GlobalData.ChannelRuntimeService.CopyAsync(data.Select(a => a.Channel).ToList(), data.SelectMany(a => a.DeviceVariables).ToDictionary(a => a.Device, a => a.Variables), true, cancellationToken).ConfigureAwait(false);
+
+        LogMessage?.LogTrace($"ForcedSync data success");
+    }
 
     /// <summary>
     /// 异步写入方法
@@ -321,12 +338,12 @@ public partial class Synchronization : BusinessBase, IRpcDriver
         {
             if (deviceDatas.TryGetValue(item.Key.DeviceName ?? string.Empty, out var variableDatas))
             {
-                variableDatas.Add(item.Key.Name, item.Value?.ToString() ?? string.Empty);
+                variableDatas.TryAdd(item.Key.Name, item.Value?.ToString() ?? string.Empty);
             }
             else
             {
-                deviceDatas.Add(item.Key.DeviceName ?? string.Empty, new());
-                deviceDatas[item.Key.DeviceName ?? string.Empty].Add(item.Key.Name, item.Value?.ToString() ?? string.Empty);
+                deviceDatas.TryAdd(item.Key.DeviceName ?? string.Empty, new());
+                deviceDatas[item.Key.DeviceName ?? string.Empty].TryAdd(item.Key.Name, item.Value?.ToString() ?? string.Empty);
             }
         }
 
@@ -383,7 +400,7 @@ public partial class Synchronization : BusinessBase, IRpcDriver
                                 try
                                 {
 
-                                    var data = await _tcpDmtpClient.GetDmtpRpcActor().InvokeTAsync<Dictionary<string, Dictionary<string, OperResult<object>>>>(
+                                    var data = await client.GetDmtpRpcActor().InvokeTAsync<Dictionary<string, Dictionary<string, OperResult<object>>>>(
                                                          nameof(ReverseCallbackServer.Rpc), waitInvoke, new Dictionary<string, Dictionary<string, string>>() { { item.Key, item.Value } }).ConfigureAwait(false);
 
                                     dataResult.AddRange(data);
@@ -396,7 +413,7 @@ public partial class Synchronization : BusinessBase, IRpcDriver
 
                                     foreach (var vItem in item.Value)
                                     {
-                                        dataResult[item.Key].Add(vItem.Key, new OperResult<object>(ex));
+                                        dataResult[item.Key].TryAdd(vItem.Key, new OperResult<object>(ex));
                                     }
                                 }
                             }
@@ -407,7 +424,7 @@ public partial class Synchronization : BusinessBase, IRpcDriver
 
                         foreach (var vItem in item.Value)
                         {
-                            dataResult[item.Key].Add(vItem.Key, new OperResult<object>("No online"));
+                            dataResult[item.Key].TryAdd(vItem.Key, new OperResult<object>("No online"));
                         }
                     }
 

src/Plugin/ThingsGateway.Plugin.Synchronization/Synchronization/SynchronizationProperty.cs

@@ -15,7 +15,7 @@ namespace ThingsGateway.Plugin.Synchronization;
 /// <summary>
 /// <inheritdoc/>
 /// </summary>
-public class SynchronizationProperty : BusinessPropertyBase
+public class SynchronizationProperty : BusinessPropertyBase, IBusinessPropertyAllVariableBase
 {
     [DynamicProperty]
     public bool IsServer { get; set; } = true;

src/ThingsGateway.Photino/Startup.cs

@@ -37,7 +37,6 @@ using ThingsGateway.Debug;
 using ThingsGateway.Extension;
 using ThingsGateway.Gateway.Application;
 using ThingsGateway.NewLife.Caching;
-using ThingsGateway.NewLife.Extension;
 
 namespace ThingsGateway.Server;
 
@@ -138,7 +137,8 @@ public class Startup : AppStartup
         {
             options.WriteFilter = (logMsg) =>
             {
-                if (logMsg.Message.IsNullOrEmpty()) return false;
+                if (App.HostApplicationLifetime.ApplicationStopping.IsCancellationRequested && logMsg.LogLevel >= LogLevel.Warning) return false;
+                if (string.IsNullOrEmpty(logMsg.Message)) return false;
                 else return true;
             };
 

src/ThingsGateway.Server/Program/Startup.cs

@@ -29,7 +29,6 @@ using ThingsGateway.Admin.Application;
 using ThingsGateway.Admin.Razor;
 using ThingsGateway.Extension;
 using ThingsGateway.NewLife.Caching;
-using ThingsGateway.NewLife.Extension;
 
 namespace ThingsGateway.Server;
 
@@ -162,7 +161,8 @@ public class Startup : AppStartup
         {
             options.WriteFilter = (logMsg) =>
             {
-                if (logMsg.Message.IsNullOrEmpty()) return false;
+                if (App.HostApplicationLifetime.ApplicationStopping.IsCancellationRequested && logMsg.LogLevel >= LogLevel.Warning) return false;
+                if (string.IsNullOrEmpty(logMsg.Message)) return false;
                 else return true;
             };
 

src/Upgrade/ThingsGateway.UpgradeServer/Program/Startup.cs

@@ -157,6 +157,7 @@ public class Startup : AppStartup
         {
             options.WriteFilter = (logMsg) =>
             {
+                if (App.HostApplicationLifetime.ApplicationStopping.IsCancellationRequested && logMsg.LogLevel >= LogLevel.Warning) return false;
                 if (string.IsNullOrEmpty(logMsg.Message)) return false;
                 else return true;
             };

src/Version.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>10.6.26</Version>
+    <Version>10.6.32</Version>
   </PropertyGroup>
 
   <ItemGroup>