mikhail/parr_api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(aihitMainSyncer): исключено удаление полей не приходивиших в сообщении

Browse Source
This commit is contained in:
Mikhail Kuznetsov
2025-11-19 14:06:41 +10:00
parent d486c72416
commit 974ec3c9e0
2 changed files with 48 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
PARR.AIHITMainSyncer/Services/SyncerService.cs
View File

@@ -57,7 +57,6 @@ namespace PARR.AIHITMainSyncer.Services
var listAihitData = new List<KeyValuePair<string, string?>>(); var listAihitData = new List<KeyValuePair<string, string?>>();
var propertisWithSimpleValues = objFromQuery.Properties var propertisWithSimpleValues = objFromQuery.Properties
//.Where(t => fieldsFromDB.Any(a => IsStringEqual(t.Key.Trim(), a.Name) && a.IsMultipleValue != true))
.Where(t => fieldsFromDB.Any(a => IsStringEqual(t.Key.Trim(), a.AihitName) && a.IsMultipleValue != true)) .Where(t => fieldsFromDB.Any(a => IsStringEqual(t.Key.Trim(), a.AihitName) && a.IsMultipleValue != true))
.Select(s => new KeyValuePair<string, string?>(s.Key.Trim(), s.Value?.Trim())).ToList(); .Select(s => new KeyValuePair<string, string?>(s.Key.Trim(), s.Value?.Trim())).ToList();
@@ -75,10 +74,21 @@ namespace PARR.AIHITMainSyncer.Services
.Select(kv => new { kv.Key, kv.Value }) .Select(kv => new { kv.Key, kv.Value })
.ToList(); .ToList();
// Определяем, какие ПОЛЯ обновляются этим сообщением
var fieldsInMessage = listAihitData
.Select(kv => kv.Key)
.Distinct(StringComparer.OrdinalIgnoreCase)
.ToHashSet();
var unitValuesToRemove = unit.UnitValues var unitValuesToRemove = unit.UnitValues
.Where(uv => !incomingPairs.Any(ip => .Where(uv =>
IsStringEqual(uv.Field!.AihitName, ip.Key) && uv.Field != null &&
IsStringEqual(uv.Value!.Value, ip.Value))) fieldsInMessage.Contains(uv.Field.AihitName) &&
!listAihitData.Any(kv =>
IsStringEqual(uv.Field.AihitName, kv.Key) &&
IsStringEqual(uv.Value?.Value, kv.Value)
)
)
.ToList(); .ToList();
unitValuesToRemove.ForEach(uv => unit.UnitValues.Remove(uv)); unitValuesToRemove.ForEach(uv => unit.UnitValues.Remove(uv));

36
PARR.AIHITSyncerWorker/Worker.cs
View File

@@ -16,8 +16,40 @@ namespace PARR.AIHITSyncerWorker
protected override async Task ExecuteAsync(CancellationToken stoppingToken) protected override async Task ExecuteAsync(CancellationToken stoppingToken)
{ {
await aihitSyncer.StartAsync(); //await aihitSyncer.StartAsync();
await Task.Delay(Timeout.Infinite, stoppingToken); //await Task.Delay(Timeout.Infinite, stoppingToken);
while (!stoppingToken.IsCancellationRequested)
{
try
{
await aihitSyncer.StartAsync();
await Task.Delay(Timeout.Infinite, stoppingToken);
// <20><><EFBFBD><EFBFBD> StartAsync <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>),
// <20><>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Task.Delay <20><><EFBFBD> break.
// <20><> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20> StartAsync <20> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><> **<2A><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>** <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.
_logger.LogWarning("AihitMainSyncer <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> 10 <20><><EFBFBD>...");
}
catch (OperationCanceledException) when (stoppingToken.IsCancellationRequested)
{
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>
break;
}
catch (Exception ex)
{
_logger.LogError(ex, "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> Worker. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> 10 <20><><EFBFBD>...");
}
try
{
await Task.Delay(TimeSpan.FromSeconds(10), stoppingToken);
}
catch (OperationCanceledException)
{
break;
}
}
} }