Meik/C4IT-F4SD-Collector
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DataQueryName kann optional angegeben werden

Browse Source
This commit is contained in:
Meik
2026-02-05 14:12:54 +01:00
parent f7130eebac
commit c647b81350
8 changed files with 69 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
F4SD-Cockpit-ServerCore/DataHistoryCollectorM42Wpm.cs
View File

@@ -2262,15 +2262,16 @@ namespace C4IT.DataHistoryProvider
}
var _cols = Table.KeyColumns.First().SourceName;
var _QueryRelationInfo = new cM42DataQueryRelationInfo()
{
EntityClassName = _template.EntityClassName,
EntityTypeName = string.Join(",", _template.EntityTypeNames),
search = search,
WhereExpression = _whereExpr,
pageSize = 0,
page = 0,
totalCounted = true,
var _QueryRelationInfo = new cM42DataQueryRelationInfo()
{
EntityClassName = _template.EntityClassName,
EntityTypeName = string.Join(",", _template.EntityTypeNames),
DataQueryName = string.IsNullOrWhiteSpace(_template.DataQueryName) ? null : _template.DataQueryName,
search = search,
WhereExpression = _whereExpr,
pageSize = 0,
page = 0,
totalCounted = true,
columns = _cols
};
@@ -2320,14 +2321,15 @@ namespace C4IT.DataHistoryProvider
var _cols = Table.KeyColumns.First().SourceName;
var _QueryRelationInfo = new cM42DataQueryRelationInfo()
{
EntityClassName = _template.EntityClassName,
EntityTypeName = string.Join(",", _template.EntityTypeNames),
WhereExpression = _whereExpr,
search = search,
pageSize = PageSize,
page = Page,
var _QueryRelationInfo = new cM42DataQueryRelationInfo()
{
EntityClassName = _template.EntityClassName,
EntityTypeName = string.Join(",", _template.EntityTypeNames),
DataQueryName = string.IsNullOrWhiteSpace(_template.DataQueryName) ? null : _template.DataQueryName,
WhereExpression = _whereExpr,
search = search,
pageSize = PageSize,
page = Page,
columns = _cols
};
@@ -4066,14 +4068,16 @@ namespace C4IT.DataHistoryProvider
}
}
public class cM42DataQueryRelationInfo
{
public int ClientTimeOffset { get; set; } = 0;
public string EntityClassName { get; set; }
public string EntityTypeName { get; set; }
public string AddedRelations { get; set; } = "";
public string RemovedRelations { get; set; } = "";
public string WhereExpression { get; set; } = "";
public class cM42DataQueryRelationInfo
{
public int ClientTimeOffset { get; set; } = 0;
public string EntityClassName { get; set; }
public string EntityTypeName { get; set; }
[JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
public string DataQueryName { get; set; }
public string AddedRelations { get; set; } = "";
public string RemovedRelations { get; set; } = "";
public string WhereExpression { get; set; } = "";
public cM42QueryFilterGroup AdditionalFilter { get; set; } = new cM42QueryFilterGroup();
public int pageSize { get; set; } = 20;
public int page { get; set; } = 0;