!71 适配远程客户端

.gitignore

@@ -364,6 +364,7 @@ FodyWeavers.xsd
 
 /src/*Pro*/
 /src/*Pro*
+/src/**/*Pro*
 /src/*pro*
 /src/*pro*/
 /src/ThingsGateway.Server/Configuration/GiteeOAuthSettings.json

src/Admin/BlazorSetParametersAsyncGenerator/BlazorSetParametersAsyncGenerator.csproj

@@ -11,6 +11,7 @@
 		<IncludeBuildOutput>false</IncludeBuildOutput>
 		<!-- 避免 DLL 被打包到 lib/ -->
 		<EnableSourceGenerator>true</EnableSourceGenerator>
+		
 		<!-- 可选 -->
 
 		

src/Admin/ThingsGateway.Admin.Application/Controller/FileController.cs

@@ -39,7 +39,7 @@ public class FileController : ControllerBase
         var filePath = Path.Combine(wwwroot, fileName);
         // 防止路径穿越攻击
 #pragma warning disable CA3003
-        if (!filePath.StartsWith(wwwroot, StringComparison.OrdinalIgnoreCase) || !System.IO.File.Exists(filePath))
+        if (filePath.Contains("..") || !System.IO.File.Exists(filePath))
         {
             return NotFound();
         }
@@ -49,6 +49,6 @@ public class FileController : ControllerBase
 
         Response.Headers.Append("Access-Control-Expose-Headers", "Content-Disposition");
 
-        return File(fileStream, "application/octet-stream", (fileName.Replace('/', '_')));
+        return File(fileStream, "application/octet-stream", (Path.GetFileName(filePath).Replace('/', '_')));
     }
 }

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

@@ -21,16 +21,7 @@
     "UserNoModule": "This account has not been assigned a module. Please contact the administrator",
     "UserNull": "User {0} does not exist"
   },
-  "ThingsGateway.Admin.Application.BaseDataEntity": {
-    "CreateOrgId": "CreateOrgId"
-  },
-  "ThingsGateway.Admin.Application.BaseEntity": {
-    "CreateTime": "CreateTime",
-    "CreateUser": "CreateUser",
-    "SortCode": "SortCode",
-    "UpdateTime": "UpdateTime",
-    "UpdateUser": "UpdateUser"
-  },
+  
   "ThingsGateway.Admin.Application.BlazorAuthenticationHandler": {
     "UserExpire": "User expired, please login again"
   },

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

@@ -21,16 +21,7 @@
     "UserNoModule": "该账号未分配模块,请联系管理员",
     "UserNull": "用户 {0} 不存在"
   },
-  "ThingsGateway.Admin.Application.BaseDataEntity": {
-    "CreateOrgId": "创建机构Id"
-  },
-  "ThingsGateway.Admin.Application.BaseEntity": {
-    "CreateTime": "创建时间",
-    "CreateUser": "创建人",
-    "SortCode": "排序",
-    "UpdateTime": "更新时间",
-    "UpdateUser": "更新人"
-  },
+
   "ThingsGateway.Admin.Application.BlazorAuthenticationHandler": {
     "UserExpire": "用户登录已过期，请重新登录"
   },

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

@@ -5,6 +5,7 @@
 
 	<PropertyGroup>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
+		
 	</PropertyGroup>
 	<PropertyGroup>
 		<TargetFrameworks>net8.0;net9.0;</TargetFrameworks>

src/Admin/ThingsGateway.Admin.Razor/Context/BlazorAppContext.cs

@@ -30,7 +30,7 @@ public class BlazorAppContext
     /// <summary>
     /// 全部菜单
     /// </summary>
-    public IEnumerable<SysResource> AllMenus { get; private set; }
+    public List<SysResource> AllMenus { get; private set; }
 
     /// <summary>
     /// 当前用户
@@ -42,22 +42,22 @@ public class BlazorAppContext
     /// <summary>
     /// 用户个人菜单
     /// </summary>
-    public IEnumerable<MenuItem> OwnMenuItems { get; private set; }
+    public List<MenuItem> OwnMenuItems { get; private set; }
 
     /// <summary>
     /// 不同模块的菜单
     /// </summary>
-    public IEnumerable<MenuItem> AllOwnMenuItems { get; private set; }
+    public List<MenuItem> AllOwnMenuItems { get; private set; }
 
     /// <summary>
     /// 用户个人菜单，多个模块
     /// </summary>
-    public IEnumerable<SysResource> OwnMenus { get; private set; }
+    public List<SysResource> OwnMenus { get; private set; }
 
     /// <summary>
     /// 用户个人菜单，非树形
     /// </summary>
-    public IEnumerable<MenuItem> OwnSameLevelMenuItems { get; private set; }
+    public List<MenuItem> OwnSameLevelMenuItems { get; private set; }
 
     /// <summary>
     /// 个人工作台
@@ -67,9 +67,9 @@ public class BlazorAppContext
     /// <summary>
     /// 用户个人快捷方式菜单
     /// </summary>
-    public IEnumerable<SysResource> UserWorkbenchOutputs { get; private set; }
+    public List<SysResource> UserWorkbenchOutputs { get; private set; }
 
-    public IEnumerable<SysResource> AllResource { get; private set; }
+    public List<SysResource> AllResource { get; private set; }
 
     private ISysResourceService ResourceService { get; }
     private ISysUserService SysUserService { get; }
@@ -93,7 +93,7 @@ public class BlazorAppContext
             AllResource = sysResources;
             var ids = CurrentUser.ModuleList.Select(a => a.Id).ToHashSet();
             CurrentUser.ModuleList = AllResource.Where(a => ids.Contains(a.Id)).OrderBy(a => a.SortCode).ToList();
-            AllMenus = AllResource.Where(a => a.Category == ResourceCategoryEnum.Menu);
+            AllMenus = AllResource.Where(a => a.Category == ResourceCategoryEnum.Menu).ToList();
 
             if (moduleId == null)
             {
@@ -123,8 +123,8 @@ public class BlazorAppContext
                 }
             }
             var ownMenus = OwnMenus.Where(a => a.Module == CurrentModuleId);
-            OwnMenuItems = ResourceUtil.BuildMenuTrees(ownMenus).ToList();
-            AllOwnMenuItems = ResourceUtil.BuildMenuTrees(OwnMenus).ToList();
+            OwnMenuItems = AdminResourceUtil.BuildMenuTrees(ownMenus).ToList();
+            AllOwnMenuItems = AdminResourceUtil.BuildMenuTrees(OwnMenus).ToList();
             OwnSameLevelMenuItems = ownMenus.Where(a => !a.Href.IsNullOrWhiteSpace()).Select(item => new MenuItem()
             {
                 Match = item.NavLinkMatch ?? Microsoft.AspNetCore.Components.Routing.NavLinkMatch.All,
@@ -132,8 +132,8 @@ public class BlazorAppContext
                 Icon = item.Icon,
                 Url = item.Href,
                 Target = item.Target.ToString(),
-            });
-            UserWorkbenchOutputs = AllMenus.Where(it => UserWorkBench.Shortcuts.Contains(it.Id));
+            }).ToList();
+            UserWorkbenchOutputs = AllMenus.Where(it => UserWorkBench.Shortcuts.Contains(it.Id)).ToList();
         }
     }
 

src/Admin/ThingsGateway.Admin.Razor/Pages/AppConfig/EditPagePolicy.razor.cs

@@ -29,7 +29,7 @@ public partial class EditPagePolicy
 
     protected override Task OnParametersSetAsync()
     {
-        ShortcutsTreeViewItems = ResourceUtil.BuildTreeItemList(AppContext.OwnMenus.WhereIf(!ShortcutsSearchText.IsNullOrEmpty(), a => a.Title.Contains(ShortcutsSearchText)), Model.Shortcuts, null);
+        ShortcutsTreeViewItems = AdminResourceUtil.BuildTreeItemList(AppContext.OwnMenus.WhereIf(!ShortcutsSearchText.IsNullOrEmpty(), a => a.Title.Contains(ShortcutsSearchText)), Model.Shortcuts, null);
         return base.OnParametersSetAsync();
     }
 
@@ -48,6 +48,6 @@ public partial class EditPagePolicy
     {
         await Task.CompletedTask;
         ShortcutsSearchText = searchText;
-        return ResourceUtil.BuildTreeItemList(AppContext.OwnMenus.WhereIf(!ShortcutsSearchText.IsNullOrEmpty(), a => a.Title.Contains(ShortcutsSearchText)), Model.Shortcuts, null);
+        return AdminResourceUtil.BuildTreeItemList(AppContext.OwnMenus.WhereIf(!ShortcutsSearchText.IsNullOrEmpty(), a => a.Title.Contains(ShortcutsSearchText)), Model.Shortcuts, null);
     }
 }

src/Admin/ThingsGateway.Admin.Razor/Pages/Resource/MenuChoiceDialog.razor.cs

@@ -41,7 +41,7 @@ public partial class MenuChoiceDialog
         var all = (await SysResourceService.GetAllAsync());
         var items = all.Where(a => a.Category == ResourceCategoryEnum.Menu && a.Module == ModuleId);
         ModuleTitle = all.FirstOrDefault(a => a.Id == ModuleId)?.Title;
-        Items = ResourceUtil.BuildTreeItemList(items, new List<long> { Value }, RenderTreeItem);
+        Items = AdminResourceUtil.BuildTreeItemList(items, new List<long> { Value }, RenderTreeItem);
         await base.OnParametersSetAsync();
     }
 

src/Admin/ThingsGateway.Admin.Razor/Pages/Resource/SysResourcePage.razor.cs

@@ -39,8 +39,8 @@ public partial class SysResourcePage
 
     protected override async Task OnParametersSetAsync()
     {
-        ModuleSelectedItems = ResourceUtil.BuildModuleSelectList((await SysResourceService.GetAllAsync())).ToList();
-        MenuItems = ResourceUtil.BuildMenuSelectList((await SysResourceService.GetAllAsync())).Concat(new List<SelectedItem>() { new("0", AdminLocalizer["Root"]) }).ToList();
+        ModuleSelectedItems = AdminResourceUtil.BuildModuleSelectList((await SysResourceService.GetAllAsync())).ToList();
+        MenuItems = AdminResourceUtil.BuildMenuSelectList((await SysResourceService.GetAllAsync())).Concat(new List<SelectedItem>() { new("0", AdminLocalizer["Root"]) }).ToList();
 
         await base.OnParametersSetAsync();
     }
@@ -49,7 +49,7 @@ public partial class SysResourcePage
 
     private async Task<QueryData<SysResource>> OnQueryAsync(QueryPageOptions options)
     {
-        MenuTreeItems = new List<TreeViewItem<SysResource>>() { new TreeViewItem<SysResource>(new SysResource()) { Text = AdminLocalizer["Root"] } }.Concat(ResourceUtil.BuildTreeItemList((await SysResourceService.GetAllAsync()).Where(a => a.Module == CustomerSearchModel.Module), new(), null)).ToList();
+        MenuTreeItems = new List<TreeViewItem<SysResource>>() { new TreeViewItem<SysResource>(new SysResource()) { Text = AdminLocalizer["Root"] } }.Concat(AdminResourceUtil.BuildTreeItemList((await SysResourceService.GetAllAsync()).Where(a => a.Module == CustomerSearchModel.Module), new(), null)).ToList();
 
         var data = await SysResourceService.PageAsync(options, CustomerSearchModel);
         return data;
@@ -136,14 +136,14 @@ public partial class SysResourcePage
     private async Task<IEnumerable<TableTreeNode<SysResource>>> OnTreeExpand(SysResource menu)
     {
         var sysResources = await SysResourceService.GetAllAsync();
-        var result = ResourceUtil.BuildTableTrees(sysResources, menu.Id);
+        var result = AdminResourceUtil.BuildTableTrees(sysResources, menu.Id);
         return result;
     }
 
     private static async Task<IEnumerable<TableTreeNode<SysResource>>> TreeNodeConverter(IEnumerable<SysResource> items)
     {
         await Task.CompletedTask;
-        var result = ResourceUtil.BuildTableTrees(items, 0);
+        var result = AdminResourceUtil.BuildTableTrees(items, 0);
         return result;
     }
 

src/Admin/ThingsGateway.Admin.Razor/Pages/User/GrantResourceDialog.razor.cs

@@ -35,7 +35,7 @@ public partial class GrantResourceDialog
     {
         var items = (await SysResourceService.GetAllAsync()).Where(a => a.Category != ResourceCategoryEnum.Module).OrderBy(a => a.Module).ThenBy(a => a.Id).ToList();
 
-        Items = ResourceUtil.BuildTreeItemList(items, Value, RenderTreeItem);
+        Items = AdminResourceUtil.BuildTreeItemList(items, Value, RenderTreeItem);
         ModuleList = (await SysResourceService.GetAllAsync()).Where(a => a.Category == ResourceCategoryEnum.Module).ToList();
         await base.OnInitializedAsync();
     }

src/Admin/ThingsGateway.Admin.Razor/Pages/User/SysUserEdit.razor.cs

@@ -35,7 +35,7 @@ public partial class SysUserEdit
         BoolItems = LocalizerUtil.GetBoolItems(Model.GetType(), nameof(Model.Status));
         var items = await SysPositionService.SelectorAsync(new PositionSelectorInput());
         Items = PositionUtil.BuildCascaderItemList(items);
-        ModuleSelectedItems = ResourceUtil.BuildModuleSelectList((await SysResourceService.GetAllAsync())).ToList();
+        ModuleSelectedItems = AdminResourceUtil.BuildModuleSelectList((await SysResourceService.GetAllAsync())).ToList();
         await InvokeAsync(StateHasChanged);
         await base.OnInitializedAsync();
     }

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

@@ -18,6 +18,7 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+		
 		<!--<UseRazorSourceGenerator>false</UseRazorSourceGenerator>-->
 	</PropertyGroup>
 	<ItemGroup>

src/Admin/ThingsGateway.Admin.Razor/Util/AdminResourceUtil.cs

@@ -14,7 +14,7 @@ namespace ThingsGateway.Admin.Razor;
 
 /// <inheritdoc/>
 [ThingsGateway.DependencyInjection.SuppressSniffer]
-public static class ResourceUtil
+public static class AdminResourceUtil
 {
     /// <summary>
     /// 构造选择项，ID/TITLE

src/Admin/ThingsGateway.AdminServer/Dockerfile

@@ -5,7 +5,8 @@
 #推送：docker push registry.cn-shenzhen.aliyuncs.com/thingsgateway/thingsgateway
 
 #aspnetcore9.0环境
-FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
+#FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:8.0-noble AS base
 COPY .  /app
 WORKDIR /app
 #默认web
@@ -13,6 +14,8 @@ EXPOSE 5000
 
 # 添加时区环境变量，亚洲，上海
 ENV TimeZone=Asia/Shanghai
+# 转发头
+ENV ASPNETCORE_FORWARDEDHEADERS_ENABLED=true
 # 使用软连接，并且将时区配置覆盖/etc/timezone
 RUN ln -snf /usr/share/zoneinfo/$TimeZone /etc/localtime && echo $TimeZone > /etc/timezone
 

src/Admin/ThingsGateway.AdminServer/Dockerfile_arm64

@@ -5,7 +5,8 @@
 #推送：docker push registry.cn-shenzhen.aliyuncs.com/thingsgateway/thingsgateway_arm64
 
 #aspnetcore9.0环境
-FROM mcr.microsoft.com/dotnet/aspnet:9.0-alpine-arm64v8  AS base
+#FROM mcr.microsoft.com/dotnet/aspnet:9.0-alpine-arm64v8  AS base
+FROM mcr.microsoft.com/dotnet/aspnet:8.0-noble-arm64v8 AS base
 COPY .  /app
 WORKDIR /app
 #默认web
@@ -13,6 +14,8 @@ EXPOSE 5000
 
 # 添加时区环境变量，亚洲，上海
 ENV TimeZone=Asia/Shanghai
+# 转发头
+ENV ASPNETCORE_FORWARDEDHEADERS_ENABLED=true
 # 使用软连接，并且将时区配置覆盖/etc/timezone
 RUN ln -snf /usr/share/zoneinfo/$TimeZone /etc/localtime && echo $TimeZone > /etc/timezone
 

src/Admin/ThingsGateway.AdminServer/Layout/BlazorApp.razor

@@ -39,7 +39,7 @@
     <BlazorReconnector @rendermode="new InteractiveServerRenderMode(false)" />
 
     <script src=@($"_content/BootstrapBlazor/js/bootstrap.blazor.bundle.min.js?v={this.GetType().Assembly.GetName().Version}")></script>
-    <script src=@($"{WebsiteConst.DefaultResourceUrl}js/culture.js?v={this.GetType().Assembly.GetName().Version}")></script>
+    <script src=@($"{WebsiteConst.DefaultResourceUrl}js/localStorageUtil.js?v={this.GetType().Assembly.GetName().Version}")></script>
     <script src="_framework/blazor.web.js"></script>
     <!-- PWA Service Worker -->
     <script type="text/javascript">'serviceWorker' in navigator && navigator.serviceWorker.register('./service-worker.js')</script>

src/Admin/ThingsGateway.AdminServer/Pages/_Host.cshtml

@@ -45,7 +45,7 @@
     </app>
     
     <script src="_content/BootstrapBlazor/js/bootstrap.blazor.bundle.min.js"></script>
-    <script src=@($"{WebsiteConst.DefaultResourceUrl}js/culture.js")></script>
+    <script src=@($"{WebsiteConst.DefaultResourceUrl}js/localStorageUtil.js")></script>
     <script src="_framework/blazor.server.js"></script>
 
        <!-- PWA Service Worker -->

src/Admin/ThingsGateway.AdminServer/ThingsGateway.AdminServer.csproj

@@ -5,6 +5,7 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>net8.0;net9.0;</TargetFrameworks>
+		
 	</PropertyGroup>
 
 	<!--<Import Project="Admin.targets" Condition=" '$(Configuration)' != 'Debug' " />-->

src/Admin/ThingsGateway.Common/ThingsGateway.Common.csproj

@@ -5,6 +5,7 @@
 
 	<PropertyGroup>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
+		
 	</PropertyGroup>
 	<PropertyGroup>
 		<TargetFrameworks>net8.0;net9.0;</TargetFrameworks>

src/Admin/ThingsGateway.DB/Extensions/QueryPageOptionsExtensions.cs

@@ -53,6 +53,8 @@ public static class QueryPageOptionsExtensions
         return datas;
     }
 
