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

feat(all): ! Критические изменения логики работы всех сервисорв, База Данных имееет неокончательную версию. Template, Scheduler переведены на работу с Unit+Job+JobGroup вместо Host+ApplicationsInWork

Browse Source
This commit is contained in:
Mikhail Kuznetsov
2025-06-25 14:17:34 +10:00
parent 1b867585d8
commit 03c7852378
54 changed files with 5176 additions and 989 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
PARR.Master/Services/OrderMasterService.cs
View File

@@ -121,7 +121,7 @@ namespace PARR.Master.Services
if (isAgentStarted == true && isAgentEnded == false)
{
var lastStrartDate = allHistory.Last(t => t.HistoryLevelId == (int)AgentHistoryLevelEnum.Start).DateCreated;
var timeout = (double)order.Template!.ApplicationsInWork!.AgentTimeOutSec!;
var timeout = (double)order.Template!.Job!.Group!.AgentTimeOutSec!;
if (lastStrartDate.AddSeconds(timeout) <= DateTimeOffset.UtcNow)
{
@@ -182,7 +182,7 @@ namespace PARR.Master.Services
t.TemplateId == order.TemplateId
&& t.DateCreated > order.GenerateDate!.Value.Add(-orderManageSettings.FindAgentHistoryStartOffset)
//&& t.DateCreated <= order.GenerateDate!.Value.AddSeconds(order.Template!.ApplicationsInWork!.AgentTimeOutSec!.Value)
&& t.DateCreated <= order.GenerateDate!.Value.Add(order.Template!.ApplicationsInWork!.TemplateDurationTimeSpan!.Value)
&& t.DateCreated <= order.GenerateDate!.Value.Add(order.Template!.Job!.Group!.TemplateDurationTimeSpan!.Value)
&& t.OrderId == null
)
.OrderBy(t => t.DateCreated)
@@ -244,14 +244,14 @@ namespace PARR.Master.Services
private IQueryable<Order> GetOrdres()
{
return orderService.Get()
.Include(t => t.Template).ThenInclude(t => t!.ApplicationsInWork)
.Include(t => t.Template).ThenInclude(t => t!.Job)
.Include(t => t.AgentHistories)
.Where(t =>
t.TemplateId.HasValue
&& t.Template!.ApplicationsInWork!.IsAgent == true
&& t.Template!.Job!.Group!.IsAgent == true
&& t.GenerateDate.HasValue
&& t.Template!.ApplicationsInWork!.AgentTimeOutSec.HasValue
&& string.IsNullOrEmpty(t.Template!.ApplicationsInWork!.TemplateDuration) == false
&& t.Template!.Job!.Group!.AgentTimeOutSec.HasValue
&& string.IsNullOrEmpty(t.Template!.Job!.Group!.TemplateDuration) == false
&& t.ExpirationDate > DateTimeOffset.UtcNow
).OrderBy(t => t.DateCreated);
}