LivelyPuer/Check
1
0
Fork 0
forked from slavaxom9k/PIBD-23_Fomichev_V.S._MagicCarpet
Code Pull Requests Activity

добавлена многпопоточность

Browse Source
This commit is contained in:
xom9k
2025-04-12 10:52:56 +04:00
parent afe18e1631
commit e984b4d66f
4 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
MagicCarpetProject/MagicCarpetBusinessLogic/Implementations/SalaryBusinessLogicContract.cs
View File

@@ -74,14 +74,21 @@ public class SalaryBusinessLogicContract(ISalaryStorageContract salaryStorageCon
}
private double CalculateSalaryForTravelAgent(List<SaleDataModel> sales, DateTime startDate, DateTime finishDate, TravelAgentPostConfiguration config)
{
var tasks = new List<Task>();
var calcPercent = 0.0;
var dates = new List<DateTime>();
for (var date = startDate; date < finishDate; date = date.AddDays(1))
{
tasks.Add(Task.Factory.StartNew((object? obj) =>
dates.Add(date);
}
var parallelOptions = new ParallelOptions
{
var dateInTask = (DateTime)obj!;
var salesInDay = sales.Where(x => x.SaleDate >= dateInTask && x.SaleDate <= dateInTask.AddDays(1)).ToArray();
MaxDegreeOfParallelism = _salaryConfiguration.MaxConcurrentThreads
};
Parallel.ForEach(dates, parallelOptions, date =>
{
var salesInDay = sales.Where(x => x.SaleDate.Date == date.Date).ToArray();
if (salesInDay.Length > 0)
{
lock (_lockObject)
@@ -89,25 +96,18 @@ public class SalaryBusinessLogicContract(ISalaryStorageContract salaryStorageCon
calcPercent += (salesInDay.Sum(x => x.Sum) / salesInDay.Length) * config.SalePercent;
}
}
}, date));
}
var calcBonusTask = Task.Run(() =>
{
return sales.Where(x => x.Sum > _salaryConfiguration.ExtraSaleSum).Sum(x => x.Sum) * config.BonusForExtraSales;
});
double calcBonusTask = 0;
try
{
Task.WaitAll([Task.WhenAll(tasks), calcBonusTask]);
calcBonusTask = sales.Where(x => x.Sum > _salaryConfiguration.ExtraSaleSum).Sum(x => x.Sum) * config.BonusForExtraSales;
}
catch (AggregateException agEx)
catch (Exception ex)
{
foreach (var ex in agEx.InnerExceptions)
{
_logger.LogError(ex, "Error in the travel agnet payroll process");
_logger.LogError(ex, "Error in bonus calculation");
}
return 0;
}
return config.Rate + calcPercent + calcBonusTask.Result;
return config.Rate + calcPercent + calcBonusTask;
}
private double CalculateSalaryForChief(DateTime startDate, DateTime finishDate, ChiefPostConfiguration config)
{

2
MagicCarpetProject/MagicCarpetContracts/Infrastructure/IConfigurationSalary.cs
View File

@@ -9,4 +9,6 @@ namespace MagicCarpetContracts.Infrastructure;
public interface IConfigurationSalary
{
double ExtraSaleSum { get; }
int MaxConcurrentThreads { get; }
}

2
MagicCarpetProject/MagicCarpetWebApi/Infrastructure/ConfigurationSalary.cs
View File

@@ -10,4 +10,6 @@ public class ConfigurationSalary(IConfiguration configuration) : IConfigurationS
});
public double ExtraSaleSum => _salarySettings.Value.ExtraSaleSum;
public int MaxConcurrentThreads => _salarySettings.Value.MaxConcurrentThreads;
}

2
MagicCarpetProject/MagicCarpetWebApi/Infrastructure/SalarySettings.cs
View File

@@ -3,4 +3,6 @@
public class SalarySettings
{
public double ExtraSaleSum { get; set; }
public int MaxConcurrentThreads { get; set; }
}