+
+
     public static IEnumerable<T> GetQuery<T>(this IEnumerable<T> query, QueryPageOptions option, Func<IEnumerable<T>, IEnumerable<T>>? queryFunc = null, FilterKeyValueAction where = null)
     {
         if (queryFunc != null)
@@ -135,4 +137,24 @@ public static class QueryPageOptionsExtensions
         ret.Items = items.ToList();
         return ret;
     }
+
+    /// <summary>
+    /// 根据查询条件返回QueryData
+    /// </summary>
+    public static QueryData<SelectedItem> GetQueryData<T>(this IEnumerable<T> datas, VirtualizeQueryOption option, Func<IEnumerable<T>, IEnumerable<SelectedItem>> func, FilterKeyValueAction where = null)
+    {
+        var ret = new QueryData<SelectedItem>()
+        {
+            IsSorted = false,
+            IsFiltered = false,
+            IsAdvanceSearch = false,
+            IsSearch = !option.SearchText.IsNullOrWhiteSpace()
+        };
+
+        var items = datas.Skip((option.StartIndex)).Take(option.Count);
+        ret.TotalCount = datas.Count();
+
+        ret.Items = func(items).ToList();
+        return ret;
+    }
 }

src/Admin/ThingsGateway.DB/Locales/en-US.json

@@ -0,0 +1,13 @@
+{
+ 
+  "ThingsGateway.Admin.Application.BaseDataEntity": {
+    "CreateOrgId": "CreateOrgId"
+  },
+  "ThingsGateway.Admin.Application.BaseEntity": {
+    "CreateTime": "CreateTime",
+    "CreateUser": "CreateUser",
+    "SortCode": "SortCode",
+    "UpdateTime": "UpdateTime",
+    "UpdateUser": "UpdateUser"
+  }
+}

src/Admin/ThingsGateway.DB/Locales/zh-CN.json

@@ -0,0 +1,13 @@
+{
+  
+  "ThingsGateway.DB.BaseDataEntity": {
+    "CreateOrgId": "创建机构Id"
+  },
+  "ThingsGateway.DB.BaseEntity": {
+    "CreateTime": "创建时间",
+    "CreateUser": "创建人",
+    "SortCode": "排序",
+    "UpdateTime": "更新时间",
+    "UpdateUser": "更新人"
+  }
+}

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

@@ -5,6 +5,7 @@
 
 	<PropertyGroup>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
+		
 	</PropertyGroup>
 	<PropertyGroup>
 		<TargetFrameworks>net8.0;net9.0;</TargetFrameworks>
@@ -18,6 +19,12 @@
 		<None Remove="..\..\..\README.zh-CN.md" Pack="false" PackagePath="\" />
 	</ItemGroup>
 
+
+	<ItemGroup>
+	  <EmbeddedResource Include="Locales\en-US.json" />
+	  <EmbeddedResource Include="Locales\zh-CN.json" />
+	</ItemGroup>
+
 	<ItemGroup>
 		<!--<PackageReference Include="ThingsGateway.Razor" Version="$(SourceGeneratorVersion)" />-->
 		<!--<ProjectReference Include="..\ThingsGateway.Razor\ThingsGateway.Razor.csproj" />-->

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

@@ -554,10 +554,9 @@ public static class App
         {
             types = ass.GetTypes();
         }
-        catch
+        catch (Exception ex)
         {
-            XTrace.Log.Warn($"Error load `{ass.FullName}` assembly.");
-            Console.WriteLine($"Error load `{ass.FullName}` assembly.");
+            XTrace.Log.Warn($"Error load `{ass.FullName}` assembly. : {ex.Message}");
         }
 
         return types.Where(u => u.IsPublic && !u.IsDefined(typeof(SuppressSnifferAttribute), false));

src/Admin/ThingsGateway.Furion/ThingsGateway.Furion.csproj

@@ -5,6 +5,7 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>net8.0;net9.0;</TargetFrameworks>
+		
 	</PropertyGroup>
 	
 	<PropertyGroup>

src/Admin/ThingsGateway.NewLife.X/ThingsGateway.NewLife.X.csproj

@@ -12,6 +12,7 @@
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<SignAssembly>True</SignAssembly>
 		<AssemblyOriginatorKeyFile>newlife.snk</AssemblyOriginatorKeyFile>
+		
 
 
 	</PropertyGroup>

src/Admin/ThingsGateway.Photino.Blazor/ThingsGateway.Photino.Blazor.csproj

@@ -4,6 +4,7 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>net8.0;net9.0;</TargetFrameworks>
+		
 	</PropertyGroup>
 	
 	<ItemGroup>

src/Admin/ThingsGateway.Razor/Components/CultureChooser.razor.cs

@@ -8,8 +8,8 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using ThingsGateway.Common.Extension;
 using ThingsGateway.NewLife;
+using ThingsGateway.Razor.Extension;
 
 namespace ThingsGateway.Razor;
 

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

@@ -5,7 +5,7 @@
 <Step @ref="@step" IsVertical="true">
     <StepItem Text=@Localizer["First"] Title=@Localizer["Upload"]>
         <InputUpload ShowDeleteButton="true" @bind-Value=_importFile Accept=".xlsx"></InputUpload>
-        <Button class="mt-2" IsAsync OnClick="() => DeviceImport(_importFile)">@Localizer["Validate"]</Button>
+        <PopConfirmButton IsAsync Color=Color.Warning class="mt-2" OnConfirm=@(SaveDeviceImport)>@Localizer["Import"]</PopConfirmButton>
     </StepItem>
     <StepItem Text=@Localizer["Second"] Title=@Localizer["ValidateText"]>
 
@@ -41,16 +41,12 @@
 
             }
 
-            <PopConfirmButton IsAsync IsDisabled=@_importPreviews.Any(it => it.Value.HasError) Color=Color.Warning class="mt-2" OnConfirm=@(SaveDeviceImport)>@Localizer["Import"]</PopConfirmButton>
+            <Button class="mt-2" IsAsync OnClick="() => DeviceImport()">@RazorLocalizer["Close"]</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"]>
-        <PopConfirmButton IsAsync Color=Color.Warning class="mt-2" OnConfirm=@(SaveDeviceImport)>@Localizer["Import"]</PopConfirmButton>
-    </StepItem> *@
+
 </Step>
 @code {
     [NotNull]

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

@@ -24,18 +24,17 @@ public partial class ImportExcel
     /// </summary>
     [Parameter]
     [EditorRequired]
-    public Func<Dictionary<string, ImportPreviewOutputBase>, Task> Import { get; set; }
+    public Func<IBrowserFile, Task<Dictionary<string, ImportPreviewOutputBase>>> Import { get; set; }
 
     [Inject]
     [NotNull]
     private IStringLocalizer<ImportExcel>? Localizer { get; set; }
 
-    /// <summary>
-    /// 预览
-    /// </summary>
-    [Parameter]
-    [EditorRequired]
-    public Func<IBrowserFile, Task<Dictionary<string, ImportPreviewOutputBase>>> Preview { get; set; }
+    [Inject]
+    [NotNull]
+    private IStringLocalizer<ThingsGateway.Razor._Imports>? RazorLocalizer { get; set; }
+
+
 
     [Inject]
     [NotNull]
@@ -47,13 +46,17 @@ public partial class ImportExcel
     [CascadingParameter]
     private Func<Task>? OnCloseAsync { get; set; }
 
-    private async Task DeviceImport(IBrowserFile file)
+    private async Task DeviceImport()
     {
         try
         {
             _importPreviews.Clear();
-            _importPreviews = await Preview.Invoke(file);
-            await step.Next();
+            await InvokeAsync(async () =>
+            {
+                if (OnCloseAsync != null)
+                    await OnCloseAsync();
+                await ToastService.Default();
+            });
         }
         catch (Exception ex)
         {
@@ -67,16 +70,12 @@ public partial class ImportExcel
         {
             await Task.Run(async () =>
             {
-                await Import.Invoke(_importPreviews);
+                _importPreviews = await Import.Invoke(_importFile);
                 _importFile = null;
 
-                await InvokeAsync(async () =>
-                {
-                    if (OnCloseAsync != null)
-                        await OnCloseAsync();
-                    await ToastService.Default();
-                });
             });
+            await step.Next();
+
         }
         catch (Exception ex)
         {

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

@@ -0,0 +1,58 @@
+@using ThingsGateway.Extension
+@namespace ThingsGateway.Razor
+<Button OnClick="() => step.Reset()">@Localizer["Reset"]</Button>
+<h6 class="my-3 green--text">@Localizer["Tip"] </h6>
+<Step @ref="@step" IsVertical="true">
+    <StepItem Text=@Localizer["First"] Title=@Localizer["Upload"]>
+        <InputUpload ShowDeleteButton="true" @bind-Value=_importFile Accept=".xlsx"></InputUpload>
+        <Button class="mt-2" IsAsync OnClick="() => DeviceImport(_importFile)">@Localizer["Validate"]</Button>
+    </StepItem>
+    <StepItem Text=@Localizer["Second"] Title=@Localizer["ValidateText"]>
+
+        <div class="overflow-y-auto">
+
+            @foreach (var item in _importPreviews)
+            {
+                <div class="mt-2">
+                    @(
+                                    Localizer["UploadCount", item.Key, item.Value.DataCount]
+                                    )
+                </div>
+                <div class=@((item.Value.HasError ? "my-2 red--text" : "my-2 green--text"))>
+                    @(
+                                    (item.Value.HasError ? "Error" : "Success")
+                                    )
+            </div>
+                        if (item.Value.HasError)
+                {
+                    <div style="height:300px;" class="overflow-y-scroll">
+                        <Virtualize Items="item.Value.Results.Where(a => !a.Success).OrderBy(a => a.Row).ToList()" Context="item1" ItemSize="60" OverscanCount=2>
+                            <ItemContent>
+                                <div class="row g-0">
+                                    <span class="col mx-2">@item1.Row</span>
+                                    <span class=@((item1.Success ? "green--text col-auto" : "red--text col-auto"))>
+                                        <strong>@item1.ErrorMessage</strong>
+                                    </span>
+                                </div>
+                            </ItemContent>
+                        </Virtualize>
+                    </div>
+                }
+
+            }
+
+            <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> *@
+
+        </div>
+    </StepItem>
+@*     <StepItem Text=@Localizer["Third"] Title=@Localizer["Import"]>
+        <PopConfirmButton IsAsync Color=Color.Warning class="mt-2" OnConfirm=@(SaveDeviceImport)>@Localizer["Import"]</PopConfirmButton>
+    </StepItem> *@
+</Step>
+@code {
+    [NotNull]
+    Step? step { get; set; }
+}

src/Admin/ThingsGateway.Razor/Components/ImportExcelConfirm.razor.cs

@@ -0,0 +1,86 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+using Microsoft.AspNetCore.Components.Forms;
+
+using System.ComponentModel.DataAnnotations;
+
+namespace ThingsGateway.Razor;
+
+/// <inheritdoc/>
+public partial class ImportExcelConfirm
+{
+    private Dictionary<string, ImportPreviewOutputBase> _importPreviews = new();
+
+    /// <summary>
+    /// 导入
+    /// </summary>
+    [Parameter]
+    [EditorRequired]
+    public Func<Dictionary<string, ImportPreviewOutputBase>, Task> Import { get; set; }
+
+    [Inject]
+    [NotNull]
+    private IStringLocalizer<ImportExcelConfirm>? Localizer { get; set; }
+
+    /// <summary>
+    /// 预览
+    /// </summary>
+    [Parameter]
+    [EditorRequired]
+    public Func<IBrowserFile, Task<Dictionary<string, ImportPreviewOutputBase>>> Preview { get; set; }
+
+    [Inject]
+    [NotNull]
+    private ToastService? ToastService { get; set; }
+
+    [Required]
+    private IBrowserFile _importFile { get; set; }
+
+    [CascadingParameter]
+    private Func<Task>? OnCloseAsync { get; set; }
+
+    private async Task DeviceImport(IBrowserFile file)
+    {
+        try
+        {
+            _importPreviews.Clear();
+            _importPreviews = await Preview.Invoke(file);
+            await step.Next();
+        }
+        catch (Exception ex)
+        {
+            await ToastService.Warn(ex);
+        }
+    }
+
+    private async Task SaveDeviceImport()
+    {
+        try
+        {
+            await Task.Run(async () =>
+            {
+                await Import.Invoke(_importPreviews);
+                _importFile = null;
+
+                await InvokeAsync(async () =>
+                {
+                    if (OnCloseAsync != null)
+                        await OnCloseAsync();
+                    await ToastService.Default();
+                });
+            });
+        }
+        catch (Exception ex)
+        {
+            await InvokeAsync(async () => await ToastService.Warn(ex));
+        }
+    }
+}

src/Admin/ThingsGateway.Razor/Components/ImportExcelConfirm.razor.css

@@ -0,0 +1,9 @@
+::deep .avatar {
+    border-radius: 1.5rem;
+    width: 24px;
+    height: 24px;
+    background-color: var(--bs-red);
+    color: #fff;
+    flex: 0 0 auto;
+    font-size: 1rem;
+}

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

@@ -10,7 +10,7 @@
 
 using Microsoft.JSInterop;
 
-namespace ThingsGateway.Common.Extension;
+namespace ThingsGateway.Razor.Extension;
 
 /// <summary>
 /// JSRuntime扩展方法
@@ -49,4 +49,28 @@ public static class JSRuntimeExtensions
         {
         }
     }
+
+
+    public static async ValueTask<T> GetLocalStorage<T>(this IJSRuntime jsRuntime, string name)
+    {
+        try
+        {
+            return await jsRuntime.InvokeAsync<T>("getLocalStorage", name).ConfigureAwait(false);
+        }
+        catch
+        {
+            return default;
+        }
+    }
+
+    public static async ValueTask SetLocalStorage<T>(this IJSRuntime jsRuntime, string name, T data)
+    {
+        try
+        {
+            await jsRuntime.InvokeVoidAsync("setLocalStorage", name, data).ConfigureAwait(false);
+        }
+        catch
+        {
+        }
+    }
 }

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

@@ -25,7 +25,8 @@
     "Success": "Success",
     "TablesExportButtonExcelText": "Export Excel",
     "TablesImportButtonExcelText": "Import Excel",
-    "True": "Yes"
+    "True": "Yes",
+    "Info": "Info"
   },
   "ThingsGateway.Razor.About": {
     "Community": "Community",
@@ -59,6 +60,19 @@
     "SearchText": "Search Page"
   },
   "ThingsGateway.Razor.ImportExcel": {
+    "First": "Step 1",
+    "Import": "If there are no errors during verification, it will be directly imported into the database",
+    "Next": "Next",
+    "Reset": "Reset",
+    "Second": "Step 2",
+    "Third": "Step 3",
+    "Tip": "When the data volume is large (more than 200,000), the import may take more than 1 minute, please be patient",
+    "Upload": "Upload File",
+    "UploadCount": " Table {0}, import {1} records",
+    "Validate": "Validate",
+    "ValidateText": "Validation Content"
+  },
+  "ThingsGateway.Razor.ImportExcelConfirm": {
     "First": "Step 1",
     "Import": "Import",
     "Next": "Next",
@@ -67,7 +81,7 @@
     "Third": "Step 3",
     "Tip": "When the data volume is large (more than 200,000), the import may take more than 1 minute, please be patient",
     "Upload": "Upload File",
-    "UploadCount": " Table {0}, expecting to import {1} records",
+    "UploadCount": " Table {0}, import {1} records",
     "Validate": "Validate",
     "ValidateText": "Validation Content"
   },

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

@@ -25,7 +25,8 @@
     "Success": "成功",
     "TablesExportButtonExcelText": "导出Excel",
     "TablesImportButtonExcelText": "导入Excel",
-    "True": "是"
+    "True": "是",
+    "Info": "详情"
   },
   "ThingsGateway.Razor.About": {
     "Community": "社区",
@@ -59,6 +60,19 @@
     "SearchText": "搜索页面"
   },
   "ThingsGateway.Razor.ImportExcel": {
+    "First": "第一步",
+    "Import": "若验证无错误，将直接导入数据库",
+    "Next": "下一步",
+    "Reset": "重置",
+    "Second": "第二步",
+    "Third": "第三",
+    "Tip": "数据量较大时(大于20万)，所需导入时间可能超过1分钟，请耐心等待",
+    "Upload": "上传文件",
+    "UploadCount": " 表 {0}，导入 {1} 条数据",
+    "Validate": "验证",
+    "ValidateText": "验证内容"
+  },
+  "ThingsGateway.Razor.ImportExcelConfirm": {
     "First": "第一步",
     "Import": "导入",
     "Next": "下一步",
@@ -67,7 +81,7 @@
     "Third": "第三",
     "Tip": "数据量较大时(大于20万)，所需导入时间可能超过1分钟，请耐心等待",
     "Upload": "上传文件",
-    "UploadCount": " 表 {0}，预计导入 {1} 条数据",
+    "UploadCount": " 表 {0}，导入 {1} 条数据",
     "Validate": "验证",
     "ValidateText": "验证内容"
   },

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

@@ -3,6 +3,7 @@
 	<Import Project="..\..\PackNuget.props" />
 	<PropertyGroup>
 		<TargetFrameworks>net8.0</TargetFrameworks>
+		
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="BootstrapBlazor.FontAwesome" Version="9.1.0" />

