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

feat(api): Логика смены статусов для заданий робота. RobotTaskController

Browse Source
This commit is contained in:
Mikhail Trubnikov
2023-10-05 16:56:02 +10:00
parent 4679994600
commit af4a0b60b8
26 changed files with 2779 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PARR.DAL/Models/RobotConfiguration.cs
View File

@@ -51,7 +51,7 @@ namespace PARR.DAL.Models
public Robot? Robot { get; set; }
[ForeignKey(nameof(TaskStatusCode))]
public StatusTask? StatusTask { get; set; }
public TaskStatus? StatusTask { get; set; }
[ForeignKey(nameof(RobotStatusCode))]
public RobotStatus? RobotStatus { get; set; }

2
PARR.DAL/Models/RobotHistory.cs
View File

@@ -39,6 +39,6 @@ namespace PARR.DAL.Models
public RobotConfiguration? RobotConfiguration { get; set; }
[ForeignKey(nameof(TaskStatusCode))]
public StatusTask? StatusTask { get; set; }
public TaskStatus? StatusTask { get; set; }
}
}

2
PARR.DAL/Models/RobotTemplateHistory.cs
View File

@@ -41,6 +41,6 @@ namespace PARR.DAL.Models
public Template? Template { get; set; }
[ForeignKey(nameof(TemplateStatusCode))]
public StatusTask? StatusTemplate { get; set; }
public TaskStatus? StatusTemplate { get; set; }
}
}

4
PARR.DAL/Models/StatusTask.cs → PARR.DAL/Models/TaskStatus.cs
View File

@@ -6,8 +6,8 @@ namespace PARR.DAL.Models
/// <summary>
/// Статус шаблона. Что нужно сделать роботу в ЕСПП
/// </summary>
[Table("StatusTemplates")]
public class StatusTask
[Table("TaskStatuses")]
public class TaskStatus
{
[Key]
public int Code { get; set; }

27
PARR.DAL/Models/Template.cs
View File

@@ -18,22 +18,26 @@ namespace PARR.DAL.Models
public required string Name { get; set; }
public bool IsActive { get; set; }
public bool IsActiveTemplate { get; set; }
public bool IsActiveSchedule { get; set; }
#region удалить эти поля
/// <summary>
/// Статус шаблона. Что нужно сделать роботу в ЕСПП
/// </summary>
public int StatusCode { get; set; }
public int? StatusCode { get; set; }
/// <summary>
/// Статус работы робота
/// </summary>
public int RobotStatusCode { get; set; }
public int? RobotStatusCode { get; set; }
/// <summary>
/// Количество попыток выполнения задания роботом
/// </summary>
public int RobotAttemptsNumber { get; set; }
public int? RobotAttemptsNumber { get; set; }
/// <summary>
/// Последняя дата обновления статуса RobotStatusCode роботом
@@ -42,7 +46,14 @@ namespace PARR.DAL.Models
[ForeignKey(nameof(StatusCode))]
public StatusTask? StatusTask { get; set; }
public TaskStatus? StatusTask { get; set; }
[ForeignKey(nameof(RobotStatusCode))]
public RobotStatus? RobotStatus { get; set; }
public ICollection<RobotTemplateHistory> RobotTemplateHistories { get; set; } = new HashSet<RobotTemplateHistory>();
#endregion
public Guid ApplicationInWorkId { get; set; }
@@ -56,12 +67,6 @@ namespace PARR.DAL.Models
[ForeignKey(nameof(HostId))]
public Host? Host { get; set; }
[ForeignKey(nameof(RobotStatusCode))]
public RobotStatus? RobotStatus { get; set; }
public ICollection<RobotTemplateHistory> RobotTemplateHistories { get; set; } = new HashSet<RobotTemplateHistory>();
public ICollection<RobotConfiguration> RobotConfigurations { get; set; } = new HashSet<RobotConfiguration>();
}