Igor-Melnikov/ISEbd-21_Melnikov_I.O._BlacksmithWorkshop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ISEbd-21 Melnikov I. O. Lab Work 06 Base #18

Closed
Igor-Melnikov wants to merge 5 commits from lab6 into lab5
pull from: lab6
merge into: Igor-Melnikov:lab5
Conversation 0 Commits 5 Files Changed 44 +168 -8
9 changed files with 168 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 93e30dd6b4 - Show all commits

140
BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/BusinessLogics/WorkModeling.cs Normal file
View File

@ -0,0 +1,140 @@
using BlacksmithWorkshopContracts.BindingModels;
using BlacksmithWorkshopContracts.BusinessLogicContracts;
using BlacksmithWorkshopContracts.BusinessLogicsContracts;
using BlacksmithWorkshopContracts.SearchModels;
using BlacksmithWorkshopContracts.ViewModels;
using BlacksmithWorkshopDataModels.Enums;
using Microsoft.Extensions.Logging;
namespace BlacksmithWorkshopBusinessLogic.BusinessLogics
{
public class WorkModeling : IWorkProcess
{
private readonly ILogger _logger;
private readonly Random _rnd;
private IOrderLogic? _orderLogic;
public WorkModeling(ILogger<WorkModeling> logger)
{
_logger = logger;
_rnd = new Random(1000);
}
public void DoWork(IImplementerLogic implementerLogic, IOrderLogic orderLogic)
{
_orderLogic = orderLogic;
var implementers = implementerLogic.ReadList(null);
if (implementers == null)
{
_logger.LogWarning("DoWork. Implementers is null");
return;
}
var orders = _orderLogic.ReadList(new OrderSearchModel
{
Status = OrderStatus.Принят
});
if (orders == null || orders.Count == 0)
{
_logger.LogWarning("DoWork. Orders is null or empty");
return;
}
_logger.LogDebug("DoWork for {Count} orders", orders.Count);
foreach (var implementer in implementers)
{
Task.Run(() => WorkerWorkAsync(implementer, orders));
}
}
/// <summary>
/// Иммитация работы исполнителя
/// </summary>
/// <param name="implementer"></param>
/// <param name="orders"></param>
private async Task WorkerWorkAsync(ImplementerViewModel implementer, List<OrderViewModel> orders)
{
if (_orderLogic == null || implementer == null)
{
return;
}
await RunOrderInWork(implementer);
await Task.Run(() =>
{
foreach (var order in orders)
{
try
{
_logger.LogDebug("DoWork. Worker {Id} try get order {Order}", implementer.Id, order.Id);
// пытаемся назначить заказ на исполнителя
_orderLogic.TakeOrderInWork(new OrderBindingModel
{
Id = order.Id,
ImplementerId = implementer.Id
});
// делаем работу
Thread.Sleep(implementer.WorkExperience * _rnd.Next(100, 1000) * order.Count);
_logger.LogDebug("DoWork. Worker {Id} finish order {Order}", implementer.Id, order.Id);
_orderLogic.FinishOrder(new OrderBindingModel
{
Id = order.Id
});
}
// кто-то мог уже перехватить заказ, игнорируем ошибку
catch (InvalidOperationException ex)
{
_logger.LogWarning(ex, "Error try get work");
}
// заканчиваем выполнение имитации в случае иной ошибки
catch (Exception ex)
{
_logger.LogError(ex, "Error while do work");
throw;
}
// отдыхаем
Thread.Sleep(implementer.Qualification * _rnd.Next(10, 100));
}
});
}
/// <summary>
/// Ищем заказ, которые уже в работе (вдруг исполнителя прервали)
/// </summary>
/// <param name="implementer"></param>
/// <returns></returns>
private async Task RunOrderInWork(ImplementerViewModel implementer)
{
if (_orderLogic == null || implementer == null)
{
return;
}
try
{
var runOrder = await Task.Run(() => _orderLogic.ReadElement(new OrderSearchModel
{
ImplementerId = implementer.Id,
Status = OrderStatus.Выполняется
}));
if (runOrder == null)
{
return;
}
_logger.LogDebug("DoWork. Worker {Id} back to order {Order}", implementer.Id, runOrder.Id);
// доделываем работу
Thread.Sleep(implementer.WorkExperience * _rnd.Next(100, 300) * runOrder.Count);
_logger.LogDebug("DoWork. Worker {Id} finish order {Order}", implementer.Id, runOrder.Id);
_orderLogic.FinishOrder(new OrderBindingModel
{
Id = runOrder.Id
});
// отдыхаем
Thread.Sleep(implementer.Qualification * _rnd.Next(10, 100));
}
// заказа может не быть, просто игнорируем ошибку
catch (InvalidOperationException ex)
{
_logger.LogWarning(ex, "Error try get work");
}
// а может возникнуть иная ошибка, тогда просто заканчиваем выполнение имитации
catch (Exception ex)
{
_logger.LogError(ex, "Error while do work");
throw;
}
}
}
}