src/Admin/ThingsGateway.Razor/wwwroot/js/culture.js

@@ -1,9 +0,0 @@
-// 设置 culture
-function setCultureLocalStorage(culture) {
-    localStorage.setItem("culture", culture);
-}
-
-// 获取 culture
-function getCultureLocalStorage() {
-    return localStorage.getItem("culture");
-}

src/Admin/ThingsGateway.Razor/wwwroot/js/localStorageUtil.js

@@ -0,0 +1,18 @@
+// 设置 culture
+function setCultureLocalStorage(culture) {
+    localStorage.setItem("culture", culture);
+}
+
+// 获取 culture
+function getCultureLocalStorage() {
+    return localStorage.getItem("culture");
+}
+
+ function getLocalStorage(name) {
+    return JSON.parse(localStorage.getItem(name)) ?? 0;
+}
+ function setLocalStorage(name, data) {
+    if (localStorage) {
+        localStorage.setItem(name, JSON.stringify(data));
+    }
+}

src/Admin/ThingsGateway.SqlSugar/QuestDb/QuestDbRestAPI.cs

@@ -132,35 +132,43 @@ namespace ThingsGateway.SqlSugar
             {
                 // 准备多部分表单数据
                 var boundary = "---------------" + DateTime.Now.Ticks.ToString("x");
-                var list = new List<Hashtable>();
+
                 tableName ??= db.EntityMaintenance.GetEntityInfo<T>().DbTableName;
 
                 // 获取或创建列信息缓存
                 var key = "QuestDbBulkCopy" + typeof(T).FullName + typeof(T).GetHashCode();
                 var columns = ReflectionInoCacheService.Instance.GetOrCreate(key, () =>
                  db.CopyNew().DbMaintenance.GetColumnInfosByTableName(tableName));
-
-                // 构建schema信息
-                columns.ForEach(d =>
+                var list = ReflectionInoCacheService.Instance.GetOrCreate($"{key}{dateFormat}List<Hashtable>", () =>
                 {
-                    if (d.DataType == "TIMESTAMP")
+                    var list = new List<Hashtable>();
+
+                    // 构建schema信息
+                    columns.ForEach(d =>
                     {
-                        list.Add(new Hashtable()
+                        if (d.DataType == "TIMESTAMP")
+                        {
+                            list.Add(new Hashtable()
                         {
                             { "name", d.DbColumnName },
                             { "type", d.DataType },
                             { "pattern", dateFormat}
                         });
-                    }
-                    else
-                    {
-                        list.Add(new Hashtable()
+                        }
+                        else
+                        {
+                            list.Add(new Hashtable()
                         {
                             { "name", d.DbColumnName },
                             { "type", d.DataType }
                         });
-                    }
-                });
+                        }
+                    });
+
+                    return list;
+                }
+ );
+
                 var schema = JsonConvert.SerializeObject(list);
 
                 // 写入CSV文件

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

@@ -5,6 +5,7 @@
 
 	<PropertyGroup>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
+		
 	</PropertyGroup>
 	<PropertyGroup>
 		<TargetFrameworks>net8.0;net9.0;</TargetFrameworks>
@@ -31,7 +32,7 @@
 		<PackageReference Include="CsvHelper" Version="33.1.0" />
 		<PackageReference Include="TDengine.Connector" Version="3.1.7" />
 		<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="23.9.1" />
-		<PackageReference Include="Oscar.Data.SqlClient" Version="4.2.21" />
+		<PackageReference Include="Oscar.Data.SqlClient" Version="4.2.22" />
 		<PackageReference Include="System.Data.Common" Version="4.3.0" />
 		<PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.0" />
 		<PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />

src/Directory.Build.props

@@ -1,9 +1,9 @@
 <Project>
 
 	<PropertyGroup>
-		<PluginVersion>10.10.11</PluginVersion>
-		<ProPluginVersion>10.10.11</ProPluginVersion>
-		<DefaultVersion>10.10.14</DefaultVersion>
+		<PluginVersion>10.10.18</PluginVersion>
+		<ProPluginVersion>10.10.18</ProPluginVersion>
+		<DefaultVersion>10.10.18</DefaultVersion>
 		<AuthenticationVersion>10.10.1</AuthenticationVersion>
 		<SourceGeneratorVersion>10.10.1</SourceGeneratorVersion>
 		<NET8Version>8.0.19</NET8Version>

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

@@ -4,10 +4,11 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>netstandard2.0;</TargetFrameworks>
+		
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="CS-Script" Version="4.10.1" />
+		<PackageReference Include="CS-Script" Version="4.11.0" />
 	</ItemGroup>
 
 	<ItemGroup>

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

@@ -23,7 +23,7 @@
             <EditorItem @bind-Field=Model.EncodingName>
                 <EditTemplate Context="value">
                     <div class="col-12 col-sm-4">
-                        <Select @bind-Value=value.EncodingName Items="EncodingItems" />
+                        <Select @bind-Value=value.EncodingName Items="EncodingItems" IsClearable/>
                     </div>
                 </EditTemplate>
             </EditorItem>

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

@@ -31,6 +31,6 @@ public partial class ConverterConfigComponent : ComponentBase
     protected override void OnInitialized()
     {
         BoolItems = LocalizerUtil.GetBoolItems(Model.GetType(), nameof(Model.VariableStringLength), true);
-        EncodingItems = new List<SelectedItem>() { new SelectedItem("", "none") }.Concat(Encoding.GetEncodings().Select(a => new SelectedItem(a.CodePage.ToString(), a.DisplayName))).ToList();
+        EncodingItems = Encoding.GetEncodings().Select(a => new SelectedItem(a.CodePage.ToString(), a.DisplayName)).ToList();
     }
 }

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

