g82tt/KinginfoGateway
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: mqttCollect插件无法订阅两个以上的主题

Browse Source
This commit is contained in:
2248356998 qq.com
2025-10-28 23:34:47 +08:00
parent e3960ce115
commit 8086e7cc05
10 changed files with 149 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

134
src/Admin/ThingsGateway.Common/Extensions/EnumerableQueryPageOptionsExtensions.cs Normal file
View File

@@ -0,0 +1,134 @@
//------------------------------------------------------------------------------
// 此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
// 此代码版权（除特别声明外的代码）归作者本人Diego所有
// 源代码使用协议遵循本仓库的开源协议及附加协议
// Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
// Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
// 使用文档：https://thingsgateway.cn/
// QQ群：605534569
//------------------------------------------------------------------------------
namespace ThingsGateway.Common;
/// <inheritdoc/>
[ThingsGateway.DependencyInjection.SuppressSniffer]
public static class EnumerableQueryPageOptionsExtensions
{
public static IEnumerable<T> GetData<T>(this IEnumerable<T> datas, QueryPageOptions option, out int totalCount, FilterKeyValueAction where = null)
{
totalCount = 0;
if (datas == null)
return new List<T>();
where ??= option.ToFilter();
if (where.HasFilters())
{
datas = datas.Where(where.GetFilterFunc<T>());//name asc模式
}
if (option.SortList.Count > 0)
{
datas = datas.Sort(option.SortList);//name asc模式
}
if (option.AdvancedSortList.Count > 0)
{
datas = datas.Sort(option.AdvancedSortList);//name asc模式
}
if (option.SortOrder != SortOrder.Unset && !option.SortName.IsNullOrWhiteSpace())
{
datas = datas.Sort(option.SortName, option.SortOrder);
}
totalCount = datas.Count();
if (option.IsPage)
{
datas = datas.Skip((option.PageIndex - 1) * option.PageItems).Take(option.PageItems);
}
else if (option.IsVirtualScroll)
{
datas = datas.Skip((option.StartIndex) * option.PageItems).Take(option.PageItems);
}
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)
query = queryFunc(query);
where ??= option.ToFilter();
if (where.HasFilters())
{
query = query.Where(where.GetFilterFunc<T>());//name asc模式
}
if (option.SortOrder != SortOrder.Unset && !string.IsNullOrEmpty(option.SortName))
{
var invoker = Utility.GetSortFunc<T>();
query = invoker(query, option.SortName, option.SortOrder);
}
else if (option.SortList.Count > 0)
{
var invoker = Utility.GetSortListFunc<T>();
query = invoker(query, option.SortList);
}
else if (option.AdvancedSortList.Count > 0)
{
var invoker = Utility.GetSortListFunc<T>();
query = invoker(query, option.AdvancedSortList);
}
return query;
}
/// <summary>
/// 根据查询条件返回QueryData
/// </summary>
public static QueryData<T> GetQueryData<T>(this IEnumerable<T> datas, QueryPageOptions option, FilterKeyValueAction where = null)
{
var ret = new QueryData<T>()
{
IsSorted = option.SortOrder != SortOrder.Unset,
IsFiltered = option.Filters.Count > 0,
IsAdvanceSearch = option.AdvanceSearches.Count > 0 || option.CustomerSearches.Count > 0,
IsSearch = option.Searches.Count > 0
};
var items = datas.GetData(option, out var totalCount, where);
ret.TotalCount = totalCount;
if (totalCount > 0)
{
if (!items.Any() && option.PageIndex != 1)
{
option.PageIndex = 1;
items = datas.GetData(option, out totalCount, where);
}
}
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;
}
}

2
src/Admin/ThingsGateway.DB/Extensions/ExportExcelExtensions.cs → src/Admin/ThingsGateway.Common/Extensions/ExportExcelExtensions.cs
View File

@@ -19,7 +19,7 @@ using System.Reflection;
using ThingsGateway.Common.Extension;
namespace ThingsGateway.DB;
namespace ThingsGateway.Common;
/// <summary>
/// 导出excel扩展

2
src/Admin/ThingsGateway.DB/Extensions/FileExtensions.cs → src/Admin/ThingsGateway.Common/Extensions/FileExtensions.cs
View File

@@ -11,7 +11,7 @@
using Microsoft.AspNetCore.Components.Forms;
using Microsoft.AspNetCore.Http;
namespace ThingsGateway.DB;
namespace ThingsGateway.Common;
/// <inheritdoc/>
[ThingsGateway.DependencyInjection.SuppressSniffer]

2
src/Admin/ThingsGateway.DB/Util/CommonUtils.cs → src/Admin/ThingsGateway.Common/Util/CommonUtils.cs
View File

@@ -10,7 +10,7 @@
using Yitter.IdGenerator;
namespace ThingsGateway.DB;
namespace ThingsGateway.Common;
/// <summary>
/// 公共功能

114
src/Admin/ThingsGateway.DB/Extensions/QueryPageOptionsExtensions.cs
View File