2
BlacksmithWorkshop/BlacksmithWorkshopContracts/BindingModels/OrderBindingModel.cs
View File

@ -13,6 +13,6 @@ namespace BlacksmithWorkshopContracts.BindingModels
public DateTime DateCreate { get; set; } = DateTime.Now;
public DateTime? DateImplement { get; set; }
public int ClientId { get; set; }
public int ImplementerId { get; set; }
public int? ImplementerId { get; set; }
}
}

12
BlacksmithWorkshop/BlacksmithWorkshopContracts/BusinessLogicsContracts/IWorkProcess.cs Normal file
View File

@ -0,0 +1,12 @@
using BlacksmithWorkshopContracts.BusinessLogicContracts;
namespace BlacksmithWorkshopContracts.BusinessLogicsContracts
{
public interface IWorkProcess
{
/// <summary>
/// Запуск работ
/// </summary>
void DoWork(IImplementerLogic implementerLogic, IOrderLogic orderLogic);
}
}

2
BlacksmithWorkshop/BlacksmithWorkshopContracts/ViewModels/OrderViewModel.cs
View File

@ -24,7 +24,7 @@ namespace BlacksmithWorkshopContracts.ViewModels
public DateTime? DateImplement { get; set; }
[DisplayName("Клиент")]
public string ClientFIO { get; set; } = string.Empty;
public int ImplementerId { get; set; }
public int? ImplementerId { get; set; }
[DisplayName("Исполнитель")]
public string ImplementerFIO { get; set; } = string.Empty;
}

2
BlacksmithWorkshop/BlacksmithWorkshopDataModels/Models/IOrderModel.cs
View File

@ -11,6 +11,6 @@ namespace BlacksmithWorkshopDataModels.Models
OrderStatus Status { get; }
DateTime DateCreate { get; }
DateTime? DateImplement { get; }
int ImplementerId { get; }
int? ImplementerId { get; }
}
}

7
BlacksmithWorkshop/BlacksmithWorkshopDatebaseImplement/Implements/OrderStorage.cs
View File

@ -89,11 +89,16 @@ namespace BlacksmithWorkshopDatabaseImplement.Implements
return context.Orders
.FirstOrDefault(x => x.Id == model.Id)?.GetViewModel;
}
if (model.ImplementerId.HasValue)
if (model.ImplementerId.HasValue && !model.Status.HasValue)//Затем только по исполнителю
{
return context.Orders
.FirstOrDefault(x => x.ImplementerId == model.ImplementerId)?.GetViewModel;
}
if (model.ImplementerId.HasValue && model.Status.HasValue)//Затем по исполнителю и статусу
{
return context.Orders
.FirstOrDefault(x => x.ImplementerId == model.ImplementerId && x.Status == model.Status)?.GetViewModel;
}
return null;
}
public OrderViewModel? Insert(OrderBindingModel model)

7
BlacksmithWorkshop/BlacksmithWorkshopDatebaseImplement/Models/Order.cs
View File

@ -24,8 +24,7 @@ namespace BlacksmithWorkshopDatabaseImplement.Models
public int ClientId { get; private set; }
[Required]
public virtual Client? Client { get; private set; }
[Required]
public int ImplementerId { get; private set; }
public int? ImplementerId { get; private set; }
public virtual Implementer? Implementer { get; private set; }
public static Order? Create(OrderBindingModel model)
{
@ -66,6 +65,10 @@ namespace BlacksmithWorkshopDatabaseImplement.Models
return;
}
Status = model.Status;
if (model.ImplementerId != null)
{
ImplementerId = model.ImplementerId;
}
if (model.DateImplement != null)
{
DateImplement = model.DateImplement;

2
BlacksmithWorkshop/BlacksmithWorkshopFileImplement/Models/Order.cs
View File

@ -17,7 +17,7 @@ namespace BlacksmithWorkshopFileImplement.Models
public DateTime? DateImplement { get; private set; }
public int ClientId { get; private set; }
//TODO
public int ImplementerId => throw new NotImplementedException();
public int? ImplementerId => throw new NotImplementedException();
public static Order? Create(OrderBindingModel? model)
{
if (model == null)

2
BlacksmithWorkshop/BlacksmithWorkshopListImplement/Models/Order.cs
View File

@ -17,7 +17,7 @@ namespace BlacksmithWorkshopListImplement.Models
public DateTime? DateImplement { get; private set; }
public int ClientId { get; private set; }
//TODO
public int ImplementerId => throw new NotImplementedException();
public int? ImplementerId => throw new NotImplementedException();
public static Order? Create(OrderBindingModel? model)
{
if (model == null)