@@ -95,7 +95,7 @@ public partial class LogConsole : IDisposable
 
             if (LogPath != null)
             {
-                var files = await TextFileReadService.GetLogFiles(LogPath);
+                var files = await TextFileReadService.GetLogFilesAsync(LogPath);
                 if (!files.IsSuccess)
                 {
                     Messages = new List<LogMessage>();
@@ -106,7 +106,7 @@ public partial class LogConsole : IDisposable
                     await Task.Run(async () =>
                     {
                         Stopwatch sw = Stopwatch.StartNew();
-                        var result = await TextFileReadService.LastLogData(files.Content.FirstOrDefault());
+                        var result = await TextFileReadService.LastLogDataAsync(files.Content.FirstOrDefault());
                         if (result.IsSuccess)
                         {
                             Messages = result.Content.Where(a => a.LogLevel >= LogLevel).Select(a => new LogMessage((int)a.LogLevel, $"{a.LogTime} - {a.Message}{(a.ExceptionString.IsNullOrWhiteSpace() ? null : $"{Environment.NewLine}{a.ExceptionString}")}")).ToList();
@@ -144,7 +144,7 @@ public partial class LogConsole : IDisposable
     {
         if (LogPath != null)
         {
-            var files = await TextFileReadService.GetLogFiles(LogPath);
+            var files = await TextFileReadService.GetLogFilesAsync(LogPath);
             if (files.IsSuccess)
             {
                 foreach (var item in files.Content)

src/Foundation/ThingsGateway.Foundation.Razor/Services/PlatformService.cs

@@ -26,7 +26,7 @@ public class PlatformService : IPlatformService
 
     public async Task OnLogExport(string logPath)
     {
-        var files = TextFileReader.GetLogFiles(logPath);
+        var files = TextFileReader.GetLogFilesAsync(logPath);
         if (!files.IsSuccess)
         {
             return;
@@ -40,7 +40,7 @@ public class PlatformService : IPlatformService
             await using var jSObject = await JSRuntime.InvokeAsync<IJSObjectReference>("import", $"{WebsiteConst.DefaultResourceUrl}js/downloadFile.js");
             var path = Path.GetRelativePath("wwwroot", item);
             string fileName = DateTime.Now.ToFileDateTimeFormat();
-            await jSObject.InvokeVoidAsync("blazor_downloadFile", url, fileName, new { FileName = path });
+            await jSObject.InvokeAsync<bool>("blazor_downloadFile", url, fileName, new { FileName = path });
         }
     }
 }

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

@@ -4,6 +4,7 @@
 	<Import Project="..\..\PackNuget.props" />
 	<PropertyGroup>
 		<TargetFrameworks>net8.0;</TargetFrameworks>
+		
 		<!--<UseRazorSourceGenerator>false</UseRazorSourceGenerator>-->
 	</PropertyGroup>
 	<ItemGroup>

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

@@ -5,6 +5,7 @@
 		<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
 		<NoPackageAnalysis>true</NoPackageAnalysis>
 		<SignAssembly>false</SignAssembly>
+		
 	</PropertyGroup>
 
 	<ItemGroup>

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

@@ -5,6 +5,7 @@
 	<PropertyGroup>
 		<TargetFrameworks>netstandard2.0;</TargetFrameworks>
 		<Version>$(SourceGeneratorVersion)</Version>
+		
 	</PropertyGroup>
 
 	<ItemGroup>

src/Foundation/ThingsGateway.Foundation/Logger/TextFileReader.cs

@@ -59,7 +59,7 @@ public static class TextFileReader
     /// </summary>
     /// <param name="directoryPath">目录路径</param>
     /// <returns>包含文件信息的列表</returns>
-    public static OperResult<List<string>> GetLogFiles(string directoryPath)
+    public static OperResult<List<string>> GetLogFilesAsync(string directoryPath)
     {
         OperResult<List<string>> result = new(); // 初始化结果对象
         // 检查目录是否存在
@@ -91,7 +91,7 @@ public static class TextFileReader
         return result;
     }
 
-    public static OperResult<List<LogData>> LastLogData(string file, int lineCount = 200)
+    public static OperResult<List<LogData>> LastLogDataAsync(string file, int lineCount = 200)
     {
         if (!File.Exists(file))
             return new OperResult<List<LogData>>("The file path is invalid");
@@ -104,7 +104,7 @@ public static class TextFileReader
             {
                 var fileInfo = new FileInfo(file);
                 var length = fileInfo.Length;
-                var cacheKey = $"{nameof(TextFileReader)}_{nameof(LastLogData)}_{file})";
+                var cacheKey = $"{nameof(TextFileReader)}_{nameof(LastLogDataAsync)}_{file})";
                 if (_cache.TryGetValue<LogDataCache>(cacheKey, out var cachedData))
                 {
                     if (cachedData != null && cachedData.Length == length)

src/Foundation/ThingsGateway.Foundation/Services/ITextFileReadService.cs

@@ -18,7 +18,7 @@ public interface ITextFileReadService
     /// </summary>
     /// <param name="directoryPath">目录路径</param>
     /// <returns>包含文件信息的列表</returns>
-    public Task<OperResult<List<string>>> GetLogFiles(string directoryPath);
+    public Task<OperResult<List<string>>> GetLogFilesAsync(string directoryPath);
 
-    public Task<OperResult<List<LogData>>> LastLogData(string file, int lineCount = 200);
+    public Task<OperResult<List<LogData>>> LastLogDataAsync(string file, int lineCount = 200);
 }

src/Foundation/ThingsGateway.Foundation/Services/TextFileReadService.cs

@@ -14,7 +14,7 @@ namespace ThingsGateway.Foundation;
 
 public class TextFileReadService : ITextFileReadService
 {
-    public Task<OperResult<List<string>>> GetLogFiles(string directoryPath) => Task.FromResult(TextFileReader.GetLogFiles(directoryPath));
+    public Task<OperResult<List<string>>> GetLogFilesAsync(string directoryPath) => Task.FromResult(TextFileReader.GetLogFilesAsync(directoryPath));
 
-    public Task<OperResult<List<LogData>>> LastLogData(string file, int lineCount = 200) => Task.FromResult(TextFileReader.LastLogData(file, lineCount));
+    public Task<OperResult<List<LogData>>> LastLogDataAsync(string file, int lineCount = 200) => Task.FromResult(TextFileReader.LastLogDataAsync(file, lineCount));
 }

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

@@ -6,6 +6,7 @@
 	<PropertyGroup>
 		<Description>工业设备通讯协议-基础类库</Description>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+		
 	</PropertyGroup>
 
 	<ItemGroup>

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

@@ -4,6 +4,7 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+		
 	</PropertyGroup>
 
 	<ItemGroup>

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

@@ -4,6 +4,7 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+		
 		<!--<UseRazorSourceGenerator>false</UseRazorSourceGenerator>-->
 	</PropertyGroup>
 

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

@@ -12,13 +12,15 @@ using TouchSocket.Core;
 
 namespace ThingsGateway.Gateway.Application;
 
-public class AsyncReadWriteLock
+public class AsyncReadWriteLock : IAsyncDisposable
 {
     private readonly int _writeReadRatio = 3; // 写3次会允许1次读，但写入也不会被阻止，具体协议取决于插件协议实现
-    public AsyncReadWriteLock(int writeReadRatio)
+    public AsyncReadWriteLock(int writeReadRatio, bool writePriority)
     {
         _writeReadRatio = writeReadRatio;
+        _writePriority = writePriority;
     }
+    private bool _writePriority;
     private AsyncAutoResetEvent _readerLock = new AsyncAutoResetEvent(false); // 控制读计数
     private long _writerCount = 0; // 当前活跃的写线程数
     private long _readerCount = 0; // 当前被阻塞的读线程数
@@ -33,6 +35,8 @@ public class AsyncReadWriteLock
         {
             Interlocked.Increment(ref _readerCount);
 
+
+
             // 第一个读者需要获取写入锁，防止写操作
             await _readerLock.WaitOneAsync(cancellationToken).ConfigureAwait(false);
 
@@ -52,10 +56,13 @@ public class AsyncReadWriteLock
 
         if (Interlocked.Increment(ref _writerCount) == 1)
         {
-            var cancellationTokenSource = _cancellationTokenSource;
-            _cancellationTokenSource = new();
-            await cancellationTokenSource.SafeCancelAsync().ConfigureAwait(false); // 取消读取
-            cancellationTokenSource.SafeDispose();
+            if (_writePriority)
+            {
+                var cancellationTokenSource = _cancellationTokenSource;
+                _cancellationTokenSource = new();
+                await cancellationTokenSource.SafeCancelAsync().ConfigureAwait(false); // 取消读取
+                cancellationTokenSource.SafeDispose();
+            }
         }
 
         return new Writer(this);
@@ -63,11 +70,16 @@ public class AsyncReadWriteLock
     private object lockObject = new();
     private void ReleaseWriter()
     {
+
         var writerCount = Interlocked.Decrement(ref _writerCount);
+
+        // 每次释放写时，总是唤醒至少一个读
+        _readerLock.Set();
+
         if (writerCount == 0)
         {
             var resetEvent = _readerLock;
-            _readerLock = new(false);
+            //_readerLock = new(false);
             Interlocked.Exchange(ref _writeSinceLastReadCount, 0);
             resetEvent.SetAll();
         }
@@ -83,18 +95,28 @@ public class AsyncReadWriteLock
                     if (count >= _writeReadRatio)
                     {
                         Interlocked.Exchange(ref _writeSinceLastReadCount, 0);
-                        _readerLock.Set();
+                        //_readerLock.Set();
                     }
                 }
                 else
                 {
-                    _readerLock.Set();
+                    //_readerLock.Set();
                 }
             }
 
         }
     }
 
+    public async ValueTask DisposeAsync()
+    {
+        if (_cancellationTokenSource != null)
+        {
+            await _cancellationTokenSource.SafeCancelAsync().ConfigureAwait(false);
+            _cancellationTokenSource.SafeDispose();
+        }
+        _readerLock.SetAll();
+    }
+
     private int _writeSinceLastReadCount = 0;
     private struct Writer : IDisposable
     {

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

@@ -18,7 +18,7 @@ namespace BootstrapBlazor.Components;
 /// <param name="fieldName">字段名称</param>
 /// <param name="fieldType">字段类型</param>
 /// <param name="fieldText">显示文字</param>
-internal sealed class InternalTableColumn(string fieldName, Type fieldType, string? fieldText = null) : IEditorItem, ITableColumn
+public sealed class DefaultTableColumn(string fieldName, Type fieldType, string? fieldText = null) : IEditorItem, ITableColumn
 {
     public IEnumerable<KeyValuePair<string, object>>? ComponentParameters { get; set; }
     public Type? ComponentType { get; set; }

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

@@ -12,7 +12,7 @@ using BootstrapBlazor.Components;
 
 namespace ThingsGateway.Gateway.Application;
 
-public class ExportFilter
+public class GatewayExportFilter
 {
     public FilterKeyValueAction FilterKeyValueAction { get; set; }
     public string? PluginName { get; set; }

src/Gateway/ThingsGateway.Gateway.Application/Const/GatewayExportString.cs

@@ -10,7 +10,7 @@
 
 namespace ThingsGateway.Gateway.Application;
 
-public static class ExportString
+public static class GatewayExportString
 {
     /// <summary>
     /// 通道名称
@@ -47,7 +47,7 @@ public static class ExportString
         get
         {
             if (localizer == null)
-                localizer = App.CreateLocalizerByType(typeof(ExportString));
+                localizer = App.CreateLocalizerByType(typeof(GatewayExportString));
             return localizer;
         }
     }

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

@@ -176,7 +176,7 @@ public class ControlController : ControllerBase, IRpcServer
     [TouchSocket.WebApi.WebApi(Method = TouchSocket.WebApi.HttpMethodType.Post)]
     public Task<bool> BatchSaveVariableAsync([FromBody][TouchSocket.WebApi.FromBody] List<Variable> variables, ItemChangedType type, bool restart = true)
     {
-        return GlobalData.VariableRuntimeService.BatchSaveVariableAsync(variables, type, restart, default);
+        return GlobalData.VariableRuntimeService.BatchSaveVariableAsync(variables, type, restart);
     }
 
     /// <summary>
@@ -188,7 +188,7 @@ public class ControlController : ControllerBase, IRpcServer
     public Task<bool> DeleteChannelAsync([FromBody][TouchSocket.WebApi.FromBody] List<long> ids, bool restart = true)
     {
         if (ids == null || ids.Count == 0) ids = GlobalData.IdChannels.Keys.ToList();
-        return GlobalData.ChannelRuntimeService.DeleteChannelAsync(ids, restart, default);
+        return GlobalData.ChannelRuntimeService.DeleteChannelAsync(ids, restart);
     }
 
     /// <summary>
@@ -200,7 +200,7 @@ public class ControlController : ControllerBase, IRpcServer
     public Task<bool> DeleteDeviceAsync([FromBody][TouchSocket.WebApi.FromBody] List<long> ids, bool restart = true)
     {
         if (ids == null || ids.Count == 0) ids = GlobalData.IdDevices.Keys.ToList();
-        return GlobalData.DeviceRuntimeService.DeleteDeviceAsync(ids, restart, default);
+        return GlobalData.DeviceRuntimeService.DeleteDeviceAsync(ids, restart);
     }
 
     /// <summary>
@@ -212,7 +212,7 @@ public class ControlController : ControllerBase, IRpcServer
     public Task<bool> DeleteVariableAsync([FromBody][TouchSocket.WebApi.FromBody] List<long> ids, bool restart = true)
     {
         if (ids == null || ids.Count == 0) ids = GlobalData.IdVariables.Keys.ToList();
-        return GlobalData.VariableRuntimeService.DeleteVariableAsync(ids, restart, default);
+        return GlobalData.VariableRuntimeService.DeleteVariableAsync(ids, restart);
     }
 
     /// <summary>
@@ -223,7 +223,7 @@ public class ControlController : ControllerBase, IRpcServer
     [TouchSocket.WebApi.WebApi(Method = TouchSocket.WebApi.HttpMethodType.Post)]
     public Task InsertTestDataAsync(int testVariableCount, int testDeviceCount, string slaveUrl, bool businessEnable, bool restart = true)
     {
-        return GlobalData.VariableRuntimeService.InsertTestDataAsync(testVariableCount, testDeviceCount, slaveUrl, businessEnable, restart, default);
+        return GlobalData.VariableRuntimeService.InsertTestDataAsync(testVariableCount, testDeviceCount, slaveUrl, businessEnable, restart);
     }
 
     /// <summary>

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

@@ -45,7 +45,7 @@ public class GatewayExportController : ControllerBase
     /// </summary>
     /// <returns></returns>
     [HttpPost("device")]
-    public async Task<IActionResult> DownloadDeviceAsync([FromBody] ExportFilter input)
+    public async Task<IActionResult> DownloadDeviceAsync([FromBody] GatewayExportFilter input)
     {
         input.QueryPageOptions.IsPage = false;
         input.QueryPageOptions.IsVirtualScroll = false;
@@ -58,7 +58,7 @@ public class GatewayExportController : ControllerBase
     /// </summary>
     /// <returns></returns>
     [HttpPost("channel")]
-    public async Task<IActionResult> DownloadChannelAsync([FromBody] ExportFilter input)
+    public async Task<IActionResult> DownloadChannelAsync([FromBody] GatewayExportFilter input)
     {
         input.QueryPageOptions.IsPage = false;
         input.QueryPageOptions.IsVirtualScroll = false;
@@ -72,7 +72,7 @@ public class GatewayExportController : ControllerBase
     /// </summary>
     /// <returns></returns>
     [HttpPost("variable")]
-    public async Task<IActionResult> DownloadVariableAsync([FromBody] ExportFilter input)
+    public async Task<IActionResult> DownloadVariableAsync([FromBody] GatewayExportFilter input)
     {
         input.QueryPageOptions.IsPage = false;
         input.QueryPageOptions.IsVirtualScroll = false;

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

@@ -90,7 +90,7 @@ public class RuntimeInfoController : ControllerBase, IRpcServer
     [TouchSocket.WebApi.WebApi(Method = TouchSocket.WebApi.HttpMethodType.Post)]
     public async Task<SqlSugarPagedList<AlarmVariable>> GetRealAlarmList([FromQuery][TouchSocket.WebApi.FromBody] AlarmVariablePageInput input)
     {
-        var realAlarmVariables = await GlobalData.GetCurrentUserRealAlarmVariables().ConfigureAwait(false);
+        var realAlarmVariables = await GlobalData.GetCurrentUserRealAlarmVariablesAsync().ConfigureAwait(false);
 
         var data = realAlarmVariables
             .WhereIF(!input.RegisterAddress.IsNullOrEmpty(), a => a.RegisterAddress == input.RegisterAddress)
@@ -145,7 +145,7 @@ public class RuntimeInfoController : ControllerBase, IRpcServer
     public SqlSugarPagedList<PluginInfo> GetPluginInfos([FromQuery][TouchSocket.WebApi.FromBody] PluginInfoPageInput input)
     {
         //指定关键词搜索为插件FullName
-        return (GlobalData.PluginService.GetPluginListSync()).WhereIF(!input.Name.IsNullOrWhiteSpace(), a => a.Name == input.Name)
+        return (GlobalData.PluginService.GetPluginList()).WhereIF(!input.Name.IsNullOrWhiteSpace(), a => a.Name == input.Name)
                 .ToPagedList(input);
     }
 }

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

@@ -11,14 +11,19 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace ThingsGateway.Admin.Application;
+using TouchSocket.Rpc;
+
+namespace ThingsGateway.Gateway.Application;
 
 [Route("api/[controller]/[action]")]
 [AllowAnonymous]
 [ApiController]
-public class TestController : ControllerBase
+[TouchSocket.WebApi.Router("/miniapi/[api]/[action]")]
+[TouchSocket.WebApi.EnableCors("cors")]
+public class TestController : ControllerBase, IRpcServer
 {
     [HttpGet]
+    [TouchSocket.WebApi.WebApi(Method = TouchSocket.WebApi.HttpMethodType.Get)]
     public void Test()
     {
         GC.Collect();

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

@@ -57,6 +57,9 @@ public abstract class BusinessBase : DriverBase
     /// </summary>
     protected Dictionary<string, List<VariableRuntime>> VariableRuntimeGroups { get; set; } = new();
 
+
+#if !Management
+
     public override Task AfterVariablesChangedAsync(CancellationToken cancellationToken)
     {
         LogMessage?.LogInformation("Refresh variable");
@@ -117,6 +120,8 @@ public abstract class BusinessBase : DriverBase
             };
     }
 
+
+
     /// <summary>
     /// 间隔执行
     /// </summary>
@@ -134,4 +139,5 @@ public abstract class BusinessBase : DriverBase
             CurrentDevice?.SetDeviceStatus(TimerX.Now, true);
         }
     }
+#endif
 }

src/Gateway/ThingsGateway.Gateway.Application/Driver/Business/Cache/BusinessBaseWithCache.cs

@@ -20,6 +20,12 @@ namespace ThingsGateway.Gateway.Application;
 /// </summary>
 public abstract class BusinessBaseWithCache : BusinessBase
 {
+
+    protected sealed override BusinessPropertyBase _businessPropertyBase => _businessPropertyWithCache;
+
+    protected abstract BusinessPropertyWithCache _businessPropertyWithCache { get; }
+
+#if !Management
     #region 条件
 
     protected abstract bool AlarmModelEnable { get; }
@@ -537,9 +543,7 @@ public abstract class BusinessBaseWithCache : BusinessBase
     private CacheDB DBCacheVar;
     private CacheDB DBCacheVars;
 
-    protected sealed override BusinessPropertyBase _businessPropertyBase => _businessPropertyWithCache;
 
-    protected abstract BusinessPropertyWithCache _businessPropertyWithCache { get; }
 
     protected object cacheLock = new();
 
@@ -976,4 +980,6 @@ public abstract class BusinessBaseWithCache : BusinessBase
     }
 
     #endregion
+
+#endif
 }

src/Gateway/ThingsGateway.Gateway.Application/Driver/Business/Cache/BusinessBaseWithCacheAlarm.cs

@@ -19,6 +19,7 @@ namespace ThingsGateway.Gateway.Application;
 /// </summary>
 public abstract class BusinessBaseWithCacheAlarm : BusinessBaseWithCache
 {
+#if !Management
     protected override bool AlarmModelEnable => true;
 
     protected override bool DevModelEnable => false;
@@ -104,4 +105,6 @@ public abstract class BusinessBaseWithCacheAlarm : BusinessBaseWithCache
             }
         }
     }
+
+#endif
 }

src/Gateway/ThingsGateway.Gateway.Application/Driver/Business/Cache/BusinessBaseWithCacheInterval.cs

@@ -29,6 +29,9 @@ public abstract class BusinessBaseWithCacheInterval : BusinessBaseWithCache
     /// </summary>
     protected abstract BusinessPropertyWithCacheInterval _businessPropertyWithCacheInterval { get; }
 
+#if !Management
+
+
     protected internal override async Task InitChannelAsync(IChannel? channel, CancellationToken cancellationToken)
     {
         if (AlarmModelEnable)
@@ -340,5 +343,5 @@ public abstract class BusinessBaseWithCacheInterval : BusinessBaseWithCache
             }
         }
     }
-
+#endif
 }

src/Gateway/ThingsGateway.Gateway.Application/Driver/Business/Cache/BusinessBaseWithCacheIntervalScript.cs

@@ -26,6 +26,8 @@ public abstract partial class BusinessBaseWithCacheIntervalScript : BusinessBase
 
     protected abstract BusinessPropertyWithCacheIntervalScript _businessPropertyWithCacheIntervalScript { get; }
 
+#if !Management
+
     public virtual string[] Match(string input)
     {
         // 生成缓存键，以确保缓存的唯一性
@@ -347,4 +349,7 @@ public abstract partial class BusinessBaseWithCacheIntervalScript : BusinessBase
     [GeneratedRegex(@"\$\{(.+?)\}")]
     private static partial Regex TopicRegex();
     #endregion 封装方法
+
+
+#endif
 }

src/Gateway/ThingsGateway.Gateway.Application/Driver/Business/Cache/BusinessBaseWithCacheIntervalScriptAll.cs

@@ -15,9 +15,12 @@ namespace ThingsGateway.Gateway.Application;
 /// </summary>
 public abstract partial class BusinessBaseWithCacheIntervalScriptAll : BusinessBaseWithCacheIntervalScript
 {
+#if !Management
     protected override bool AlarmModelEnable => true;
 
     protected override bool DevModelEnable => true;
 
     protected override bool VarModelEnable => true;
+
+#endif
 }

src/Gateway/ThingsGateway.Gateway.Application/Driver/Business/Cache/BusinessBaseWithCacheIntervalVariable.cs

@@ -15,6 +15,7 @@ namespace ThingsGateway.Gateway.Application;
 /// </summary>
 public abstract class BusinessBaseWithCacheIntervalVariable : BusinessBaseWithCacheInterval
 {
+#if !Management
     protected override bool AlarmModelEnable => false;
 
     protected override bool DevModelEnable => false;
@@ -29,5 +30,5 @@ public abstract class BusinessBaseWithCacheIntervalVariable : BusinessBaseWithCa
     {
         throw new NotImplementedException();
     }
-
+#endif
 }

src/Gateway/ThingsGateway.Gateway.Application/Driver/Business/DB/BusinessDatabaseUtil.cs

@@ -18,6 +18,7 @@ namespace ThingsGateway.Gateway.Application;
 /// </summary>
 public static class BusinessDatabaseUtil
 {
+
     /// <summary>
     /// 获取数据库链接
     /// </summary>
@@ -45,6 +46,7 @@ public static class BusinessDatabaseUtil
         return sqlSugarClient;
     }
 
+#if !Management
     /// <summary>
     /// 按条件获取DB插件中的全部历史报警(不分页)
     /// </summary>
@@ -144,4 +146,6 @@ public static class BusinessDatabaseUtil
             return new("GetDBHistoryValues Fail", ex);
         }
     }
+
+#endif
 }

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

@@ -16,7 +16,9 @@ using System.Collections.Concurrent;
 
 using ThingsGateway.Common.Extension;
 using ThingsGateway.Extension.Generic;
+#if !Management
 using ThingsGateway.Gateway.Application.Extensions;
+#endif
 using ThingsGateway.NewLife.Json.Extension;
 using ThingsGateway.NewLife.Threading;
 
@@ -29,20 +31,31 @@ namespace ThingsGateway.Gateway.Application;
 /// 采集插件，继承实现不同PLC通讯
 /// <para></para>
 /// </summary>
-public abstract partial class CollectBase : DriverBase, IRpcDriver
+public abstract partial class CollectBase : DriverBase
+#if !Management
+    , IRpcDriver
+#endif
 {
     /// <summary>
     /// 插件配置项
     /// </summary>
     public abstract CollectPropertyBase CollectProperties { get; }
 
+
+    public sealed override object DriverProperties => CollectProperties;
+
+    public virtual string GetAddressDescription()
+    {
+        return string.Empty;
+    }
+
+#if !Management
+
     /// <summary>
     /// 特殊方法
     /// </summary>
     public List<DriverMethodInfo>? DriverMethodInfos { get; private set; }
 
-    public sealed override object DriverProperties => CollectProperties;
-
     public override async Task AfterVariablesChangedAsync(CancellationToken cancellationToken)
     {
         LogMessage?.LogInformation("Refresh variable");
@@ -195,13 +208,10 @@ public abstract partial class CollectBase : DriverBase, IRpcDriver
         // 从插件服务中获取当前设备关联的驱动方法信息列表
         DriverMethodInfos = GlobalData.PluginService.GetDriverMethodInfos(device.PluginName, this);
 
-        ReadWriteLock = new(CollectProperties.DutyCycle);
+        ReadWriteLock = new(CollectProperties.DutyCycle, CollectProperties.WritePriority);
     }
 
-    public virtual string GetAddressDescription()
-    {
-        return string.Empty;
-    }
+
     protected virtual bool VariableSourceReadsEnable => true;
 
     protected List<IScheduledTask> VariableTasks = new List<IScheduledTask>();
@@ -468,6 +478,7 @@ public abstract partial class CollectBase : DriverBase, IRpcDriver
         }
     }
 
+
     /// <summary>
     /// 连读打包，返回实际通讯包信息<see cref="VariableSourceRead"/>
     /// <br></br>每个驱动打包方法不一样，所以需要实现这个接口
@@ -723,9 +734,13 @@ public abstract partial class CollectBase : DriverBase, IRpcDriver
 
     #endregion 写入方法
 
-    protected override Task DisposeAsync(bool disposing)
+    protected override async Task DisposeAsync(bool disposing)
     {
         _linkedCtsCache?.SafeDispose();
-        return base.DisposeAsync(disposing);
+        if (ReadWriteLock != null)
+            await ReadWriteLock.SafeDisposeAsync().ConfigureAwait(false);
+        await base.DisposeAsync(disposing).ConfigureAwait(false);
     }
+
+#endif
 }

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

@@ -33,13 +33,7 @@ public abstract class CollectFoundationBase : CollectBase
     /// </summary>
     public virtual IDevice? FoundationDevice { get; }
 
-    /// <summary>
-    /// 是否连接成功
-    /// </summary>
-    public override bool IsConnected()
-    {
-        return FoundationDevice?.OnLine == true;
-    }
+
 
     public override string ToString()
     {
@@ -53,6 +47,24 @@ public abstract class CollectFoundationBase : CollectBase
             await FoundationDevice.SafeDisposeAsync().ConfigureAwait(false);
         await base.DisposeAsync(disposing).ConfigureAwait(false);
     }
+
+
+
+
+    public override string GetAddressDescription()
+    {
+        return FoundationDevice?.GetAddressDescription();
+    }
+#if !Management
+
+    /// <summary>
+    /// 是否连接成功
+    /// </summary>
+    public override bool IsConnected()
+    {
+        return FoundationDevice?.OnLine == true;
+    }
+
     /// <summary>
     /// 开始通讯执行的方法
     /// </summary>
@@ -66,10 +78,6 @@ public abstract class CollectFoundationBase : CollectBase
         }
     }
 
-    public override string GetAddressDescription()
-    {
-        return FoundationDevice?.GetAddressDescription();
-    }
 
     protected override async Task TestOnline(object? state, CancellationToken cancellationToken)
     {
@@ -216,4 +224,7 @@ public abstract class CollectFoundationBase : CollectBase
         // 返回包含操作结果的字典
         return new Dictionary<string, OperResult>(operResults);
     }
+
+
+#endif
 }

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

@@ -37,6 +37,12 @@ public abstract class CollectPropertyBase : DriverPropertyBase
     /// </summary>
     [MinValue(1)]
     public virtual int DutyCycle { get; set; } = 3;
+
+
+    /// <summary>
+    /// 写优先，写入时强制读取消操作
+    /// </summary>
+    public virtual bool WritePriority { get; set; } = false;
 }
 
 /// <summary>
@@ -56,4 +62,6 @@ public abstract class CollectPropertyRetryBase : CollectPropertyBase
     [MinValue(1)]
     public override int DutyCycle { get; set; } = 3;
 
+    [DynamicProperty(Remark = "写优先，写入时强制读取消操作")]
+    public override bool WritePriority { get; set; } = false;
 }

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

@@ -37,20 +37,6 @@ public abstract class DriverBase : AsyncDisposableObject, IDriver
 
     #region 属性
 
-    /// <summary>
-    /// 当前设备
-    /// </summary>
-    public DeviceRuntime? CurrentDevice { get; private set; }
-    /// <summary>
-    /// 当前设备Id
-    /// </summary>
-    public long DeviceId => CurrentDevice?.Id ?? 0;
-
-    /// <summary>
-    /// 当前设备名称
-    /// </summary>
-    public string? DeviceName => CurrentDevice?.Name;
-
     /// <summary>
     /// 调试UI Type，如果不存在，返回null
     /// </summary>
@@ -76,25 +62,8 @@ public abstract class DriverBase : AsyncDisposableObject, IDriver
     /// </summary>
     public abstract object DriverProperties { get; }
 