@@ -16,74 +16,6 @@ namespace ThingsGateway.DB;
[ThingsGateway.DependencyInjection.SuppressSniffer]
public static class QueryPageOptionsExtensions
{
public static IEnumerable<T> GetData<T>(this IEnumerable<T> datas, QueryPageOptions option, out int totalCount, FilterKeyValueAction where = null)
{
totalCount = 0;
if (datas == null)
return new List<T>();
where ??= option.ToFilter();
if (where.HasFilters())
{
datas = datas.Where(where.GetFilterFunc<T>());//name asc模式
}
if (option.SortList.Count > 0)
{
datas = datas.Sort(option.SortList);//name asc模式
}
if (option.AdvancedSortList.Count > 0)
{
datas = datas.Sort(option.AdvancedSortList);//name asc模式
}
if (option.SortOrder != SortOrder.Unset && !option.SortName.IsNullOrWhiteSpace())
{
datas = datas.Sort(option.SortName, option.SortOrder);
}
totalCount = datas.Count();
if (option.IsPage)
{
datas = datas.Skip((option.PageIndex - 1) * option.PageItems).Take(option.PageItems);
}
else if (option.IsVirtualScroll)
{
datas = datas.Skip((option.StartIndex) * option.PageItems).Take(option.PageItems);
}
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)
query = queryFunc(query);
where ??= option.ToFilter();
if (where.HasFilters())
{
query = query.Where(where.GetFilterFunc<T>());//name asc模式
}
if (option.SortOrder != SortOrder.Unset && !string.IsNullOrEmpty(option.SortName))
{
var invoker = Utility.GetSortFunc<T>();
query = invoker(query, option.SortName, option.SortOrder);
}
else if (option.SortList.Count > 0)
{
var invoker = Utility.GetSortListFunc<T>();
query = invoker(query, option.SortList);
}
else if (option.AdvancedSortList.Count > 0)
{
var invoker = Utility.GetSortListFunc<T>();
query = invoker(query, option.AdvancedSortList);
}
return query;
}
/// <summary>
/// 根据查询条件返回sqlsugar ISugarQueryable
/// </summary>
@@ -111,50 +43,4 @@ public static class QueryPageOptionsExtensions
return query;
}
/// <summary>
/// 根据查询条件返回QueryData
/// </summary>
public static QueryData<T> GetQueryData<T>(this IEnumerable<T> datas, QueryPageOptions option, FilterKeyValueAction where = null)
{
var ret = new QueryData<T>()
{
IsSorted = option.SortOrder != SortOrder.Unset,
IsFiltered = option.Filters.Count > 0,
IsAdvanceSearch = option.AdvanceSearches.Count > 0 || option.CustomerSearches.Count > 0,
IsSearch = option.Searches.Count > 0
};
var items = datas.GetData(option, out var totalCount, where);
ret.TotalCount = totalCount;
if (totalCount > 0)
{
if (!items.Any() && option.PageIndex != 1)
{
option.PageIndex = 1;
items = datas.GetData(option, out totalCount, where);
}
}
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;
}
}

6
src/Directory.Build.props
View File

@@ -1,9 +1,9 @@
<Project>
<PropertyGroup>
<PluginVersion>10.12.18</PluginVersion>
<ProPluginVersion>10.12.18</ProPluginVersion>
<DefaultVersion>10.12.18</DefaultVersion>
<PluginVersion>10.12.23</PluginVersion>
<ProPluginVersion>10.12.23</ProPluginVersion>
<DefaultVersion>10.12.23</DefaultVersion>
<AuthenticationVersion>10.11.7</AuthenticationVersion>
<SourceGeneratorVersion>10.11.7</SourceGeneratorVersion>
<NET8Version>8.0.21</NET8Version>

1
src/Plugin/ThingsGateway.Plugin.DB/Mapper/GatewayMapper.cs
View File

@@ -10,6 +10,7 @@
using Riok.Mapperly.Abstractions;
using ThingsGateway.Common;
using ThingsGateway.DB;
namespace ThingsGateway.Plugin.DB;

6
src/Plugin/ThingsGateway.Plugin.Mqtt/MqttCollect/MqttCollect.cs
View File

@@ -171,10 +171,10 @@ public partial class MqttCollect : CollectBase
mqttClientSubscribeOptionsBuilder = mqttClientSubscribeOptionsBuilder.WithTopicFilter(
f => f.WithTopic(item));
}
var mqttClientSubscribeOptions = mqttClientSubscribeOptionsBuilder.Build();
if (mqttClientSubscribeOptions.TopicFilters.Count > 0)
_mqttSubscribeOptions = mqttClientSubscribeOptions;
}
var mqttClientSubscribeOptions = mqttClientSubscribeOptionsBuilder.Build();
if (mqttClientSubscribeOptions.TopicFilters.Count > 0)
_mqttSubscribeOptions = mqttClientSubscribeOptions;
return Task.FromResult(dataResult);
}

2
src/Plugin/ThingsGateway.Plugin.OpcDa/Pages/OpcDaImportVariable.razor.cs
View File

@@ -20,6 +20,8 @@ using System.Diagnostics.CodeAnalysis;
using ThingsGateway.Extension;
using ThingsGateway.Foundation.OpcDa;
using ThingsGateway.Foundation.OpcDa.Rcw;
using ThingsGateway.Common;
#if Plugin

4
src/Plugin/ThingsGateway.Plugin.OpcUa/Pages/OpcUaImportVariable.razor.cs
View File

@@ -35,6 +35,8 @@ using ThingsGateway.Razor;
using TouchSocket.Core;
using ThingsGateway.Common;
namespace ThingsGateway.Debug;
/// <summary>
@@ -73,7 +75,7 @@ public partial class OpcUaImportVariable
{
Items = BuildTreeItemList(await PopulateBranchAsync(ObjectIds.ObjectsFolder), RenderTreeItem).ToList();
ShowSkeleton = false;
await InvokeAsync(StateHasChanged);
return InvokeAsync(StateHasChanged);
});
}
await base.OnAfterRenderAsync(firstRender);