-    /// <summary>
-    /// 是否执行了Start方法
-    /// </summary>
-    public bool IsStarted { get; protected set; } = false;
 
-    /// <summary>
-    /// 是否初始化成功，失败时不再执行，等待检测重启
-    /// </summary>
-    public bool IsInitSuccess { get; internal set; } = true;
 
-    /// <summary>
-    /// 是否采集插件
-    /// </summary>
-    public virtual bool? IsCollectDevice => CurrentDevice?.IsCollect;
-
-    /// <summary>
-    /// 暂停
-    /// </summary>
-    public bool Pause => CurrentDevice?.Pause == true;
 
     private List<IEditorItem> pluginPropertyEditorItems;
     public List<IEditorItem> PluginPropertyEditorItems
@@ -112,6 +81,82 @@ public abstract class DriverBase : AsyncDisposableObject, IDriver
     private IStringLocalizer Localizer { get; }
 
     #endregion 属性
+
+
+    public virtual bool GetAuthentication(out DateTime? expireTime)
+    {
+        expireTime = null;
+        return true;
+    }
+
+    public string GetAuthString()
+    {
+        if (PluginServiceUtil.IsEducation(GetType()))
+        {
+            StringBuilder stringBuilder = new();
+            var ret = GetAuthentication(out var expireTime);
+            if (ret)
+            {
+                stringBuilder.Append(Localizer["Authorized"]);
+            }
+            else
+            {
+                stringBuilder.Append(Localizer["Unauthorized"]);
+            }
+
+            stringBuilder.Append("   ");
+            if (expireTime.HasValue && (DateTime.Now - expireTime.Value).TotalHours > -72)
+            {
+                stringBuilder.Append(',');
+                stringBuilder.Append(Localizer["ExpireTime", expireTime.Value.ToString("yyyy-MM-dd HH")]);
+            }
+
+            return stringBuilder.ToString();
+        }
+        return string.Empty;
+    }
+
+
+
+#if !Management
+
+
+    /// <summary>
+    /// 是否执行了Start方法
+    /// </summary>
+    public bool IsStarted { get; protected set; } = false;
+
+    /// <summary>
+    /// 是否初始化成功，失败时不再执行，等待检测重启
+    /// </summary>
+    public bool IsInitSuccess { get; internal set; } = true;
+
+    /// <summary>
+    /// 是否采集插件
+    /// </summary>
+    public virtual bool? IsCollectDevice => CurrentDevice?.IsCollect;
+
+    /// <summary>
+    /// 当前设备
+    /// </summary>
+    public DeviceRuntime? CurrentDevice { get; private set; }
+    /// <summary>
+    /// 当前设备Id
+    /// </summary>
+    public long DeviceId => CurrentDevice?.Id ?? 0;
+
+    /// <summary>
+    /// 当前设备名称
+    /// </summary>
+    public string? DeviceName => CurrentDevice?.Name;
+
+
+
+    /// <summary>
+    /// 暂停
+    /// </summary>
+    public bool Pause => CurrentDevice?.Pause == true;
+
     protected object pauseLock = new object();
     /// <summary>
     /// 暂停
@@ -378,38 +423,6 @@ public abstract class DriverBase : AsyncDisposableObject, IDriver
 
     #region 插件重写
 
-    public virtual bool GetAuthentication(out DateTime? expireTime)
-    {
-        expireTime = null;
-        return true;
-    }
-
-    public string GetAuthString()
-    {
-        if (PluginServiceUtil.IsEducation(GetType()))
-        {
-            StringBuilder stringBuilder = new();
-            var ret = GetAuthentication(out var expireTime);
-            if (ret)
-            {
-                stringBuilder.Append(Localizer["Authorized"]);
-            }
-            else
-            {
-                stringBuilder.Append(Localizer["Unauthorized"]);
-            }
-
-            stringBuilder.Append("   ");
-            if (expireTime.HasValue && (DateTime.Now - expireTime.Value).TotalHours > -72)
-            {
-                stringBuilder.Append(',');
-                stringBuilder.Append(Localizer["ExpireTime", expireTime.Value.ToString("yyyy-MM-dd HH")]);
-            }
-
-            return stringBuilder.ToString();
-        }
-        return string.Empty;
-    }
 
     /// <summary>
     /// 开始通讯执行的方法
@@ -456,4 +469,7 @@ public abstract class DriverBase : AsyncDisposableObject, IDriver
     public abstract Task AfterVariablesChangedAsync(CancellationToken cancellationToken);
 
     #endregion 插件重写
+
+
+#endif
 }

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

@@ -37,6 +37,7 @@ public static class DynamicModelExtension
         }
     }
 
+#if !Management
     /// <summary>
     /// 获取变量的业务属性值
     /// </summary>
@@ -79,6 +80,8 @@ public static class DynamicModelExtension
         return null; // 未找到对应的业务设备Id，返回null
     }
 
+#endif
+
     public static IEnumerable<IGrouping<object[], T>> GroupByKeys<T>(this IEnumerable<T> values, params string[] keys)
     {
         // 获取动态对象集合中指定键的属性信息

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

@@ -16,25 +16,31 @@ namespace ThingsGateway.Gateway.Application
 {
     public interface IDriver : IAsyncDisposable
     {
-        bool DisposedValue { get; }
-        ChannelRuntime CurrentChannel { get; }
-        DeviceRuntime? CurrentDevice { get; }
-        long DeviceId { get; }
-        string? DeviceName { get; }
+
         Type DriverDebugUIType { get; }
         object DriverProperties { get; }
 
         Type DriverPropertyUIType { get; }
         Type DriverUIType { get; }
         Type DriverVariableAddressUIType { get; }
+        List<IEditorItem> PluginPropertyEditorItems { get; }
+
+#if !Management
+
         bool? IsCollectDevice { get; }
+        bool DisposedValue { get; }
+        ChannelRuntime CurrentChannel { get; }
+        DeviceRuntime? CurrentDevice { get; }
+        long DeviceId { get; }
+        string? DeviceName { get; }
+
+
         bool IsInitSuccess { get; }
         bool IsStarted { get; }
+        bool Pause { get; }
         LoggerGroup LogMessage { get; }
         string LogPath { get; }
-        bool Pause { get; }
         string PluginDirectory { get; }
-        List<IEditorItem> PluginPropertyEditorItems { get; }
         Dictionary<long, VariableRuntime> IdVariableRuntimes { get; }
         IDeviceThreadManage DeviceThreadManage { get; }
 
@@ -42,6 +48,10 @@ namespace ThingsGateway.Gateway.Application
         void PauseThread(bool pause);
         Task SetLogAsync(LogLevel? logLevel = null, bool upDataBase = true);
         Task AfterVariablesChangedAsync(CancellationToken cancellationToken);
+
+
+#endif
+
         string GetAuthString();
         bool GetAuthentication(out DateTime? expireTime);
     }

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

@@ -17,7 +17,6 @@ using TouchSocket.Core;
 using TouchSocket.Sockets;
 
 namespace ThingsGateway.Gateway.Application;
-#pragma warning disable CS0649
 
 /// <summary>
 /// 通道表

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

@@ -17,7 +17,6 @@ using System.ComponentModel.DataAnnotations;
 using ThingsGateway.NewLife.Extension;
 
 namespace ThingsGateway.Gateway.Application;
-#pragma warning disable CS0649
 
 /// <summary>
 /// 设备表
@@ -172,6 +171,7 @@ public class Device : BaseDataEntity, IValidatableObject
 
     #endregion 备用字段
 
+#if !Management
     /// <summary>
     /// 导入验证专用
     /// </summary>
@@ -179,6 +179,9 @@ public class Device : BaseDataEntity, IValidatableObject
     [Newtonsoft.Json.JsonIgnore]
     internal bool IsUp;
 
+
+#endif
+
     /// <summary>
     /// 额外属性
     /// </summary>
@@ -186,6 +189,7 @@ public class Device : BaseDataEntity, IValidatableObject
     [Newtonsoft.Json.JsonIgnore]
     [MapperIgnore]
     public ModelValueValidateForm? ModelValueValidateForm;
+
     public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
     {
         if (RedundantEnable && RedundantDeviceId == null)

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

@@ -16,7 +16,6 @@ using System.Collections.Concurrent;
 using System.ComponentModel.DataAnnotations;
 
 namespace ThingsGateway.Gateway.Application;
-#pragma warning disable CS0649
 
 /// <summary>
 /// 设备变量表
@@ -81,6 +80,8 @@ public class Variable : BaseDataEntity, IValidatableObject
     private string remark4;
     private string remark5;
 
+    [System.Text.Json.Serialization.JsonIgnore]
+    [Newtonsoft.Json.JsonIgnore]
     [MapperIgnore]
     public ValidateForm AlarmPropertysValidateForm;
 

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

@@ -83,7 +83,7 @@ public static class GlobalData
           .WhereIf(dataScope?.Count == 0, u => u.Value.CreateUserId == UserManager.UserId).Select(a => a.Value);
     }
 
-    public static async Task<IEnumerable<AlarmVariable>> GetCurrentUserRealAlarmVariables()
+    public static async Task<IEnumerable<AlarmVariable>> GetCurrentUserRealAlarmVariablesAsync()
     {
         var dataScope = await GlobalData.SysUserService.GetCurrentUserDataScopeAsync().ConfigureAwait(false);
         return RealAlarmIdVariables.WhereIf(dataScope != null && dataScope?.Count > 0, u => dataScope.Contains(u.Value.CreateOrgId))//在指定机构列表查询
@@ -177,6 +177,15 @@ public static class GlobalData
         }
         return GlobalData.ChannelThreadManage.DeviceThreadManages.TryGetValue(deviceRuntime.ChannelId, out deviceThreadManage);
     }
+
+    public static IChannelThreadManage GetChannelThreadManage(ChannelRuntime channelRuntime)
+    {
+        if (channelRuntime.DeviceThreadManage?.ChannelThreadManage != null)
+            return channelRuntime.DeviceThreadManage.ChannelThreadManage;
+        else
+            return GlobalData.ChannelThreadManage;
+    }
+
     public static Dictionary<IDeviceThreadManage, List<DeviceRuntime>> GetDeviceThreadManages(IEnumerable<DeviceRuntime> deviceRuntimes)
     {
         Dictionary<IDeviceThreadManage, List<DeviceRuntime>> deviceThreadManages = new();

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

@@ -1,12 +1,20 @@
 {
-  "ThingsGateway.Management.Application._Imports": {
-    "Restart": "Restart",
-    "Upgrade": "Upgrade"
+  "ThingsGateway.Management.Application.ManagementExportString": {
+
+    "ManagementConfigName": "ManagementConfigName"
   },
-  "ThingsGateway.Management.Application.SaveUpdateZipFile": {
-    "DownTemplate": "Download Template",
-    "SaveUpdateZipFile": "Upload Version Package"
+  "ThingsGateway.Management.Application.ManagementConfig": {
+
+    "Name": "Name",
+    "ServerUri": "ServerUri",
+    "Enable": "Enable",
+    "IsServer": "IsServer",
+    "VerifyToken": "VerifyToken",
+    "HeartbeatInterval": "HeartbeatInterval",
+
+    "ImportNullError": "Unable to recognize"
   },
+
   "ThingsGateway.Management.Application.UpdateZipFile": {
     "AppName": "AppName",
     "Architecture": "Architecture",
@@ -313,7 +321,8 @@
   },
   "ThingsGateway.Gateway.Application.CollectPropertyRetryBase": {
     "RetryCount": "RetryCount",
-    "DutyCycle": "DutyCycle"
+    "DutyCycle": "DutyCycle",
+    "WritePriority": "WritePriority"
   },
   "ThingsGateway.Gateway.Application.ControlController": {
     "BatchSaveChannelAsync": "BatchSaveChannel",
@@ -332,6 +341,7 @@
     "WriteVariablesAsync": "Write variables"
   },
   "ThingsGateway.Gateway.Application.Device": {
+    "Pause": "Pause",
     "ChannelError": "Channel error",
     "ChannelId": "Channel",
     "ChannelId.MinValue": "{0} cannot be empty",
@@ -388,7 +398,7 @@
     "ExpireTime": "ExpireTime {0}",
     "Unauthorized": "Unauthorized"
   },
-  "ThingsGateway.Gateway.Application.ExportString": {
+  "ThingsGateway.Gateway.Application.GatewayExportString": {
     "BusinessDeviceName": "BusinessDevice",
     "ChannelName": "Channel",
     "DeviceName": "Device",

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

@@ -1,12 +1,22 @@
 {
-  "ThingsGateway.Management.Application._Imports": {
-    "Restart": "重启",
-    "Upgrade": "更新"
+  "ThingsGateway.Management.Application.ManagementExportString": {
+
+    "ManagementConfigName": "通讯配置"
   },
-  "ThingsGateway.Management.Application.SaveUpdateZipFile": {
-    "DownTemplate": "下载模板",
-    "SaveUpdateZipFile": "上传版本包"
+  "ThingsGateway.Management.Application.ManagementConfig": {
+
+    "Name": "名称",
+    "ServerUri": "服务端Url",
+    "Enable": "启用",
+    "IsServer": "服务端",
+    "VerifyToken": "验证令牌",
+    "HeartbeatInterval": "心跳间隔",
+
+    "ImportNullError": "无法识别"
+
   },
+
+
   "ThingsGateway.Management.Application.UpdateZipFile": {
     "AppName": "名称",
     "Architecture": "架构",
@@ -97,7 +107,7 @@
     "Status": "当前站点状态",
     "Switch": "切换",
     "SyncInterval": "数据同步间隔",
-    "VerifyToken": "Token"
+    "VerifyToken": "验证令牌"
   },
   "ThingsGateway.Gateway.Application.RedundancyService": {
     "EditRedundancyOption": "修改网关冗余配置"
@@ -313,7 +323,8 @@
   },
   "ThingsGateway.Gateway.Application.CollectPropertyRetryBase": {
     "RetryCount": "失败重试次数",
-    "DutyCycle": "占空比"
+    "DutyCycle": "占空比",
+    "WritePriority": "写优先"
   },
   "ThingsGateway.Gateway.Application.ControlController": {
     "BatchSaveChannelAsync": "保存通道",
@@ -332,6 +343,7 @@
     "WriteVariablesAsync": "写入变量"
   },
   "ThingsGateway.Gateway.Application.Device": {
+    "Pause": "暂停",
     "ChannelError": "通道错误",
     "ChannelId": "通道",
     "ChannelId.MinValue": " {0} 不可为空",
@@ -390,7 +402,7 @@
     "ExpireTime": "过期时间 {0}",
     "Unauthorized": "未授权"
   },
-  "ThingsGateway.Gateway.Application.ExportString": {
+  "ThingsGateway.Gateway.Application.GatewayExportString": {
     "BusinessDeviceName": "业务设备",
     "ChannelName": "通道",
     "DeviceName": "设备",
@@ -557,7 +569,7 @@
     "LLAlarmText": "低低报文本",
     "LLRestrainExpressions": "低低报约束",
     "LRestrainExpressions": "低报约束"
-   
+
   },
 
   "ThingsGateway.Gateway.Application.VariableRuntime": {

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

@@ -83,5 +83,8 @@ public partial class AlarmRuntimePropertys
     public DateTime EventTime { get; set; } = DateTime.UnixEpoch.ToLocalTime();
 
     internal object AlarmLockObject = new();
+
+#if !Management
     internal bool AlarmConfirm;
+#endif
 }

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

@@ -23,27 +23,15 @@ namespace ThingsGateway.Gateway.Application;
 /// <summary>
 /// 业务设备运行状态
 /// </summary>
-public class ChannelRuntime : Channel, IChannelOptions, IDisposable
+public class ChannelRuntime : Channel
+#if !Management
+    ,
+    IChannelOptions,
+    IDisposable
+#endif
 {
-    /// <summary>
-    /// 插件信息
-    /// </summary>
-    [System.Text.Json.Serialization.JsonIgnore]
-    [Newtonsoft.Json.JsonIgnore]
-    [MapperIgnore]
-    [AutoGenerateColumn(Ignore = true)]
-    public PluginInfo? PluginInfo { get; set; }
 
-    /// <summary>
-    /// 是否采集
-    /// </summary>
-    public PluginTypeEnum? PluginType => PluginInfo?.PluginType;
-
-    /// <summary>
-    /// 是否采集
-    /// </summary>
-    [AutoGenerateColumn(Ignore = true)]
-    public bool? IsCollect => PluginInfo == null ? null : PluginInfo?.PluginType == PluginTypeEnum.Collect;
+#if !Management
 
     [System.Text.Json.Serialization.JsonIgnore]
     [Newtonsoft.Json.JsonIgnore]
@@ -105,19 +93,74 @@ public class ChannelRuntime : Channel, IChannelOptions, IDisposable
     [Newtonsoft.Json.JsonIgnore]
     public int? DeviceRuntimeCount => DeviceRuntimes?.Count;
 
+    [AutoGenerateColumn(Ignore = true)]
+    public bool Started => DeviceThreadManage != null;
+#else
+
+
+
+    /// <inheritdoc/>
+    [MinValue(1)]
+    public override int MaxConcurrentCount { get; set; }
+
+    /// <summary>
+    /// 设备数量
+    /// </summary>
+    public int? DeviceRuntimeCount { get; set; }
+
+    [AutoGenerateColumn(Ignore = true)]
+    public bool Started { get; set; }
+#endif
+
+
+
+    /// <summary>
+    /// 插件信息
+    /// </summary>
+    [AutoGenerateColumn(Ignore = true)]
+    public PluginInfo? PluginInfo { get; set; }
+
+    /// <summary>
+    /// 是否采集
+    /// </summary>
+    public PluginTypeEnum? PluginType => PluginInfo?.PluginType;
+
+    /// <summary>
+    /// 是否采集
+    /// </summary>
+    [AutoGenerateColumn(Ignore = true)]
+    public bool? IsCollect => PluginInfo == null ? null : PluginInfo?.PluginType == PluginTypeEnum.Collect;
+
+
+
+    public override string ToString()
+    {
+        if (ChannelType == ChannelTypeEnum.Other)
+        {
+            return Name;
+        }
+        return $"{Name}[{base.ToString()}]";
+    }
+
+    [AutoGenerateColumn(Ignore = true)]
+    public string LogPath => Name.GetChannelLogPath();
+
+
+#if !Management
     [System.Text.Json.Serialization.JsonIgnore]
     [Newtonsoft.Json.JsonIgnore]
     [MapperIgnore]
     [AutoGenerateColumn(Ignore = true)]
     public IDeviceThreadManage? DeviceThreadManage { get; internal set; }
 
-    [AutoGenerateColumn(Ignore = true)]
-    public string LogPath => Name.GetChannelLogPath();
+
+
+
 
     public void Init()
     {
         // 通过插件名称获取插件信息
-        PluginInfo = GlobalData.PluginService.GetPluginListSync().FirstOrDefault(A => A.FullName == PluginName);
+        PluginInfo = GlobalData.PluginService.GetPluginList().FirstOrDefault(A => A.FullName == PluginName);
 
         GlobalData.IdChannels.TryRemove(Id, out _);
         GlobalData.Channels.TryRemove(Name, out _);
@@ -135,14 +178,8 @@ public class ChannelRuntime : Channel, IChannelOptions, IDisposable
         DeviceThreadManage = null;
         GC.SuppressFinalize(this);
     }
-    public override string ToString()
-    {
-        if (ChannelType == ChannelTypeEnum.Other)
-        {
-            return Name;
-        }
-        return $"{Name}[{base.ToString()}]";
-    }
+
+
 
     public IChannel GetChannel(TouchSocketConfig config)
     {
@@ -192,4 +229,7 @@ public class ChannelRuntime : Channel, IChannelOptions, IDisposable
             return ichannel;
         }
     }
+
+
+#endif
 }

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

@@ -23,17 +23,36 @@ namespace ThingsGateway.Gateway.Application;
 /// <summary>
 /// 业务设备运行状态
 /// </summary>
-public class DeviceRuntime : Device, IDisposable
+public class DeviceRuntime : Device
+#if !Management
+    , IDisposable
+#endif
 {
     protected volatile DeviceStatusEnum _deviceStatus = DeviceStatusEnum.Default;
 
     private string? _lastErrorMessage;
 
+    private readonly object _lockObject = new object();
+
     /// <summary>
     /// 设备活跃时间
     /// </summary>
     public DateTime ActiveTime { get; set; } = DateTime.UnixEpoch.ToLocalTime();
 
+
+
+    /// <summary>
+    /// 是否采集
+    /// </summary>
+    [AutoGenerateColumn(Ignore = true)]
+    public bool? IsCollect => PluginType == null ? null : PluginType == PluginTypeEnum.Collect;
+
+
+    [AutoGenerateColumn(Ignore = true)]
+    public string LogPath => Name.GetDeviceLogPath();
+
+#if !Management
+
     /// <summary>
     /// 插件名称
     /// </summary>
@@ -45,12 +64,11 @@ public class DeviceRuntime : Device, IDisposable
     [AutoGenerateColumn(Ignore = true)]
     public virtual PluginTypeEnum? PluginType => ChannelRuntime?.PluginInfo?.PluginType;
 
-    /// <summary>
-    /// 是否采集
-    /// </summary>
-    [AutoGenerateColumn(Ignore = true)]
-    public bool? IsCollect => PluginType == null ? null : PluginType == PluginTypeEnum.Collect;
 
+    /// <summary>
+    /// 通道名称
+    /// </summary>
+    public string? ChannelName => ChannelRuntime?.Name;
     /// <summary>
     /// 通道
     /// </summary>
@@ -60,18 +78,16 @@ public class DeviceRuntime : Device, IDisposable
     [AutoGenerateColumn(Ignore = true)]
     public ChannelRuntime? ChannelRuntime { get; set; }
 
-    /// <summary>
-    /// 通道名称
-    /// </summary>
-    public string? ChannelName => ChannelRuntime?.Name;
+
     [AutoGenerateColumn(Ignore = true)]
-    public string LogPath => Name.GetDeviceLogPath();
+    public bool Started => Driver?.DeviceThreadManage != null;
 
     [System.Text.Json.Serialization.JsonIgnore]
     [Newtonsoft.Json.JsonIgnore]
     [MapperIgnore]
     public DateTime DeviceStatusChangeTime = DateTime.UnixEpoch.ToLocalTime();
 
+
     /// <summary>
     /// 设备状态
     /// </summary>
@@ -98,6 +114,79 @@ public class DeviceRuntime : Device, IDisposable
         }
     }
 
+
+    /// <summary>
+    /// 设备变量数量
+    /// </summary>
+    public int DeviceVariableCount { get => Driver == null ? VariableRuntimes?.Count ?? 0 : Driver.IdVariableRuntimes.Count; }
+
+    /// <summary>
+    /// 设备读取打包数量
+    /// </summary>
+    public int SourceVariableCount => VariableSourceReads?.Count ?? 0;
+
+#else
+
+
+
+    /// <summary>
+    /// 插件名称
+    /// </summary>
+    public virtual string PluginName { get; set; }
+
+    /// <summary>
+    /// 插件名称
+    /// </summary>
+    [AutoGenerateColumn(Ignore = true)]
+    public virtual PluginTypeEnum? PluginType { get; set; }
+
+
+    /// <summary>
+    /// 通道名称
+    /// </summary>
+    public string? ChannelName { get; set; }
+
+    [AutoGenerateColumn(Ignore = true)]
+    public bool Started { get; set; }
+
+
+    /// <summary>
+    /// 设备状态
+    /// </summary>
+    public virtual DeviceStatusEnum DeviceStatus
+    {
+        get
+        {
+            if (!Pause)
+                return _deviceStatus;
+            else
+                return DeviceStatusEnum.Pause;
+        }
+        set
+        {
+            lock (_lockObject)
+            {
+                if (_deviceStatus != value)
+                {
+                    _deviceStatus = value;
+                }
+            }
+        }
+    }
+
+
+    /// <summary>
+    /// 设备变量数量
+    /// </summary>
+    public int DeviceVariableCount { get; set; }
+    /// <summary>
+    /// 设备读取打包数量
+    /// </summary>
+    public int SourceVariableCount { get; set; }
+
+
+#endif
+
     /// <summary>
     /// 暂停
     /// </summary>
@@ -114,8 +203,13 @@ public class DeviceRuntime : Device, IDisposable
         }
         set
         {
+#if !Management
             if (!value.IsNullOrWhiteSpace())
                 _lastErrorMessage = TimerX.Now.ToDefaultDateTimeFormat() + " - " + value;
+#else
+            if (!value.IsNullOrWhiteSpace())
+                _lastErrorMessage = value;
+#endif
         }
     }
 
@@ -130,12 +224,17 @@ public class DeviceRuntime : Device, IDisposable
     /// </summary>
     public RedundantTypeEnum? RedundantType { get; set; } = null;
 
-    /// <summary>
-    /// 设备变量数量
-    /// </summary>
-    public int DeviceVariableCount { get => Driver == null ? VariableRuntimes?.Count ?? 0 : Driver.IdVariableRuntimes.Count; }
 
-    #region 采集
+
+    /// <summary>
+    /// 特殊方法数量
+    /// </summary>
+    public int MethodVariableCount { get; set; }
+
+
+
+
+#if !Management
 
     /// <summary>
     /// 设备变量
@@ -154,11 +253,6 @@ public class DeviceRuntime : Device, IDisposable
     [AutoGenerateColumn(Ignore = true)]
     internal ConcurrentDictionary<string, VariableRuntime>? VariableRuntimes { get; } = new(Environment.ProcessorCount, 1000);
 
-    /// <summary>
-    /// 特殊方法数量
-    /// </summary>
-    public int MethodVariableCount { get; set; }
-
     /// <summary>
     /// 特殊方法变量
     /// </summary>
@@ -168,11 +262,6 @@ public class DeviceRuntime : Device, IDisposable
     [AutoGenerateColumn(Ignore = true)]
     public List<VariableMethod>? ReadVariableMethods { get; set; }
 
-    /// <summary>
-    /// 设备读取打包数量
-    /// </summary>
-    public int SourceVariableCount => VariableSourceReads?.Count ?? 0;
-
     /// <summary>
     /// 打包变量
     /// </summary>
@@ -191,10 +280,11 @@ public class DeviceRuntime : Device, IDisposable
     [AutoGenerateColumn(Ignore = true)]
     public List<VariableScriptRead>? VariableScriptReads { get; set; }
 
-    public volatile bool CheckEnable;
-    private readonly object _lockObject = new object();
+#endif
 
-    #endregion 采集
+
+
+#if !Management
 
     /// <summary>
     /// 传入设备的状态信息
@@ -218,6 +308,7 @@ public class DeviceRuntime : Device, IDisposable
             LastErrorMessage = lastErrorMessage;
     }
 
+
     [System.Text.Json.Serialization.JsonIgnore]
     [Newtonsoft.Json.JsonIgnore]
     [MapperIgnore]
@@ -230,6 +321,7 @@ public class DeviceRuntime : Device, IDisposable
     [AutoGenerateColumn(Ignore = true)]
     public IRpcDriver? RpcDriver { get; set; }
 
+
     [System.Text.Json.Serialization.JsonIgnore]
     [Newtonsoft.Json.JsonIgnore]
     [AutoGenerateColumn(Ignore = true)]
@@ -263,4 +355,7 @@ public class DeviceRuntime : Device, IDisposable
 
         GC.SuppressFinalize(this);
     }
+
+
+#endif
 }

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

@@ -17,12 +17,13 @@ namespace ThingsGateway.Gateway.Application;
 /// </summary>
 public class PluginInfo
 {
+#if !Management
     /// <summary>
     /// 插件文件名称.插件类型名称
     /// </summary>
     [AutoGenerateColumn(Ignore = true)]
     public List<PluginInfo>? Children { get; set; } = new();
-
+#endif
     /// <summary>
     /// 插件文件名称.插件类型名称
     /// </summary>
@@ -70,5 +71,6 @@ public class PluginInfo
     /// </summary>
     [IgnoreExcel]
     [SugarColumn(IsIgnore = true)]
+    [AutoGenerateColumn(Ignore = true)]
     public string Directory { get; set; }
 }

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

@@ -8,9 +8,15 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
+using BootstrapBlazor.Components;
+
 using Newtonsoft.Json.Linq;
 
+using Riok.Mapperly.Abstractions;
+
+#if !Management
 using ThingsGateway.Gateway.Application.Extensions;
+#endif
 using ThingsGateway.NewLife.DictionaryExtensions;
 using ThingsGateway.NewLife.Json.Extension;
 
@@ -19,8 +25,206 @@ namespace ThingsGateway.Gateway.Application;
 /// <summary>
 /// 变量运行态
 /// </summary>
-public partial class VariableRuntime : Variable, IVariable, IDisposable
+public partial class VariableRuntime : Variable
+#if !Management
+    ,
+    IVariable,
+    IDisposable
+#endif
 {
+    [AutoGenerateColumn(Ignore = true)]
+    public bool ValueInited { get => _valueInited; set => _valueInited = value; }
+
+    #region 属性
+
+    /// <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(Visible = true, Filterable = true, Sortable = true, Order = 5)]
+    public DateTime ChangeTime { get => changeTime; set => changeTime = 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; }
+
+
+#if !Management
+
+    /// <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]
+    [MapperIgnore]
+    [AutoGenerateColumn(Ignore = true)]
+    public IVariableSource? VariableSource { get => variableSource; set => variableSource = value; }
+
+    /// <summary>
+    /// VariableMethod
+    /// </summary>
+    [Newtonsoft.Json.JsonIgnore]
+    [System.Text.Json.Serialization.JsonIgnore]
+    [MapperIgnore]
+    [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; }
+
+#endif
+
+
+#if !Management
+    private bool _isOnline;
+
+
+    /// <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>
+    /// 设备名称
+    /// </summary>
+    [AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true, Order = 4)]
+    public string DeviceName => DeviceRuntime?.Name;
+
+    /// <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();
+
+#else
+
+
+
+    /// <summary>
+    /// 是否在线
+    /// </summary>
+    [AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true, Order = 5)]
+    public bool IsOnline{get;set;}
+
+    /// <summary>
+    /// 设备名称
+    /// </summary>
+    [AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true, Order = 4)]
+    public string DeviceName { get; set; }
+
+    /// <summary>
+    /// <inheritdoc/>
+    /// </summary>
+    [AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true, Order = 5)]
+    public string LastErrorMessage { get; set; }
+
+
+    /// <summary>
+    /// 实时值类型
+    /// </summary>
+    [AutoGenerateColumn(Visible = true, Order = 6)]
+    public string RuntimeType { get; set; }
+
+#endif
+
+
+    /// <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 AlarmPropertys != null && (AlarmPropertys.LAlarmEnable || AlarmPropertys.LLAlarmEnable || AlarmPropertys.HAlarmEnable || AlarmPropertys.HHAlarmEnable || AlarmPropertys.BoolOpenAlarmEnable || AlarmPropertys.BoolCloseAlarmEnable || AlarmPropertys.CustomAlarmEnable);
+        }
+    }
+
+    [IgnoreExcel]
+    [AutoGenerateColumn(Ignore = true)]
+    public AlarmRuntimePropertys? AlarmRuntimePropertys { get; set; }
+
+    #endregion
+
 
 
     private int index;
@@ -29,19 +233,24 @@ public partial class VariableRuntime : Variable, IVariable, IDisposable
 
     private DateTime collectTime = DateTime.UnixEpoch.ToLocalTime();
 
-    private bool _isOnline;
+#pragma warning disable CS0414
     private bool _isOnlineChanged;
+#pragma warning restore CS0414
     private bool _valueInited;
 
-    private string _lastErrorMessage;
     private object _value;
     private object lastSetValue;
     private object rawValue;
+#if !Management
+#pragma warning disable CS0649
+    private string _lastErrorMessage;
+#pragma warning restore CS0649
     private DeviceRuntime? deviceRuntime;
     private IVariableSource? variableSource;
     private VariableMethod? variableMethod;
     private IThingsGatewayBitConverter? thingsGatewayBitConverter;
 
+
     /// <summary>
     /// 设置变量值与时间/质量戳
     /// </summary>
@@ -224,4 +433,10 @@ public partial class VariableRuntime : Variable, IVariable, IDisposable
     {
         _lastErrorMessage = lastErrorMessage;
     }
+
+
+#endif
+
+
+
 }

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

@@ -1,173 +0,0 @@
-//------------------------------------------------------------------------------
-//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
-//  此代码版权（除特别声明外的代码）归作者本人Diego所有
-//  源代码使用协议遵循本仓库的开源协议及附加协议
-//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
-//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
-//  使用文档：https://thingsgateway.cn/
-//  QQ群：605534569
-//------------------------------------------------------------------------------
-
-using BootstrapBlazor.Components;
-
-using Riok.Mapperly.Abstractions;
-
-namespace ThingsGateway.Gateway.Application;
-
-/// <summary>
-/// 变量运行态
-/// </summary>
-public partial class VariableRuntime : Variable, IVariable, IDisposable
-{
-
-    [AutoGenerateColumn(Visible = false)]
-    public bool ValueInited { get => _valueInited; set => _valueInited = value; }
-
-    #region 属性
-
-    /// <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(Visible = true, Filterable = true, Sortable = true, Order = 5)]
-    public DateTime ChangeTime { get => changeTime; set => changeTime = 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]
-    [MapperIgnore]
-    [AutoGenerateColumn(Ignore = true)]
-    public IVariableSource? VariableSource { get => variableSource; set => variableSource = value; }
-
-    /// <summary>
-    /// VariableMethod
-    /// </summary>
-    [Newtonsoft.Json.JsonIgnore]
-    [System.Text.Json.Serialization.JsonIgnore]
-    [MapperIgnore]
-    [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 AlarmPropertys != null && (AlarmPropertys.LAlarmEnable || AlarmPropertys.LLAlarmEnable || AlarmPropertys.HAlarmEnable || AlarmPropertys.HHAlarmEnable || AlarmPropertys.BoolOpenAlarmEnable || AlarmPropertys.BoolCloseAlarmEnable || AlarmPropertys.CustomAlarmEnable);
-        }
-    }
-
-    [IgnoreExcel]
-    [AutoGenerateColumn(Ignore = true)]
-    public AlarmRuntimePropertys? AlarmRuntimePropertys { get; set; }
-
-    #endregion
-
-}

src/Gateway/ThingsGateway.Gateway.Application/Services/Alarm/IRealAlarmService.cs

@@ -17,6 +17,6 @@ namespace ThingsGateway.Gateway.Application
     public interface IRealAlarmService
     {
         [DmtpRpc]
-        Task<IEnumerable<AlarmVariable>> GetCurrentUserRealAlarmVariables();
+        Task<IEnumerable<AlarmVariable>> GetCurrentUserRealAlarmVariablesAsync();
     }
 }

src/Gateway/ThingsGateway.Gateway.Application/Services/Alarm/RealAlarmService.cs

@@ -15,9 +15,9 @@ namespace ThingsGateway.Gateway.Application;
 /// </summary>
 internal sealed class RealAlarmService : IRealAlarmService
 {
-    public Task<IEnumerable<AlarmVariable>> GetCurrentUserRealAlarmVariables()
+    public Task<IEnumerable<AlarmVariable>> GetCurrentUserRealAlarmVariablesAsync()
     {
-        return GlobalData.GetCurrentUserRealAlarmVariables();
+        return GlobalData.GetCurrentUserRealAlarmVariablesAsync();
     }
 
 }

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

@@ -13,24 +13,147 @@ using BootstrapBlazor.Components;
 using Microsoft.AspNetCore.Components.Forms;
 using Microsoft.Extensions.Logging;
 
+using ThingsGateway.Extension.Generic;
 using ThingsGateway.NewLife;
+using ThingsGateway.NewLife.Extension;
 
 namespace ThingsGateway.Gateway.Application;
 
 public class ChannelRuntimeService : IChannelRuntimeService
 {
-    private ILogger _logger;
-    public ChannelRuntimeService(ILogger<ChannelRuntimeService> logger)
+    private Microsoft.Extensions.Logging.ILogger _logger;
+    public ChannelRuntimeService(Microsoft.Extensions.Logging.ILogger<ChannelRuntimeService> logger)
     {
         _logger = logger;
     }
     private WaitLock WaitLock { get; set; } = new WaitLock(nameof(ChannelRuntimeService));
 
-    public async Task<bool> CopyAsync(List<Channel> models, Dictionary<Device, List<Variable>> devices, bool restart, CancellationToken cancellationToken)
+    public Task<string> GetChannelNameAsync(long channelId)
+    {
+        return Task.FromResult(GlobalData.ReadOnlyIdChannels.TryGetValue(channelId, out var channelRuntime) ? channelRuntime.Name : string.Empty);
+    }
+
+    public Task<QueryData<ChannelRuntime>> OnChannelQueryAsync(QueryPageOptions options)
+    {
+        var data = GlobalData.IdChannels.Select(a => a.Value)
+        .WhereIf(!options.SearchText.IsNullOrWhiteSpace(), a => a.Name.Contains(options.SearchText))
+        .GetQueryData(options);
+        return Task.FromResult(data);
+    }
+
+    public Task<List<Channel>> GetChannelListAsync(QueryPageOptions options, int max = 0)
+    {
+        var models = GlobalData.IdChannels.Select(a => a.Value)
+        .WhereIf(!options.SearchText.IsNullOrWhiteSpace(), a => a.Name.Contains(options.SearchText))
+        .GetData(options, out var total).Cast<Channel>().ToList();
+
+        if (max > 0 && models.Count > max)
+        {
+            throw new("online Excel max data count 2000");
+        }
+        return Task.FromResult(models);
+    }
+
+    public Task<USheetDatas> ExportChannelAsync(List<Channel> channels)
+    {
+        return Task.FromResult(ChannelServiceHelpers.ExportChannel(channels));
+    }
+    public Task<string> GetPluginNameAsync(long channelId)
+    {
+        var pluginName = GlobalData.ReadOnlyIdChannels.TryGetValue(channelId, out var channel) ? channel.PluginName : string.Empty;
+        return Task.FromResult(pluginName);
+    }
+
+
+    public async Task<QueryData<SelectedItem>> OnChannelSelectedItemQueryAsync(VirtualizeQueryOption option)
+    {
+        var channels = await GlobalData.GetCurrentUserChannels().ConfigureAwait(false);
+        var _channelItems = channels.WhereIf(!option.SearchText.IsNullOrWhiteSpace(), a => a.Name.Contains(option.SearchText)).GetQueryData(option, GatewayResourceUtil.BuildChannelSelectList);
+        return _channelItems;
+    }
+
+
+    public Task<TouchSocket.Core.LogLevel> ChannelLogLevelAsync(long id)
+    {
+        GlobalData.IdChannels.TryGetValue(id, out var ChannelRuntime);
+        var data = ChannelRuntime?.DeviceThreadManage?.LogMessage?.LogLevel ?? TouchSocket.Core.LogLevel.Trace;
+        return Task.FromResult(data);
+    }
+
+    public async Task RestartChannelAsync(long channelId)
+    {
+        GlobalData.IdChannels.TryGetValue(channelId, out var channelRuntime);
+        await GlobalData.GetChannelThreadManage(channelRuntime).RestartChannelAsync(channelRuntime).ConfigureAwait(false);
+
+    }
+
+    public async Task SetChannelLogLevelAsync(long id, TouchSocket.Core.LogLevel logLevel)
+    {
+        if (GlobalData.IdChannels.TryGetValue(id, out var ChannelRuntime))
+        {
+            if (ChannelRuntime.DeviceThreadManage != null)
+            {
+                await ChannelRuntime.DeviceThreadManage.SetLogAsync(logLevel).ConfigureAwait(false);
+            }
+        }
+    }
+
+
+
+
+    public async Task CopyChannelAsync(int CopyCount, string CopyChannelNamePrefix, int CopyChannelNameSuffixNumber, string CopyDeviceNamePrefix, int CopyDeviceNameSuffixNumber, long channelId, bool AutoRestartThread)
+    {
+        if (!GlobalData.IdChannels.TryGetValue(channelId, out var channelRuntime))
+        {
+            return;
+        }
+        Dictionary<Device, List<Variable>> deviceDict = new();
+        Channel Model = channelRuntime.AdaptChannel();
+        Model.Id = 0;
+
+        var Devices = channelRuntime.ReadDeviceRuntimes.ToDictionary(a => a.Value.AdaptDevice(), a => a.Value.ReadOnlyVariableRuntimes.Select(a => a.Value).AdaptListVariable());
+
+        List<Channel> channels = new();
+        Dictionary<Device, List<Variable>> devices = new();
+        for (int i = 0; i < CopyCount; i++)
+        {
+            Channel channel = Model.AdaptChannel();
+            channel.Id = CommonUtils.GetSingleId();
+            channel.Name = $"{CopyChannelNamePrefix}{CopyChannelNameSuffixNumber + i}";
+
+            int index = 0;
+            foreach (var item in Devices)
+            {
+                Device device = item.Key.AdaptDevice();
+                device.Id = CommonUtils.GetSingleId();
+                device.Name = $"{channel.Name}_{CopyDeviceNamePrefix}{CopyDeviceNameSuffixNumber + (index++)}";
+                device.ChannelId = channel.Id;
+                List<Variable> variables = new();
+
+                foreach (var variable in item.Value)
+                {
+                    Variable v = variable.AdaptVariable();
+                    v.Id = CommonUtils.GetSingleId();
+                    v.DeviceId = device.Id;
+                    variables.Add(v);
+                }
+                devices.Add(device, variables);
+            }
+
+            channels.Add(channel);
+        }
+
+        await GlobalData.ChannelRuntimeService.CopyAsync(channels, devices, AutoRestartThread).ConfigureAwait(false);
+    }
+
+
+
+
+    public async Task<bool> CopyAsync(List<Channel> models, Dictionary<Device, List<Variable>> devices, bool restart)
     {
         try
         {
-            await WaitLock.WaitAsync(cancellationToken).ConfigureAwait(false);
+            await WaitLock.WaitAsync().ConfigureAwait(false);
 
             var result = await GlobalData.ChannelService.CopyAsync(models, devices).ConfigureAwait(false);
             var ids = models.Select(a => a.Id).ToHashSet();
@@ -47,7 +170,7 @@ public class ChannelRuntimeService : IChannelRuntimeService
             {
                 await GlobalData.ChannelThreadManage.RestartChannelAsync(newChannelRuntimes).ConfigureAwait(false);
 
-                await RuntimeServiceHelper.ChangedDriverAsync(_logger, cancellationToken).ConfigureAwait(false);
+                await RuntimeServiceHelper.ChangedDriverAsync(_logger).ConfigureAwait(false);
             }
 
             return true;
@@ -58,11 +181,11 @@ public class ChannelRuntimeService : IChannelRuntimeService
         }
     }
 
-    public async Task<bool> InsertAsync(List<Channel> models, List<Device> devices, List<Variable> variables, bool restart, CancellationToken cancellationToken)
+    public async Task<bool> InsertAsync(List<Channel> models, List<Device> devices, List<Variable> variables, bool restart)
     {
         try
         {
-            await WaitLock.WaitAsync(cancellationToken).ConfigureAwait(false);
+            await WaitLock.WaitAsync().ConfigureAwait(false);
 
             var result = await GlobalData.ChannelService.InsertAsync(models, devices, variables).ConfigureAwait(false);
             var ids = models.Select(a => a.Id).ToHashSet();
@@ -79,7 +202,7 @@ public class ChannelRuntimeService : IChannelRuntimeService
             {
                 await GlobalData.ChannelThreadManage.RestartChannelAsync(newChannelRuntimes).ConfigureAwait(false);
 
-                await RuntimeServiceHelper.ChangedDriverAsync(_logger, cancellationToken).ConfigureAwait(false);
+                await RuntimeServiceHelper.ChangedDriverAsync(_logger).ConfigureAwait(false);
             }
 
             return true;
@@ -90,11 +213,11 @@ public class ChannelRuntimeService : IChannelRuntimeService
         }
     }
 
-    public async Task<bool> UpdateAsync(List<Channel> models, List<Device> devices, List<Variable> variables, bool restart, CancellationToken cancellationToken)
+    public async Task<bool> UpdateAsync(List<Channel> models, List<Device> devices, List<Variable> variables, bool restart)
     {
         try
         {
-            await WaitLock.WaitAsync(cancellationToken).ConfigureAwait(false);
+            await WaitLock.WaitAsync().ConfigureAwait(false);
 
             var result = await GlobalData.ChannelService.UpdateAsync(models, devices, variables).ConfigureAwait(false);
             var ids = models.Select(a => a.Id).ToHashSet();
@@ -111,7 +234,7 @@ public class ChannelRuntimeService : IChannelRuntimeService
             {
                 await GlobalData.ChannelThreadManage.RestartChannelAsync(newChannelRuntimes).ConfigureAwait(false);
 
-                await RuntimeServiceHelper.ChangedDriverAsync(_logger, cancellationToken).ConfigureAwait(false);
+                await RuntimeServiceHelper.ChangedDriverAsync(_logger).ConfigureAwait(false);
             }
 
             return true;
@@ -122,7 +245,7 @@ public class ChannelRuntimeService : IChannelRuntimeService
         }
     }
 
-    public async Task<bool> BatchEditAsync(IEnumerable<Channel> models, Channel oldModel, Channel model, bool restart)
+    public async Task<bool> BatchEditChannelAsync(List<Channel> models, Channel oldModel, Channel model, bool restart)
     {
         try
         {
@@ -148,11 +271,11 @@ public class ChannelRuntimeService : IChannelRuntimeService
         }
     }
 
-    public async Task<bool> DeleteChannelAsync(IEnumerable<long> ids, bool restart, CancellationToken cancellationToken)
+    public async Task<bool> DeleteChannelAsync(List<long> ids, bool restart)
     {
         try
         {
-            await WaitLock.WaitAsync(cancellationToken).ConfigureAwait(false);
+            await WaitLock.WaitAsync().ConfigureAwait(false);
 
             var array = ids.ToArray();
             var result = await GlobalData.ChannelService.DeleteChannelAsync(array).ConfigureAwait(false);
@@ -164,7 +287,7 @@ public class ChannelRuntimeService : IChannelRuntimeService
             {
                 await GlobalData.ChannelThreadManage.RemoveChannelAsync(array).ConfigureAwait(false);
 
-                await RuntimeServiceHelper.ChangedDriverAsync(changedDriver, _logger, cancellationToken).ConfigureAwait(false);
+                await RuntimeServiceHelper.ChangedDriverAsync(changedDriver, _logger).ConfigureAwait(false);
             }
 
             return true;
@@ -174,14 +297,105 @@ public class ChannelRuntimeService : IChannelRuntimeService
             WaitLock.Release();
         }
     }
-
+    public Task<bool> ClearChannelAsync(bool restart)
+    {
+        return DeleteChannelAsync(GlobalData.IdChannels.Keys.ToList(), restart);
+    }
     public Task<Dictionary<string, ImportPreviewOutputBase>> PreviewAsync(IBrowserFile browserFile) => GlobalData.ChannelService.PreviewAsync(browserFile);
 
-    public Task<Dictionary<string, object>> ExportChannelAsync(ExportFilter exportFilter) => GlobalData.ChannelService.ExportChannelAsync(exportFilter);
+    public Task<Dictionary<string, object>> ExportChannelAsync(GatewayExportFilter exportFilter) => GlobalData.ChannelService.ExportChannelAsync(exportFilter);
 
     public Task<MemoryStream> ExportMemoryStream(IEnumerable<Channel> data) =>
       GlobalData.ChannelService.ExportMemoryStream(data);
 
+    public async Task<Dictionary<string, ImportPreviewOutputBase>> ImportChannelUSheetDatasAsync(USheetDatas input, bool restart)
+    {
+        try
+        {
+            await WaitLock.WaitAsync().ConfigureAwait(false);
+
+
+            var data = await ChannelServiceHelpers.ImportAsync(input).ConfigureAwait(false);
+
+            if (data.Any(a => a.Value.HasError)) return data;
+
+            var result = await GlobalData.ChannelService.ImportChannelAsync(data).ConfigureAwait(false);
+
+            var newChannelRuntimes = await RuntimeServiceHelper.GetNewChannelRuntimesAsync(result).ConfigureAwait(false);
+
+            RuntimeServiceHelper.Init(newChannelRuntimes);
+
+            //根据条件重启通道线程
+            if (restart)
+                await GlobalData.ChannelThreadManage.RestartChannelAsync(newChannelRuntimes).ConfigureAwait(false);
+
+            return data;
+        }
+
+        finally
+        {
+            WaitLock.Release();
+        }
+    }
+
+    public async Task<Dictionary<string, ImportPreviewOutputBase>> ImportChannelFileAsync(string filePath, bool restart)
+    {
+        try
+        {
+            await WaitLock.WaitAsync().ConfigureAwait(false);
+
+            var data = await GlobalData.ChannelService.PreviewAsync(filePath).ConfigureAwait(false);
+
+            if (data.Any(a => a.Value.HasError)) return data;
+            var result = await GlobalData.ChannelService.ImportChannelAsync(data).ConfigureAwait(false);
+
+            var newChannelRuntimes = await RuntimeServiceHelper.GetNewChannelRuntimesAsync(result).ConfigureAwait(false);
+
+            RuntimeServiceHelper.Init(newChannelRuntimes);
+
+            //根据条件重启通道线程
+            if (restart)
+                await GlobalData.ChannelThreadManage.RestartChannelAsync(newChannelRuntimes).ConfigureAwait(false);
+
+            return data;
+        }
+
+        finally
+        {
+            WaitLock.Release();
+        }
+    }
+
+
+    public async Task<Dictionary<string, ImportPreviewOutputBase>> ImportChannelAsync(IBrowserFile file, bool restart)
+    {
+        try
+        {
+            await WaitLock.WaitAsync().ConfigureAwait(false);
+
+            var data = await GlobalData.ChannelService.PreviewAsync(file).ConfigureAwait(false);
+
+            if (data.Any(a => a.Value.HasError)) return data;
+            var result = await GlobalData.ChannelService.ImportChannelAsync(data).ConfigureAwait(false);
+
+            var newChannelRuntimes = await RuntimeServiceHelper.GetNewChannelRuntimesAsync(result).ConfigureAwait(false);
+
+            RuntimeServiceHelper.Init(newChannelRuntimes);
+
+            //根据条件重启通道线程
+            if (restart)
+                await GlobalData.ChannelThreadManage.RestartChannelAsync(newChannelRuntimes).ConfigureAwait(false);
+
+            return data;
+        }
+
+        finally
+        {
+            WaitLock.Release();
+        }
+    }
+
+
     public async Task ImportChannelAsync(Dictionary<string, ImportPreviewOutputBase> input, bool restart)
     {
         try
@@ -204,6 +418,31 @@ public class ChannelRuntimeService : IChannelRuntimeService
             WaitLock.Release();
         }
     }
+
+    public async Task ImportChannelAsync(List<Channel> upData, List<Channel> insertData, bool restart)
+    {
+
+        try
+        {
+            await WaitLock.WaitAsync().ConfigureAwait(false);
+
+            var result = await GlobalData.ChannelService.ImportChannelAsync(upData, insertData).ConfigureAwait(false);
+
+            var newChannelRuntimes = await RuntimeServiceHelper.GetNewChannelRuntimesAsync(result).ConfigureAwait(false);
+
+            RuntimeServiceHelper.Init(newChannelRuntimes);
+
+            //根据条件重启通道线程
+            if (restart)
+                await GlobalData.ChannelThreadManage.RestartChannelAsync(newChannelRuntimes).ConfigureAwait(false);
+        }
+
+        finally
+        {
+            WaitLock.Release();
+        }
+    }
+
     public async Task<bool> SaveChannelAsync(Channel input, ItemChangedType type, bool restart)
     {
         try
@@ -279,4 +518,11 @@ public class ChannelRuntimeService : IChannelRuntimeService
             WaitLock.Release();
         }
     }
+
+    public async Task<string> ExportChannelFileAsync(GatewayExportFilter exportFilter)
+    {
+        var sheets = await GlobalData.ChannelService.ExportChannelAsync(exportFilter).ConfigureAwait(false);
+        return await App.GetService<IImportExportService>().CreateFileAsync<Channel>(sheets, "Channel", false).ConfigureAwait(false);
+
+    }
 }

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

@@ -247,7 +247,7 @@ internal sealed class ChannelService : BaseService<Channel>, IChannelService
     /// 报表查询
     /// </summary>
     /// <param name="exportFilter">查询条件</param>
-    public async Task<QueryData<Channel>> PageAsync(ExportFilter exportFilter)
+    public async Task<QueryData<Channel>> PageAsync(GatewayExportFilter exportFilter)
     {
         var whereQuery = await GetWhereQueryFunc(exportFilter).ConfigureAwait(false);
 
@@ -255,12 +255,12 @@ internal sealed class ChannelService : BaseService<Channel>, IChannelService
        , exportFilter.FilterKeyValueAction).ConfigureAwait(false);
     }
 
-    private async Task<Func<ISugarQueryable<Channel>, ISugarQueryable<Channel>>> GetWhereQueryFunc(ExportFilter exportFilter)
+    private async Task<Func<ISugarQueryable<Channel>, ISugarQueryable<Channel>>> GetWhereQueryFunc(GatewayExportFilter exportFilter)
     {
         HashSet<long>? channel = null;
         if (exportFilter.PluginType != null)
         {
-            var pluginInfo = GlobalData.PluginService.GetPluginListSync(exportFilter.PluginType).Select(a => a.FullName).ToHashSet();
+            var pluginInfo = GlobalData.PluginService.GetPluginList(exportFilter.PluginType).Select(a => a.FullName).ToHashSet();
             channel = GlobalData.IdChannels.Where(a => pluginInfo.Contains(a.Value.PluginName)).Select(a => a.Value.Id).ToHashSet();
         }
         var dataScope = await GlobalData.SysUserService.GetCurrentUserDataScopeAsync().ConfigureAwait(false);
@@ -331,15 +331,15 @@ internal sealed class ChannelService : BaseService<Channel>, IChannelService
 
     /// <inheritdoc/>
     [OperDesc("ExportChannel", isRecordPar: false, localizerType: typeof(Channel))]
-    public async Task<Dictionary<string, object>> ExportChannelAsync(ExportFilter exportFilter)
+    public async Task<Dictionary<string, object>> ExportChannelAsync(GatewayExportFilter exportFilter)
     {
         var channels = await GetEnumerableData(exportFilter).ConfigureAwait(false);
         var rows = ChannelServiceHelpers.ExportRows(channels); // IEnumerable 延迟执行
-        var sheets = ChannelServiceHelpers.WrapAsSheet(ExportString.ChannelName, rows);
+        var sheets = ChannelServiceHelpers.WrapAsSheet(GatewayExportString.ChannelName, rows);
         return sheets;
     }
 
-    private async Task<IAsyncEnumerable<Channel>> GetEnumerableData(ExportFilter exportFilter)
+    private async Task<IAsyncEnumerable<Channel>> GetEnumerableData(GatewayExportFilter exportFilter)
     {
         var db = GetDB();
         var whereQuery = await GetWhereQueryFunc(exportFilter).ConfigureAwait(false);
@@ -354,7 +354,7 @@ internal sealed class ChannelService : BaseService<Channel>, IChannelService
     public async Task<MemoryStream> ExportMemoryStream(IEnumerable<Channel> channels)
     {
         var rows = ChannelServiceHelpers.ExportRows(channels); // IEnumerable 延迟执行
-        var sheets = ChannelServiceHelpers.WrapAsSheet(ExportString.ChannelName, rows);
+        var sheets = ChannelServiceHelpers.WrapAsSheet(GatewayExportString.ChannelName, rows);
         var memoryStream = new MemoryStream();
         await memoryStream.SaveAsAsync(sheets).ConfigureAwait(false);
         memoryStream.Seek(0, SeekOrigin.Begin);
@@ -365,14 +365,15 @@ internal sealed class ChannelService : BaseService<Channel>, IChannelService
 
     #region 导入
 
+
     /// <inheritdoc/>
     [OperDesc("ImportChannel", isRecordPar: false, localizerType: typeof(Channel))]
-    public async Task<HashSet<long>> ImportChannelAsync(Dictionary<string, ImportPreviewOutputBase> input)
+    public Task<HashSet<long>> ImportChannelAsync(Dictionary<string, ImportPreviewOutputBase> input)
     {
         List<Channel>? channels = new List<Channel>();
         foreach (var item in input)
         {
-            if (item.Key == ExportString.ChannelName)
+            if (item.Key == GatewayExportString.ChannelName)
             {
                 var channelImports = ((ImportPreviewListOutput<Channel>)item.Value).Data;
                 channels = channelImports;
@@ -381,7 +382,13 @@ internal sealed class ChannelService : BaseService<Channel>, IChannelService
         }
         var upData = channels.Where(a => a.IsUp).ToList();
         var insertData = channels.Where(a => !a.IsUp).ToList();
+        return ImportChannelAsync(upData, insertData);
+    }
 
+
+
+    public async Task<HashSet<long>> ImportChannelAsync(List<Channel> upData, List<Channel> insertData)
+    {
         ManageHelper.CheckChannelCount(insertData.Count);
 
         using var db = GetDB();
@@ -396,13 +403,23 @@ internal sealed class ChannelService : BaseService<Channel>, IChannelService
             await db.BulkUpdateAsync(upData, 10000).ConfigureAwait(false);
         }
         DeleteChannelFromCache();
-        return channels.Select(a => a.Id).ToHashSet();
+        return upData.Select(a => a.Id).Concat(insertData.Select(a => a.Id)).ToHashSet();
     }
 
+
+
+
+
     /// <inheritdoc/>
     public async Task<Dictionary<string, ImportPreviewOutputBase>> PreviewAsync(IBrowserFile browserFile)
     {
         var path = await browserFile.StorageLocal().ConfigureAwait(false);
+        return await PreviewAsync(path).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public async Task<Dictionary<string, ImportPreviewOutputBase>> PreviewAsync(string path)
+    {
         try
         {
             var dataScope = await GlobalData.SysUserService.GetCurrentUserDataScopeAsync().ConfigureAwait(false);
@@ -431,7 +448,7 @@ internal sealed class ChannelService : BaseService<Channel>, IChannelService
     {
         #region sheet
 
-        if (sheetName == ExportString.ChannelName)
+        if (sheetName == GatewayExportString.ChannelName)
         {
             int row = 1;
             ImportPreviewListOutput<Channel> importPreviewOutput = new();
@@ -441,7 +458,7 @@ internal sealed class ChannelService : BaseService<Channel>, IChannelService
             // 获取目标类型的所有属性，并根据是否需要过滤 IgnoreExcelAttribute 进行筛选
             var channelProperties = type.GetRuntimeProperties().Where(a => (a.GetCustomAttribute<IgnoreExcelAttribute>() == null) && a.CanWrite)
                                         .ToDictionary(a => type.GetPropertyDisplayName(a.Name), a => (a, a.IsNullableType()));
-
+            string unportNull = App.CreateLocalizerByType(typeof(Channel))["ImportNullError"];
             rows.ForEach(item =>
             {
                 try
@@ -450,7 +467,7 @@ internal sealed class ChannelService : BaseService<Channel>, IChannelService
                     if (channel == null)
                     {
                         importPreviewOutput.HasError = true;
-                        importPreviewOutput.Results.Add((Interlocked.Increment(ref row), false, Localizer["ImportNullError"]));
+                        importPreviewOutput.Results.Add((Interlocked.Increment(ref row), false, unportNull));
                         return;
                     }
 

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

@@ -16,54 +16,11 @@ using ThingsGateway.Common.Extension;
 
 namespace ThingsGateway.Gateway.Application;
 
-public static class ChannelServiceHelpers
+public static partial class ChannelServiceHelpers
 {
-    public static USheetDatas ExportChannel(IEnumerable<Channel> channels)
-    {
-        var rows = ExportRows(channels); // IEnumerable 延迟执行
-        var sheets = WrapAsSheet(ExportString.ChannelName, rows);
-        return USheetDataHelpers.GetUSheetDatas(sheets);
-    }
 
-    internal static IEnumerable<Dictionary<string, object>> ExportRows(IEnumerable<Channel>? data)
-    {
-        if (data == null)
-            yield break;
 
-        #region 列名称
 
-        var type = typeof(Channel);
-        var propertyInfos = type.GetRuntimeProperties().Where(a => a.GetCustomAttribute<IgnoreExcelAttribute>(false) == null)
-             .OrderBy(
-            a =>
-            {
-                var order = a.GetCustomAttribute<AutoGenerateColumnAttribute>()?.Order ?? int.MaxValue;
-                if (order < 0)
-                {
-                    order = order + 10000000;
-                }
-                else if (order == 0)
-                {
-                    order = 10000000;
-                }
-                return order;
-            }
-            )
-            ;
-
-        #endregion 列名称
-
-        foreach (var device in data)
-        {
-            Dictionary<string, object> row = new();
-            foreach (var prop in propertyInfos)
-            {
-                var desc = type.GetPropertyDisplayName(prop.Name);
-                row.Add(desc ?? prop.Name, prop.GetValue(device)?.ToString());
-            }
-            yield return row;
-        }
-    }
 
     internal static async IAsyncEnumerable<Dictionary<string, object>> ExportRows(IAsyncEnumerable<Channel>? data)
     {
@@ -108,13 +65,6 @@ public static class ChannelServiceHelpers
         }
     }
 
-    internal static Dictionary<string, object> WrapAsSheet(string sheetName, IEnumerable<IDictionary<string, object>> rows)
-    {
-        return new Dictionary<string, object>
-        {
-            [sheetName] = rows
-        };
-    }
 
     internal static Dictionary<string, object> WrapAsSheet(string sheetName, IAsyncEnumerable<IDictionary<string, object>> rows)
     {

src/Gateway/ThingsGateway.Gateway.Application/Services/Channel/ChannelServiceHelpers.m.cs

@@ -0,0 +1,75 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+using BootstrapBlazor.Components;
+
+using System.Reflection;
+
+using ThingsGateway.Common.Extension;
+
+namespace ThingsGateway.Gateway.Application;
+
+public static partial class ChannelServiceHelpers
+{
+    public static USheetDatas ExportChannel(IEnumerable<Channel> channels)
+    {
+        var rows = ExportRows(channels); // IEnumerable 延迟执行
+        var sheets = WrapAsSheet(GatewayExportString.ChannelName, rows);
+        return USheetDataHelpers.GetUSheetDatas(sheets);
+    }
+    internal static Dictionary<string, object> WrapAsSheet(string sheetName, IEnumerable<IDictionary<string, object>> rows)
+    {
+        return new Dictionary<string, object>
+        {
+            [sheetName] = rows
+        };
+    }
+
+    internal static IEnumerable<Dictionary<string, object>> ExportRows(IEnumerable<Channel>? data)
+    {
+        if (data == null)
+            yield break;
+
+        #region 列名称
+
+        var type = typeof(Channel);
+        var propertyInfos = type.GetRuntimeProperties().Where(a => a.GetCustomAttribute<IgnoreExcelAttribute>(false) == null)
+             .OrderBy(
+            a =>
+            {
+                var order = a.GetCustomAttribute<AutoGenerateColumnAttribute>()?.Order ?? int.MaxValue;
+                if (order < 0)
+                {
+                    order = order + 10000000;
+                }
+                else if (order == 0)
+                {
+                    order = 10000000;
+                }
+                return order;
+            }
+            )
+            ;
+
+        #endregion 列名称
+
+        foreach (var device in data)
+        {
+            Dictionary<string, object> row = new();
+            foreach (var prop in propertyInfos)
+            {
+                var desc = type.GetPropertyDisplayName(prop.Name);
+                row.Add(desc ?? prop.Name, prop.GetValue(device)?.ToString());
+            }
+            yield return row;
+        }
+    }
+
+}

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

@@ -0,0 +1,71 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+
+using BootstrapBlazor.Components;
+
+using Microsoft.AspNetCore.Components.Forms;
+
+namespace ThingsGateway.Gateway.Application
+{
+    public interface IChannelPageService
+    {
+        Task<string> GetPluginNameAsync(long channelId);
+
+        Task RestartChannelAsync(long channelId);
+
+        Task<TouchSocket.Core.LogLevel> ChannelLogLevelAsync(long id);
+        Task SetChannelLogLevelAsync(long id, TouchSocket.Core.LogLevel logLevel);
+        Task CopyChannelAsync(int CopyCount, string CopyChannelNamePrefix, int CopyChannelNameSuffixNumber, string CopyDeviceNamePrefix, int CopyDeviceNameSuffixNumber, long channelId, bool AutoRestartThread);
+
+        Task<QueryData<ChannelRuntime>> OnChannelQueryAsync(QueryPageOptions options);
+        Task<List<Channel>> GetChannelListAsync(QueryPageOptions options, int max = 0);
+        Task<Dictionary<string, ImportPreviewOutputBase>> ImportChannelAsync(IBrowserFile file, bool restart);
+
+        /// <summary>
+        /// 保存通道
+        /// </summary>
+        /// <param name="input">通道对象</param>
+        /// <param name="type">保存类型</param>
+        /// <param name="restart">重启</param>
+        Task<bool> SaveChannelAsync(Channel input, ItemChangedType type, bool restart);
+
+        /// <summary>
+        /// 批量修改
+        /// </summary>
+        /// <param name="models">列表</param>
+        /// <param name="oldModel">旧数据</param>
+        /// <param name="model">新数据</param>
+        /// <param name="restart">重启</param>
+        /// <returns></returns>
+        Task<bool> BatchEditChannelAsync(List<Channel> models, Channel oldModel, Channel model, bool restart);
+
+        /// <summary>
+        /// 删除通道
+        /// </summary>
+        Task<bool> DeleteChannelAsync(List<long> ids, bool restart);
+        /// <summary>
+        /// 删除通道
+        /// </summary>
+        Task<bool> ClearChannelAsync(bool restart);
+        Task ImportChannelAsync(List<Channel> upData, List<Channel> insertData, bool restart);
+        Task<Dictionary<string, ImportPreviewOutputBase>> ImportChannelUSheetDatasAsync(USheetDatas input, bool restart);
+        Task<Dictionary<string, ImportPreviewOutputBase>> ImportChannelFileAsync(string filePath, bool restart);
+
+
+        Task<USheetDatas> ExportChannelAsync(List<Channel> channels);
+
+        Task<string> ExportChannelFileAsync(GatewayExportFilter exportFilter);
+
+
+        Task<QueryData<SelectedItem>> OnChannelSelectedItemQueryAsync(VirtualizeQueryOption option);
+        Task<string> GetChannelNameAsync(long channelId);
+    }
+}

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

@@ -14,16 +14,8 @@ using Microsoft.AspNetCore.Components.Forms;
 
 namespace ThingsGateway.Gateway.Application;
 
-public interface IChannelRuntimeService
+public interface IChannelRuntimeService : IChannelPageService
 {
-    /// <summary>
-    /// 保存通道
-    /// </summary>
-    /// <param name="input">通道对象</param>
-    /// <param name="type">保存类型</param>
-    /// <param name="restart">重启</param>
-    Task<bool> SaveChannelAsync(Channel input, ItemChangedType type, bool restart);
-
     /// <summary>
     /// 保存通道
     /// </summary>
@@ -32,30 +24,21 @@ public interface IChannelRuntimeService
     /// <param name="restart">重启</param>
     Task<bool> BatchSaveChannelAsync(List<Channel> input, ItemChangedType type, bool restart);
 
-    /// <summary>
-    /// 批量修改
-    /// </summary>
-    /// <param name="models">列表</param>
-    /// <param name="oldModel">旧数据</param>
-    /// <param name="model">新数据</param>
-    /// <param name="restart">重启</param>
-    /// <returns></returns>
-    Task<bool> BatchEditAsync(IEnumerable<Channel> models, Channel oldModel, Channel model, bool restart);
-
-    /// <summary>
-    /// 删除通道
-    /// </summary>
-    Task<bool> DeleteChannelAsync(IEnumerable<long> ids, bool restart, CancellationToken cancellationToken);
 
     /// <summary>
     /// 导入通道数据
     /// </summary>
     Task ImportChannelAsync(Dictionary<string, ImportPreviewOutputBase> input, bool restart);
-    Task<Dictionary<string, object>> ExportChannelAsync(ExportFilter exportFilter);
+
+
+    Task<Dictionary<string, object>> ExportChannelAsync(GatewayExportFilter exportFilter);
     Task<Dictionary<string, ImportPreviewOutputBase>> PreviewAsync(IBrowserFile browserFile);
     Task<MemoryStream> ExportMemoryStream(IEnumerable<Channel> data);
     Task RestartChannelAsync(IEnumerable<ChannelRuntime> oldChannelRuntimes);
-    Task<bool> CopyAsync(List<Channel> models, Dictionary<Device, List<Variable>> devices, bool restart, CancellationToken cancellationToken);
-    Task<bool> UpdateAsync(List<Channel> models, List<Device> devices, List<Variable> variables, bool restart, CancellationToken cancellationToken);
-    Task<bool> InsertAsync(List<Channel> models, List<Device> devices, List<Variable> variables, bool restart, CancellationToken cancellationToken);
+    Task<bool> CopyAsync(List<Channel> models, Dictionary<Device, List<Variable>> devices, bool restart);
+    Task<bool> UpdateAsync(List<Channel> models, List<Device> devices, List<Variable> variables, bool restart);
+    Task<bool> InsertAsync(List<Channel> models, List<Device> devices, List<Variable> variables, bool restart);
+
+
+
 }

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

@@ -46,7 +46,7 @@ internal interface IChannelService
     /// 导出通道为文件流结果
     /// </summary>
     /// <returns>文件流结果</returns>
-    Task<Dictionary<string, object>> ExportChannelAsync(ExportFilter exportFilter);
+    Task<Dictionary<string, object>> ExportChannelAsync(GatewayExportFilter exportFilter);
 
     /// <summary>
     /// 导出通道为内存流
@@ -71,7 +71,7 @@ internal interface IChannelService
     /// 报表查询
     /// </summary>
     /// <param name="exportFilter">查询条件</param>
-    Task<QueryData<Channel>> PageAsync(ExportFilter exportFilter);
+    Task<QueryData<Channel>> PageAsync(GatewayExportFilter exportFilter);
 
     /// <summary>
     /// 预览导入数据
@@ -102,4 +102,7 @@ internal interface IChannelService
     Task UpdateLogAsync(long channelId, TouchSocket.Core.LogLevel logLevel);
     Task<bool> InsertAsync(List<Channel> models, List<Device> devices, List<Variable> variables);
     Task<bool> UpdateAsync(List<Channel> models, List<Device> devices, List<Variable> variables);
+    Task<HashSet<long>> ImportChannelAsync(List<Channel> upData, List<Channel> insertData);
+
+    Task<Dictionary<string, ImportPreviewOutputBase>> PreviewAsync(string path);
 }