StroevVladimir/PIbd-22-Stroev-V.M.-PlumbingRepair
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Попытка допилить

Browse Source
This commit is contained in:
DyCTaTOR 2024-05-03 22:23:17 +04:00
parent 123cdecc96
commit 19964d9e7f
12 changed files with 905 additions and 488 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
PlumbingRepair/PlumbingRepair/FormCreateOrder.Designer.cs generated
View File

@ -1,31 +1,31 @@
namespace PlumbingRepairView namespace PlumbingRepairView
{ {
partial class FormCreateOrder partial class FormCreateOrder
{ {
/// <summary> /// <summary>
/// Required designer variable. /// Required designer variable.
/// </summary> /// </summary>
private System.ComponentModel.IContainer components = null; private System.ComponentModel.IContainer components = null;
/// <summary> /// <summary>
/// Clean up any resources being used. /// Clean up any resources being used.
/// </summary> /// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing) protected override void Dispose(bool disposing)
{ {
if (disposing && (components != null)) if (disposing && (components != null))
{ {
components.Dispose(); components.Dispose();
} }
base.Dispose(disposing); base.Dispose(disposing);
} }
#region Windows Form Designer generated code #region Windows Form Designer generated code
/// <summary> /// <summary>
/// Required method for Designer support - do not modify /// Required method for Designer support - do not modify
/// the contents of this method with the code editor. /// the contents of this method with the code editor.
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
label1 = new Label(); label1 = new Label();
@ -129,15 +129,15 @@
PerformLayout(); PerformLayout();
} }
#endregion #endregion
private Label label1; private Label label1;
private Label label2; private Label label2;
private Label label3; private Label label3;
private Button buttonCancel; private Button buttonCancel;
private Button buttonSave; private Button buttonSave;
private TextBox textBoxCount; private TextBox textBoxCount;
private TextBox textBoxSum; private TextBox textBoxSum;
private ComboBox comboBoxWork; private ComboBox comboBoxWork;
} }
} }

168
PlumbingRepair/PlumbingRepair/FormMain.Designer.cs generated
View File

@ -1,42 +1,44 @@
namespace PlumbingRepairView namespace PlumbingRepairView
{ {
partial class FormMain partial class FormMain
{ {
/// <summary> /// <summary>
/// Required designer variable. /// Required designer variable.
/// </summary> /// </summary>
private System.ComponentModel.IContainer components = null; private System.ComponentModel.IContainer components = null;
/// <summary> /// <summary>
/// Clean up any resources being used. /// Clean up any resources being used.
/// </summary> /// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing) protected override void Dispose(bool disposing)
{ {
if (disposing && (components != null)) if (disposing && (components != null))
{ {
components.Dispose(); components.Dispose();
} }
base.Dispose(disposing); base.Dispose(disposing);
} }
#region Windows Form Designer generated code #region Windows Form Designer generated code
/// <summary> /// <summary>
/// Required method for Designer support - do not modify /// Required method for Designer support - do not modify
/// the contents of this method with the code editor. /// the contents of this method with the code editor.
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
menuStrip1 = new MenuStrip(); menuStrip1 = new MenuStrip();
справочникиToolStripMenuItem = new ToolStripMenuItem(); справочникиToolStripMenuItem = new ToolStripMenuItem();
компонентыToolStripMenuItem = new ToolStripMenuItem(); компонентыToolStripMenuItem = new ToolStripMenuItem();
КлиентыToolStripMenuItem = new ToolStripMenuItem();
работыToolStripMenuItem = new ToolStripMenuItem(); работыToolStripMenuItem = new ToolStripMenuItem();
КлиентыToolStripMenuItem = new ToolStripMenuItem();
отчётыToolStripMenuItem = new ToolStripMenuItem(); отчётыToolStripMenuItem = new ToolStripMenuItem();
списокКомпонентовToolStripMenuItem = new ToolStripMenuItem(); списокКомпонентовToolStripMenuItem = new ToolStripMenuItem();
компонентыПоРаботамToolStripMenuItem = new ToolStripMenuItem(); компонентыПоРаботамToolStripMenuItem = new ToolStripMenuItem();
списокЗаказовToolStripMenuItem = new ToolStripMenuItem(); списокЗаказовToolStripMenuItem = new ToolStripMenuItem();
исполнителиToolStripMenuItem = new ToolStripMenuItem();
запускРаботToolStripMenuItem = new ToolStripMenuItem();
dataGridView = new DataGridView(); dataGridView = new DataGridView();
buttonCreateOrder = new Button(); buttonCreateOrder = new Button();
buttonTakeOrderInWork = new Button(); buttonTakeOrderInWork = new Button();
@ -50,84 +52,101 @@
// menuStrip1 // menuStrip1
// //
menuStrip1.ImageScalingSize = new Size(20, 20); menuStrip1.ImageScalingSize = new Size(20, 20);
menuStrip1.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, отчётыToolStripMenuItem }); menuStrip1.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, отчётыToolStripMenuItem, запускРаботToolStripMenuItem });
menuStrip1.Location = new Point(0, 0); menuStrip1.Location = new Point(0, 0);
menuStrip1.Name = "menuStrip1"; menuStrip1.Name = "menuStrip1";
menuStrip1.Size = new Size(1103, 28); menuStrip1.Padding = new Padding(8, 2, 0, 2);
menuStrip1.Size = new Size(1379, 33);
menuStrip1.TabIndex = 0; menuStrip1.TabIndex = 0;
menuStrip1.Text = "menuStrip1"; menuStrip1.Text = "menuStrip1";
// //
// справочникиToolStripMenuItem // справочникиToolStripMenuItem
// //
справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, работыToolStripMenuItem, КлиентыToolStripMenuItem }); справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, работыToolStripMenuItem, КлиентыToolStripMenuItem, исполнителиToolStripMenuItem });
справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem"; справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem";
справочникиToolStripMenuItem.Size = new Size(117, 24); справочникиToolStripMenuItem.Size = new Size(139, 29);
справочникиToolStripMenuItem.Text = "Справочники"; справочникиToolStripMenuItem.Text = "Справочники";
// //
// компонентыToolStripMenuItem // компонентыToolStripMenuItem
// //
компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem"; компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem";
компонентыToolStripMenuItem.Size = new Size(182, 26); компонентыToolStripMenuItem.Size = new Size(270, 34);
компонентыToolStripMenuItem.Text = "Компоненты"; компонентыToolStripMenuItem.Text = "Компоненты";
компонентыToolStripMenuItem.Click += компонентыToolStripMenuItem_Click; компонентыToolStripMenuItem.Click += компонентыToolStripMenuItem_Click;
// //
// работыToolStripMenuItem
//
работыToolStripMenuItem.Name = "работыToolStripMenuItem";
работыToolStripMenuItem.Size = new Size(270, 34);
работыToolStripMenuItem.Text = "Работы";
работыToolStripMenuItem.Click += работыToolStripMenuItem_Click;
//
// КлиентыToolStripMenuItem // КлиентыToolStripMenuItem
// //
КлиентыToolStripMenuItem.Name = "КлиентыToolStripMenuItem"; КлиентыToolStripMenuItem.Name = "КлиентыToolStripMenuItem";
КлиентыToolStripMenuItem.Size = new Size(182, 26); КлиентыToolStripMenuItem.Size = new Size(270, 34);
КлиентыToolStripMenuItem.Text = "Клиенты"; КлиентыToolStripMenuItem.Text = "Клиенты";
КлиентыToolStripMenuItem.Click += КлиентыToolStripMenuItem_Click; КлиентыToolStripMenuItem.Click += КлиентыToolStripMenuItem_Click;
//
// работыToolStripMenuItem
//
работыToolStripMenuItem.Name = "работыToolStripMenuItem";
работыToolStripMenuItem.Size = new Size(182, 26);
работыToolStripMenuItem.Text = "Работы";
работыToolStripMenuItem.Click += работыToolStripMenuItem_Click;
// //
// отчётыToolStripMenuItem // отчётыToolStripMenuItem
// //
отчётыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { списокКомпонентовToolStripMenuItem, компонентыПоРаботамToolStripMenuItem, списокЗаказовToolStripMenuItem }); отчётыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { списокКомпонентовToolStripMenuItem, компонентыПоРаботамToolStripMenuItem, списокЗаказовToolStripMenuItem });
отчётыToolStripMenuItem.Name = "отчётыToolStripMenuItem"; отчётыToolStripMenuItem.Name = "отчётыToolStripMenuItem";
отчётыToolStripMenuItem.Size = new Size(73, 24); отчётыToolStripMenuItem.Size = new Size(88, 29);
отчётыToolStripMenuItem.Text = "Отчёты"; отчётыToolStripMenuItem.Text = "Отчёты";
// //
// списокКомпонентовToolStripMenuItem // списокКомпонентовToolStripMenuItem
// //
списокКомпонентовToolStripMenuItem.Name = "списокКомпонентовToolStripMenuItem"; списокКомпонентовToolStripMenuItem.Name = "списокКомпонентовToolStripMenuItem";
списокКомпонентовToolStripMenuItem.Size = new Size(268, 26); списокКомпонентовToolStripMenuItem.Size = new Size(319, 34);
списокКомпонентовToolStripMenuItem.Text = "Список работ"; списокКомпонентовToolStripMenuItem.Text = "Список работ";
списокКомпонентовToolStripMenuItem.Click += списокРаботToolStripMenuItem_Click; списокКомпонентовToolStripMenuItem.Click += списокРаботToolStripMenuItem_Click;
// //
// компонентыПоРаботамToolStripMenuItem // компонентыПоРаботамToolStripMenuItem
// //
компонентыПоРаботамToolStripMenuItem.Name = "компонентыПоРаботамToolStripMenuItem"; компонентыПоРаботамToolStripMenuItem.Name = "компонентыПоРаботамToolStripMenuItem";
компонентыПоРаботамToolStripMenuItem.Size = new Size(268, 26); компонентыПоРаботамToolStripMenuItem.Size = new Size(319, 34);
компонентыПоРаботамToolStripMenuItem.Text = "Компоненты по работам"; компонентыПоРаботамToolStripMenuItem.Text = "Компоненты по работам";
компонентыПоРаботамToolStripMenuItem.Click += компонентыПоРаботамToolStripMenuItem_Click; компонентыПоРаботамToolStripMenuItem.Click += компонентыПоРаботамToolStripMenuItem_Click;
// //
// списокЗаказовToolStripMenuItem // списокЗаказовToolStripMenuItem
// //
списокЗаказовToolStripMenuItem.Name = "списокЗаказовToolStripMenuItem"; списокЗаказовToolStripMenuItem.Name = "списокЗаказовToolStripMenuItem";
списокЗаказовToolStripMenuItem.Size = new Size(268, 26); списокЗаказовToolStripMenuItem.Size = new Size(319, 34);
списокЗаказовToolStripMenuItem.Text = "Список заказов"; списокЗаказовToolStripMenuItem.Text = "Список заказов";
списокЗаказовToolStripMenuItem.Click += списокЗаказовToolStripMenuItem_Click; списокЗаказовToolStripMenuItem.Click += списокЗаказовToolStripMenuItem_Click;
// //
// исполнителиToolStripMenuItem
//
исполнителиToolStripMenuItem.Name = "исполнителиToolStripMenuItem";
исполнителиToolStripMenuItem.Size = new Size(185, 26);
исполнителиToolStripMenuItem.Text = "Исполнители";
исполнителиToolStripMenuItem.Click += исполнителиToolStripMenuItem_Click;
//
// запускРаботToolStripMenuItem
//
запускРаботToolStripMenuItem.Name = "запускРаботToolStripMenuItem";
запускРаботToolStripMenuItem.Size = new Size(114, 24);
запускРаботToolStripMenuItem.Text = "Запуск работ";
запускРаботToolStripMenuItem.Click += запускРаботToolStripMenuItem_Click;
//
// dataGridView // dataGridView
// //
dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
dataGridView.Location = new Point(0, 31); dataGridView.Location = new Point(0, 39);
dataGridView.Margin = new Padding(4);
dataGridView.Name = "dataGridView"; dataGridView.Name = "dataGridView";
dataGridView.RowHeadersWidth = 51; dataGridView.RowHeadersWidth = 51;
dataGridView.RowTemplate.Height = 29; dataGridView.RowTemplate.Height = 29;
dataGridView.Size = new Size(878, 420); dataGridView.Size = new Size(1098, 525);
dataGridView.TabIndex = 1; dataGridView.TabIndex = 1;
// //
// buttonCreateOrder // buttonCreateOrder
// //
buttonCreateOrder.Location = new Point(903, 54); buttonCreateOrder.Location = new Point(1129, 68);
buttonCreateOrder.Margin = new Padding(4);
buttonCreateOrder.Name = "buttonCreateOrder"; buttonCreateOrder.Name = "buttonCreateOrder";
buttonCreateOrder.Size = new Size(170, 29); buttonCreateOrder.Size = new Size(212, 36);
buttonCreateOrder.TabIndex = 2; buttonCreateOrder.TabIndex = 2;
buttonCreateOrder.Text = "Создать заказ"; buttonCreateOrder.Text = "Создать заказ";
buttonCreateOrder.UseVisualStyleBackColor = true; buttonCreateOrder.UseVisualStyleBackColor = true;
@ -135,9 +154,10 @@
// //
// buttonTakeOrderInWork // buttonTakeOrderInWork
// //
buttonTakeOrderInWork.Location = new Point(903, 142); buttonTakeOrderInWork.Location = new Point(1129, 178);
buttonTakeOrderInWork.Margin = new Padding(4);
buttonTakeOrderInWork.Name = "buttonTakeOrderInWork"; buttonTakeOrderInWork.Name = "buttonTakeOrderInWork";
buttonTakeOrderInWork.Size = new Size(170, 50); buttonTakeOrderInWork.Size = new Size(212, 62);
buttonTakeOrderInWork.TabIndex = 3; buttonTakeOrderInWork.TabIndex = 3;
buttonTakeOrderInWork.Text = "Отдать на выполнение"; buttonTakeOrderInWork.Text = "Отдать на выполнение";
buttonTakeOrderInWork.UseVisualStyleBackColor = true; buttonTakeOrderInWork.UseVisualStyleBackColor = true;
@ -145,9 +165,10 @@
// //
// buttonOrderReady // buttonOrderReady
// //
buttonOrderReady.Location = new Point(903, 233); buttonOrderReady.Location = new Point(1129, 291);
buttonOrderReady.Margin = new Padding(4);
buttonOrderReady.Name = "buttonOrderReady"; buttonOrderReady.Name = "buttonOrderReady";
buttonOrderReady.Size = new Size(170, 29); buttonOrderReady.Size = new Size(212, 36);
buttonOrderReady.TabIndex = 4; buttonOrderReady.TabIndex = 4;
buttonOrderReady.Text = "Заказ готов"; buttonOrderReady.Text = "Заказ готов";
buttonOrderReady.UseVisualStyleBackColor = true; buttonOrderReady.UseVisualStyleBackColor = true;
@ -155,9 +176,10 @@
// //
// buttonIssuedOrder // buttonIssuedOrder
// //
buttonIssuedOrder.Location = new Point(903, 323); buttonIssuedOrder.Location = new Point(1129, 404);
buttonIssuedOrder.Margin = new Padding(4);
buttonIssuedOrder.Name = "buttonIssuedOrder"; buttonIssuedOrder.Name = "buttonIssuedOrder";
buttonIssuedOrder.Size = new Size(170, 29); buttonIssuedOrder.Size = new Size(212, 36);
buttonIssuedOrder.TabIndex = 5; buttonIssuedOrder.TabIndex = 5;
buttonIssuedOrder.Text = "Заказ выдан"; buttonIssuedOrder.Text = "Заказ выдан";
buttonIssuedOrder.UseVisualStyleBackColor = true; buttonIssuedOrder.UseVisualStyleBackColor = true;
@ -165,9 +187,10 @@
// //
// buttonUpdateList // buttonUpdateList
// //
buttonUpdateList.Location = new Point(903, 394); buttonUpdateList.Location = new Point(1129, 492);
buttonUpdateList.Margin = new Padding(4);
buttonUpdateList.Name = "buttonUpdateList"; buttonUpdateList.Name = "buttonUpdateList";
buttonUpdateList.Size = new Size(170, 29); buttonUpdateList.Size = new Size(212, 36);
buttonUpdateList.TabIndex = 6; buttonUpdateList.TabIndex = 6;
buttonUpdateList.Text = "Обновить список"; buttonUpdateList.Text = "Обновить список";
buttonUpdateList.UseVisualStyleBackColor = true; buttonUpdateList.UseVisualStyleBackColor = true;
@ -175,9 +198,9 @@
// //
// FormMain // FormMain
// //
AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleDimensions = new SizeF(10F, 25F);
AutoScaleMode = AutoScaleMode.Font; AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(1103, 474); ClientSize = new Size(1379, 592);
Controls.Add(buttonUpdateList); Controls.Add(buttonUpdateList);
Controls.Add(buttonIssuedOrder); Controls.Add(buttonIssuedOrder);
Controls.Add(buttonOrderReady); Controls.Add(buttonOrderReady);
@ -186,6 +209,7 @@
Controls.Add(dataGridView); Controls.Add(dataGridView);
Controls.Add(menuStrip1); Controls.Add(menuStrip1);
MainMenuStrip = menuStrip1; MainMenuStrip = menuStrip1;
Margin = new Padding(4);
Name = "FormMain"; Name = "FormMain";
Text = "Ремонт сантехники"; Text = "Ремонт сантехники";
Load += FormMain_Load; Load += FormMain_Load;
@ -196,22 +220,24 @@
PerformLayout(); PerformLayout();
} }
#endregion #endregion
private MenuStrip menuStrip1; private MenuStrip menuStrip1;
private ToolStripMenuItem справочникиToolStripMenuItem; private ToolStripMenuItem справочникиToolStripMenuItem;
private DataGridView dataGridView; private DataGridView dataGridView;
private Button buttonCreateOrder; private Button buttonCreateOrder;
private Button buttonTakeOrderInWork; private Button buttonTakeOrderInWork;
private Button buttonOrderReady; private Button buttonOrderReady;
private Button buttonIssuedOrder; private Button buttonIssuedOrder;
private Button buttonUpdateList; private Button buttonUpdateList;
private ToolStripMenuItem компонентыToolStripMenuItem; private ToolStripMenuItem компонентыToolStripMenuItem;
private ToolStripMenuItem работыToolStripMenuItem; private ToolStripMenuItem работыToolStripMenuItem;
private ToolStripMenuItem отчётыToolStripMenuItem; private ToolStripMenuItem отчётыToolStripMenuItem;
private ToolStripMenuItem списокКомпонентовToolStripMenuItem; private ToolStripMenuItem списокКомпонентовToolStripMenuItem;
private ToolStripMenuItem компонентыПоРаботамToolStripMenuItem; private ToolStripMenuItem компонентыПоРаботамToolStripMenuItem;
private ToolStripMenuItem списокЗаказовToolStripMenuItem; private ToolStripMenuItem списокЗаказовToolStripMenuItem;
private ToolStripMenuItem исполнителиToolStripMenuItem;
private ToolStripMenuItem запускРаботToolStripMenuItem;
private ToolStripMenuItem КлиентыToolStripMenuItem; private ToolStripMenuItem КлиентыToolStripMenuItem;
} }
} }

23
PlumbingRepair/PlumbingRepair/FormMain.cs
View File

@ -1,4 +1,5 @@
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using PlumbingRepair;
using PlumbingRepairBusinessLogic.BusinessLogics; using PlumbingRepairBusinessLogic.BusinessLogics;
using PlumbingRepairContracts.BindingModels; using PlumbingRepairContracts.BindingModels;
using PlumbingRepairContracts.BusinessLogicsContracts; using PlumbingRepairContracts.BusinessLogicsContracts;
@ -20,13 +21,15 @@ namespace PlumbingRepairView
private readonly ILogger _logger; private readonly ILogger _logger;
private readonly IOrderLogic _orderLogic; private readonly IOrderLogic _orderLogic;
private readonly IReportLogic _reportLogic; private readonly IReportLogic _reportLogic;
private readonly IWorkProcess _workProcess;
public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic, IReportLogic reportLogic) public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic, IReportLogic reportLogic, IWorkProcess workProcess)
{ {
InitializeComponent(); InitializeComponent();
_logger = logger; _logger = logger;
_orderLogic = orderLogic; _orderLogic = orderLogic;
_reportLogic = reportLogic; _reportLogic = reportLogic;
_workProcess = workProcess;
} }
private void FormMain_Load(object sender, EventArgs e) private void FormMain_Load(object sender, EventArgs e)
@ -46,7 +49,8 @@ namespace PlumbingRepairView
dataGridView.DataSource = list; dataGridView.DataSource = list;
dataGridView.Columns["WorkId"].Visible = false; dataGridView.Columns["WorkId"].Visible = false;
dataGridView.Columns["ClientId"].Visible = false; dataGridView.Columns["ClientId"].Visible = false;
} dataGridView.Columns["ImplementerId"].Visible = false;
}
_logger.LogInformation("Загрузка заказов"); _logger.LogInformation("Загрузка заказов");
} }
@ -240,5 +244,20 @@ namespace PlumbingRepairView
form.ShowDialog(); form.ShowDialog();
} }
} }
private void запускРаботToolStripMenuItem_Click(object sender, EventArgs e)
{
_workProcess.DoWork((Program.ServiceProvider?.GetService(typeof(IImplementerLogic)) as IImplementerLogic)!, _orderLogic);
MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
private void исполнителиToolStripMenuItem_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormImplementers));
if (service is FormImplementers form)
{
form.ShowDialog();
}
}
} }
} }

2
PlumbingRepair/PlumbingRepair/FormMain.resx
View File

@ -18,7 +18,7 @@
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing"">Blue</data> <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value> <value>[base64 mime encoded serialized .NET Framework object]</value>
</data> </data>

141
PlumbingRepair/PlumbingRepairBusinessLogic/BusinessLogics/WorkModeling.cs Normal file
View File

@ -0,0 +1,141 @@
using Microsoft.Extensions.Logging;
using PlumbingRepairContracts.BindingModels;
using PlumbingRepairContracts.BusinessLogicsContracts;
using PlumbingRepairContracts.SearchModels;
using PlumbingRepairContracts.ViewModels;
using PlumbingRepairDataModels.Enums;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace PlumbingRepairBusinessLogic.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
});
// отдыхаем
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;
}
}
});
}
/// <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;
}
}
}
}

13
PlumbingRepair/PlumbingRepairContracts/BusinessLogicsContracts/IWorkProcess.cs Normal file
View File

@ -0,0 +1,13 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace PlumbingRepairContracts.BusinessLogicsContracts
{
public interface IWorkProcess
{
void DoWork(IImplementerLogic implementerLogic, IOrderLogic orderLogic);
}
}

3
PlumbingRepair/PlumbingRepairDataBaseImplement/Implements/ImplementerStorage.cs
View File

@ -1,4 +1,5 @@
using PlumbingRepairContracts.BindingModels; using Microsoft.EntityFrameworkCore;
using PlumbingRepairContracts.BindingModels;
using PlumbingRepairContracts.SearchModels; using PlumbingRepairContracts.SearchModels;
using PlumbingRepairContracts.StoragesContracts; using PlumbingRepairContracts.StoragesContracts;
using PlumbingRepairContracts.ViewModels; using PlumbingRepairContracts.ViewModels;

479
PlumbingRepair/PlumbingRepairDataBaseImplement/Migrations/20240424045110_MigrationWithClient.Designer.cs → PlumbingRepair/PlumbingRepairDataBaseImplement/Migrations/20240503161017_WithImplementers.Designer.cs generated
View File

@ -1,218 +1,261 @@
// <auto-generated /> // <auto-generated />
using System; using System;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion; using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
using PlumbingRepairDataBaseImplement; using PlumbingRepairDataBaseImplement;
#nullable disable #nullable disable
namespace PlumbingRepairDataBaseImplement.Migrations namespace PlumbingRepairDataBaseImplement.Migrations
{ {
[DbContext(typeof(PlumbingRepairDataBase))] [DbContext(typeof(PlumbingRepairDataBase))]
[Migration("20240424045110_MigrationWithClient")] [Migration("20240503161017_WithImplementers")]
partial class MigrationWithClient partial class WithImplementers
{ {
/// <inheritdoc /> /// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder) protected override void BuildTargetModel(ModelBuilder modelBuilder)
{ {
#pragma warning disable 612, 618 #pragma warning disable 612, 618
modelBuilder modelBuilder
.HasAnnotation("ProductVersion", "7.0.17") .HasAnnotation("ProductVersion", "7.0.17")
.HasAnnotation("Relational:MaxIdentifierLength", 63); .HasAnnotation("Relational:MaxIdentifierLength", 63);
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
modelBuilder.Entity("PlumbingRepairDataBaseImplement.Models.Client", b => modelBuilder.Entity("PlumbingRepairDataBaseImplement.Models.Client", b =>
{ {
b.Property<int>("Id") b.Property<int>("Id")
.ValueGeneratedOnAdd() .ValueGeneratedOnAdd()
.HasColumnType("integer"); .HasColumnType("integer");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id")); NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<string>("ClientFIO") b.Property<string>("ClientFIO")
.IsRequired() .IsRequired()
.HasColumnType("text"); .HasColumnType("text");
b.Property<string>("Email") b.Property<string>("Email")
.IsRequired() .IsRequired()
.HasColumnType("text"); .HasColumnType("text");
b.Property<string>("Password") b.Property<string>("Password")
.IsRequired() .IsRequired()
.HasColumnType("text"); .HasColumnType("text");
b.HasKey("Id"); b.HasKey("Id");
b.ToTable("Clients"); b.ToTable("Clients");
}); });
modelBuilder.Entity("PlumbingRepairDataBaseImplement.Models.Component", b => modelBuilder.Entity("PlumbingRepairDataBaseImplement.Models.Component", b =>
{ {
b.Property<int>("Id") b.Property<int>("Id")
.ValueGeneratedOnAdd() .ValueGeneratedOnAdd()
.HasColumnType("integer"); .HasColumnType("integer");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id")); NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<string>("ComponentName") b.Property<string>("ComponentName")
.IsRequired() .IsRequired()
.HasColumnType("text"); .HasColumnType("text");
b.Property<double>("Cost") b.Property<double>("Cost")
.HasColumnType("double precision"); .HasColumnType("double precision");
b.HasKey("Id"); b.HasKey("Id");
b.ToTable("Components"); b.ToTable("Components");
}); });
modelBuilder.Entity("PlumbingRepairDataBaseImplement.Models.Order", b => modelBuilder.Entity("PlumbingRepairDataBaseImplement.Models.Implementer", b =>
{ {
b.Property<int>("Id") b.Property<int>("Id")
.ValueGeneratedOnAdd() .ValueGeneratedOnAdd()
.HasColumnType("integer"); .HasColumnType("integer");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id")); NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<int>("ClientId") b.Property<string>("ImplementerFIO")
.HasColumnType("integer"); .IsRequired()
.HasColumnType("text");
b.Property<int>("Count")
.HasColumnType("integer"); b.Property<string>("Password")
.IsRequired()
b.Property<DateTime>("DateCreate") .HasColumnType("text");
.HasColumnType("timestamp with time zone");
b.Property<int>("Qualification")
b.Property<DateTime?>("DateImplement") .HasColumnType("integer");
.HasColumnType("timestamp with time zone");
b.Property<int>("WorkExperience")
b.Property<int>("Status") .HasColumnType("integer");
.HasColumnType("integer");
b.HasKey("Id");
b.Property<double>("Sum")
.HasColumnType("double precision"); b.ToTable("Implementers");
});
b.Property<int>("WorkId")
.HasColumnType("integer"); modelBuilder.Entity("PlumbingRepairDataBaseImplement.Models.Order", b =>
{
b.Property<string>("WorkName") b.Property<int>("Id")
.IsRequired() .ValueGeneratedOnAdd()
.HasColumnType("text"); .HasColumnType("integer");
b.HasKey("Id"); NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.HasIndex("ClientId"); b.Property<int>("ClientId")
.HasColumnType("integer");
b.HasIndex("WorkId");
b.Property<int>("Count")
b.ToTable("Orders"); .HasColumnType("integer");
});
b.Property<DateTime>("DateCreate")
modelBuilder.Entity("PlumbingRepairDataBaseImplement.Models.Work", b => .HasColumnType("timestamp with time zone");
{
b.Property<int>("Id") b.Property<DateTime?>("DateImplement")
.ValueGeneratedOnAdd() .HasColumnType("timestamp with time zone");
.HasColumnType("integer");
b.Property<int?>("ImplementerId")
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id")); .HasColumnType("integer");
b.Property<double>("Price") b.Property<int>("Status")
.HasColumnType("double precision"); .HasColumnType("integer");
b.Property<string>("WorkName") b.Property<double>("Sum")
.IsRequired() .HasColumnType("double precision");
.HasColumnType("text");
b.Property<int>("WorkId")
b.HasKey("Id"); .HasColumnType("integer");
b.ToTable("Works"); b.Property<string>("WorkName")
}); .IsRequired()
.HasColumnType("text");
modelBuilder.Entity("PlumbingRepairDataBaseImplement.Models.WorkComponent", b =>
{ b.HasKey("Id");
b.Property<int>("Id")
.ValueGeneratedOnAdd() b.HasIndex("ClientId");
.HasColumnType("integer");
b.HasIndex("ImplementerId");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.HasIndex("WorkId");
b.Property<int>("ComponentId")
.HasColumnType("integer"); b.ToTable("Orders");
});
b.Property<int>("Count")
.HasColumnType("integer"); modelBuilder.Entity("PlumbingRepairDataBaseImplement.Models.Work", b =>
{
b.Property<int>("WorkId") b.Property<int>("Id")
.HasColumnType("integer"); .ValueGeneratedOnAdd()
.HasColumnType("integer");
b.HasKey("Id");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.HasIndex("ComponentId");
b.Property<double>("Price")
b.HasIndex("WorkId"); .HasColumnType("double precision");
b.ToTable("WorkComponents"); b.Property<string>("WorkName")
}); .IsRequired()
.HasColumnType("text");
modelBuilder.Entity("PlumbingRepairDataBaseImplement.Models.Order", b =>
{ b.HasKey("Id");
b.HasOne("PlumbingRepairDataBaseImplement.Models.Client", "Client")
.WithMany("Orders") b.ToTable("Works");
.HasForeignKey("ClientId") });
.OnDelete(DeleteBehavior.Cascade)
.IsRequired(); modelBuilder.Entity("PlumbingRepairDataBaseImplement.Models.WorkComponent", b =>
{
b.HasOne("PlumbingRepairDataBaseImplement.Models.Work", "Work") b.Property<int>("Id")
.WithMany("Orders") .ValueGeneratedOnAdd()
.HasForeignKey("WorkId") .HasColumnType("integer");
.OnDelete(DeleteBehavior.Cascade)
.IsRequired(); NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Navigation("Client"); b.Property<int>("ComponentId")
.HasColumnType("integer");
b.Navigation("Work");
}); b.Property<int>("Count")
.HasColumnType("integer");
modelBuilder.Entity("PlumbingRepairDataBaseImplement.Models.WorkComponent", b =>
{ b.Property<int>("WorkId")
b.HasOne("PlumbingRepairDataBaseImplement.Models.Component", "Component") .HasColumnType("integer");
.WithMany("WorkComponents")
.HasForeignKey("ComponentId") b.HasKey("Id");
.OnDelete(DeleteBehavior.Cascade)
.IsRequired(); b.HasIndex("ComponentId");
b.HasOne("PlumbingRepairDataBaseImplement.Models.Work", "Work") b.HasIndex("WorkId");
.WithMany("Components")
.HasForeignKey("WorkId") b.ToTable("WorkComponents");
.OnDelete(DeleteBehavior.Cascade) });
.IsRequired();
modelBuilder.Entity("PlumbingRepairDataBaseImplement.Models.Order", b =>
b.Navigation("Component"); {
b.HasOne("PlumbingRepairDataBaseImplement.Models.Client", "Client")
b.Navigation("Work"); .WithMany("Orders")
}); .HasForeignKey("ClientId")
.OnDelete(DeleteBehavior.Cascade)
modelBuilder.Entity("PlumbingRepairDataBaseImplement.Models.Client", b => .IsRequired();
{
b.Navigation("Orders"); b.HasOne("PlumbingRepairDataBaseImplement.Models.Implementer", "Implementer")
}); .WithMany("Orders")
.HasForeignKey("ImplementerId");
modelBuilder.Entity("PlumbingRepairDataBaseImplement.Models.Component", b =>
{ b.HasOne("PlumbingRepairDataBaseImplement.Models.Work", "Work")
b.Navigation("WorkComponents"); .WithMany("Orders")
}); .HasForeignKey("WorkId")
.OnDelete(DeleteBehavior.Cascade)
modelBuilder.Entity("PlumbingRepairDataBaseImplement.Models.Work", b => .IsRequired();
{
b.Navigation("Components"); b.Navigation("Client");
b.Navigation("Orders"); b.Navigation("Implementer");
});
#pragma warning restore 612, 618 b.Navigation("Work");
} });
}
} modelBuilder.Entity("PlumbingRepairDataBaseImplement.Models.WorkComponent", b =>
{
b.HasOne("PlumbingRepairDataBaseImplement.Models.Component", "Component")
.WithMany("WorkComponents")
.HasForeignKey("ComponentId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("PlumbingRepairDataBaseImplement.Models.Work", "Work")
.WithMany("Components")
.HasForeignKey("WorkId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("Component");
b.Navigation("Work");
});
modelBuilder.Entity("PlumbingRepairDataBaseImplement.Models.Client", b =>
{
b.Navigation("Orders");
});
modelBuilder.Entity("PlumbingRepairDataBaseImplement.Models.Component", b =>
{
b.Navigation("WorkComponents");
});
modelBuilder.Entity("PlumbingRepairDataBaseImplement.Models.Implementer", b =>
{
b.Navigation("Orders");
});
modelBuilder.Entity("PlumbingRepairDataBaseImplement.Models.Work", b =>
{
b.Navigation("Components");
b.Navigation("Orders");
});
#pragma warning restore 612, 618
}
}
}

344
PlumbingRepair/PlumbingRepairDataBaseImplement/Migrations/20240424045110_MigrationWithClient.cs → PlumbingRepair/PlumbingRepairDataBaseImplement/Migrations/20240503161017_WithImplementers.cs
View File

@ -1,157 +1,187 @@
using System; using System;
using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Migrations;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
#nullable disable #nullable disable
namespace PlumbingRepairDataBaseImplement.Migrations namespace PlumbingRepairDataBaseImplement.Migrations
{ {
/// <inheritdoc /> /// <inheritdoc />
public partial class MigrationWithClient : Migration public partial class WithImplementers : Migration
{ {
/// <inheritdoc /> /// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder) protected override void Up(MigrationBuilder migrationBuilder)
{ {
migrationBuilder.CreateTable( migrationBuilder.CreateTable(
name: "Clients", name: "Clients",
columns: table => new columns: table => new
{ {
Id = table.Column<int>(type: "integer", nullable: false) Id = table.Column<int>(type: "integer", nullable: false)
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
ClientFIO = table.Column<string>(type: "text", nullable: false), ClientFIO = table.Column<string>(type: "text", nullable: false),
Email = table.Column<string>(type: "text", nullable: false), Email = table.Column<string>(type: "text", nullable: false),
Password = table.Column<string>(type: "text", nullable: false) Password = table.Column<string>(type: "text", nullable: false)
}, },
constraints: table => constraints: table =>
{ {
table.PrimaryKey("PK_Clients", x => x.Id); table.PrimaryKey("PK_Clients", x => x.Id);
}); });
migrationBuilder.CreateTable( migrationBuilder.CreateTable(
name: "Components", name: "Components",
columns: table => new columns: table => new
{ {
Id = table.Column<int>(type: "integer", nullable: false) Id = table.Column<int>(type: "integer", nullable: false)
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
ComponentName = table.Column<string>(type: "text", nullable: false), ComponentName = table.Column<string>(type: "text", nullable: false),
Cost = table.Column<double>(type: "double precision", nullable: false) Cost = table.Column<double>(type: "double precision", nullable: false)
}, },
constraints: table => constraints: table =>
{ {
table.PrimaryKey("PK_Components", x => x.Id); table.PrimaryKey("PK_Components", x => x.Id);
}); });
migrationBuilder.CreateTable( migrationBuilder.CreateTable(
name: "Works", name: "Implementers",
columns: table => new columns: table => new
{ {
Id = table.Column<int>(type: "integer", nullable: false) Id = table.Column<int>(type: "integer", nullable: false)
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
WorkName = table.Column<string>(type: "text", nullable: false), ImplementerFIO = table.Column<string>(type: "text", nullable: false),
Price = table.Column<double>(type: "double precision", nullable: false) Password = table.Column<string>(type: "text", nullable: false),
}, WorkExperience = table.Column<int>(type: "integer", nullable: false),
constraints: table => Qualification = table.Column<int>(type: "integer", nullable: false)
{ },
table.PrimaryKey("PK_Works", x => x.Id); constraints: table =>
}); {
table.PrimaryKey("PK_Implementers", x => x.Id);
migrationBuilder.CreateTable( });
name: "Orders",
columns: table => new migrationBuilder.CreateTable(
{ name: "Works",
Id = table.Column<int>(type: "integer", nullable: false) columns: table => new
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), {
WorkId = table.Column<int>(type: "integer", nullable: false), Id = table.Column<int>(type: "integer", nullable: false)
ClientId = table.Column<int>(type: "integer", nullable: false), .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
WorkName = table.Column<string>(type: "text", nullable: false), WorkName = table.Column<string>(type: "text", nullable: false),
Count = table.Column<int>(type: "integer", nullable: false), Price = table.Column<double>(type: "double precision", nullable: false)
Sum = table.Column<double>(type: "double precision", nullable: false), },
Status = table.Column<int>(type: "integer", nullable: false), constraints: table =>
DateCreate = table.Column<DateTime>(type: "timestamp with time zone", nullable: false), {
DateImplement = table.Column<DateTime>(type: "timestamp with time zone", nullable: true) table.PrimaryKey("PK_Works", x => x.Id);
}, });
constraints: table =>
{ migrationBuilder.CreateTable(
table.PrimaryKey("PK_Orders", x => x.Id); name: "Orders",
table.ForeignKey( columns: table => new
name: "FK_Orders_Clients_ClientId", {
column: x => x.ClientId, Id = table.Column<int>(type: "integer", nullable: false)
principalTable: "Clients", .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
principalColumn: "Id", WorkId = table.Column<int>(type: "integer", nullable: false),
onDelete: ReferentialAction.Cascade); ClientId = table.Column<int>(type: "integer", nullable: false),
table.ForeignKey( ImplementerId = table.Column<int>(type: "integer", nullable: true),
name: "FK_Orders_Works_WorkId", WorkName = table.Column<string>(type: "text", nullable: false),
column: x => x.WorkId, Count = table.Column<int>(type: "integer", nullable: false),
principalTable: "Works", Sum = table.Column<double>(type: "double precision", nullable: false),
principalColumn: "Id", Status = table.Column<int>(type: "integer", nullable: false),
onDelete: ReferentialAction.Cascade); DateCreate = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
}); DateImplement = table.Column<DateTime>(type: "timestamp with time zone", nullable: true)
},
migrationBuilder.CreateTable( constraints: table =>
name: "WorkComponents", {
columns: table => new table.PrimaryKey("PK_Orders", x => x.Id);
{ table.ForeignKey(
Id = table.Column<int>(type: "integer", nullable: false) name: "FK_Orders_Clients_ClientId",
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), column: x => x.ClientId,
WorkId = table.Column<int>(type: "integer", nullable: false), principalTable: "Clients",
ComponentId = table.Column<int>(type: "integer", nullable: false), principalColumn: "Id",
Count = table.Column<int>(type: "integer", nullable: false) onDelete: ReferentialAction.Cascade);
}, table.ForeignKey(
constraints: table => name: "FK_Orders_Implementers_ImplementerId",
{ column: x => x.ImplementerId,
table.PrimaryKey("PK_WorkComponents", x => x.Id); principalTable: "Implementers",
table.ForeignKey( principalColumn: "Id");
name: "FK_WorkComponents_Components_ComponentId", table.ForeignKey(
column: x => x.ComponentId, name: "FK_Orders_Works_WorkId",
principalTable: "Components", column: x => x.WorkId,
principalColumn: "Id", principalTable: "Works",
onDelete: ReferentialAction.Cascade); principalColumn: "Id",
table.ForeignKey( onDelete: ReferentialAction.Cascade);
name: "FK_WorkComponents_Works_WorkId", });
column: x => x.WorkId,
principalTable: "Works", migrationBuilder.CreateTable(
principalColumn: "Id", name: "WorkComponents",
onDelete: ReferentialAction.Cascade); columns: table => new
}); {
Id = table.Column<int>(type: "integer", nullable: false)
migrationBuilder.CreateIndex( .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
name: "IX_Orders_ClientId", WorkId = table.Column<int>(type: "integer", nullable: false),
table: "Orders", ComponentId = table.Column<int>(type: "integer", nullable: false),
column: "ClientId"); Count = table.Column<int>(type: "integer", nullable: false)
},
migrationBuilder.CreateIndex( constraints: table =>
name: "IX_Orders_WorkId", {
table: "Orders", table.PrimaryKey("PK_WorkComponents", x => x.Id);
column: "WorkId"); table.ForeignKey(
name: "FK_WorkComponents_Components_ComponentId",
migrationBuilder.CreateIndex( column: x => x.ComponentId,
name: "IX_WorkComponents_ComponentId", principalTable: "Components",
table: "WorkComponents", principalColumn: "Id",
column: "ComponentId"); onDelete: ReferentialAction.Cascade);
table.ForeignKey(
migrationBuilder.CreateIndex( name: "FK_WorkComponents_Works_WorkId",
name: "IX_WorkComponents_WorkId", column: x => x.WorkId,
table: "WorkComponents", principalTable: "Works",
column: "WorkId"); principalColumn: "Id",
} onDelete: ReferentialAction.Cascade);
});
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder) migrationBuilder.CreateIndex(
{ name: "IX_Orders_ClientId",
migrationBuilder.DropTable( table: "Orders",
name: "Orders"); column: "ClientId");
migrationBuilder.DropTable( migrationBuilder.CreateIndex(
name: "WorkComponents"); name: "IX_Orders_ImplementerId",
table: "Orders",
migrationBuilder.DropTable( column: "ImplementerId");
name: "Clients");
migrationBuilder.CreateIndex(
migrationBuilder.DropTable( name: "IX_Orders_WorkId",
name: "Components"); table: "Orders",
column: "WorkId");
migrationBuilder.DropTable(
name: "Works"); migrationBuilder.CreateIndex(
} name: "IX_WorkComponents_ComponentId",
} table: "WorkComponents",
} column: "ComponentId");
migrationBuilder.CreateIndex(
name: "IX_WorkComponents_WorkId",
table: "WorkComponents",
column: "WorkId");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "Orders");
migrationBuilder.DropTable(
name: "WorkComponents");
migrationBuilder.DropTable(
name: "Clients");
migrationBuilder.DropTable(
name: "Implementers");
migrationBuilder.DropTable(
name: "Components");
migrationBuilder.DropTable(
name: "Works");
}
}
}

43
PlumbingRepair/PlumbingRepairDataBaseImplement/Migrations/PlumbingRepairDataBaseModelSnapshot.cs
View File

@ -67,6 +67,33 @@ namespace PlumbingRepairDataBaseImplement.Migrations
b.ToTable("Components"); b.ToTable("Components");
}); });
modelBuilder.Entity("PlumbingRepairDataBaseImplement.Models.Implementer", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<string>("ImplementerFIO")
.IsRequired()
.HasColumnType("text");
b.Property<string>("Password")
.IsRequired()
.HasColumnType("text");
b.Property<int>("Qualification")
.HasColumnType("integer");
b.Property<int>("WorkExperience")
.HasColumnType("integer");
b.HasKey("Id");
b.ToTable("Implementers");
});
modelBuilder.Entity("PlumbingRepairDataBaseImplement.Models.Order", b => modelBuilder.Entity("PlumbingRepairDataBaseImplement.Models.Order", b =>
{ {
b.Property<int>("Id") b.Property<int>("Id")
@ -87,6 +114,9 @@ namespace PlumbingRepairDataBaseImplement.Migrations
b.Property<DateTime?>("DateImplement") b.Property<DateTime?>("DateImplement")
.HasColumnType("timestamp with time zone"); .HasColumnType("timestamp with time zone");
b.Property<int?>("ImplementerId")
.HasColumnType("integer");
b.Property<int>("Status") b.Property<int>("Status")
.HasColumnType("integer"); .HasColumnType("integer");
@ -104,6 +134,8 @@ namespace PlumbingRepairDataBaseImplement.Migrations
b.HasIndex("ClientId"); b.HasIndex("ClientId");
b.HasIndex("ImplementerId");
b.HasIndex("WorkId"); b.HasIndex("WorkId");
b.ToTable("Orders"); b.ToTable("Orders");
@ -163,6 +195,10 @@ namespace PlumbingRepairDataBaseImplement.Migrations
.OnDelete(DeleteBehavior.Cascade) .OnDelete(DeleteBehavior.Cascade)
.IsRequired(); .IsRequired();
b.HasOne("PlumbingRepairDataBaseImplement.Models.Implementer", "Implementer")
.WithMany("Orders")
.HasForeignKey("ImplementerId");
b.HasOne("PlumbingRepairDataBaseImplement.Models.Work", "Work") b.HasOne("PlumbingRepairDataBaseImplement.Models.Work", "Work")
.WithMany("Orders") .WithMany("Orders")
.HasForeignKey("WorkId") .HasForeignKey("WorkId")
@ -171,6 +207,8 @@ namespace PlumbingRepairDataBaseImplement.Migrations
b.Navigation("Client"); b.Navigation("Client");
b.Navigation("Implementer");
b.Navigation("Work"); b.Navigation("Work");
}); });
@ -203,6 +241,11 @@ namespace PlumbingRepairDataBaseImplement.Migrations
b.Navigation("WorkComponents"); b.Navigation("WorkComponents");
}); });
modelBuilder.Entity("PlumbingRepairDataBaseImplement.Models.Implementer", b =>
{
b.Navigation("Orders");
});
modelBuilder.Entity("PlumbingRepairDataBaseImplement.Models.Work", b => modelBuilder.Entity("PlumbingRepairDataBaseImplement.Models.Work", b =>
{ {
b.Navigation("Components"); b.Navigation("Components");

99
PlumbingRepair/PlumbingRepairRestApi/Controllers/ImplementerController.cs Normal file
View File

@ -0,0 +1,99 @@
using Microsoft.AspNetCore.Mvc;
using PlumbingRepairContracts.BindingModels;
using PlumbingRepairContracts.BusinessLogicsContracts;
using PlumbingRepairContracts.SearchModels;
using PlumbingRepairContracts.ViewModels;
using PlumbingRepairDataModels.Enums;
namespace PlumbingRepairRestApi.Controllers
{
[Route("api/[controller]/[action]")]
[ApiController]
public class ImplementerController : Controller
{
private readonly ILogger _logger;
private readonly IOrderLogic _order;
private readonly IImplementerLogic _logic;
public ImplementerController(IOrderLogic order, IImplementerLogic logic, ILogger<ImplementerController> logger)
{
_logger = logger;
_order = order;
_logic = logic;
}
[HttpGet]
public ImplementerViewModel? Login(string login, string password)
{
try
{
return _logic.ReadElement(new ImplementerSearchModel
{
ImplementerFIO = login,
Password = password
});
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка авторизации сотрудника");
throw;
}
}
[HttpGet]
public List<OrderViewModel>? GetNewOrders()
{
try
{
return _order.ReadList(new OrderSearchModel
{
Status = OrderStatus.Принят
});
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка получения новых заказов");
throw;
}
}
[HttpGet]
public OrderViewModel? GetImplementerOrder(int implementerId)
{
try
{
return _order.ReadElement(new OrderSearchModel
{
ImplementerId = implementerId
});
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка получения текущего заказа исполнителя");
throw;
}
}
[HttpPost]
public void TakeOrderInWork(OrderBindingModel model)
{
try
{
_order.TakeOrderInWork(model);
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка перевода заказа с №{Id} в работу", model.Id);
throw;
}
}
[HttpPost]
public void FinishOrder(OrderBindingModel model)
{
try
{
_order.FinishOrder(model);
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка отметки о готовности заказа с №{Id}", model.Id);
throw;
}
}
}
}

2
PlumbingRepair/PlumbingRepairRestApi/Program.cs
View File

@ -13,8 +13,10 @@ builder.Logging.AddLog4Net("log4net.config");
builder.Services.AddTransient<IClientStorage, ClientStorage>(); builder.Services.AddTransient<IClientStorage, ClientStorage>();
builder.Services.AddTransient<IOrderStorage, OrderStorage>(); builder.Services.AddTransient<IOrderStorage, OrderStorage>();
builder.Services.AddTransient<IWorkStorage, WorkStorage>(); builder.Services.AddTransient<IWorkStorage, WorkStorage>();
builder.Services.AddTransient<IImplementerStorage, ImplementerStorage>();
builder.Services.AddTransient<IOrderLogic, OrderLogic>(); builder.Services.AddTransient<IOrderLogic, OrderLogic>();
builder.Services.AddTransient<IImplementerLogic, ImplementerLogic>();
builder.Services.AddTransient<IClientLogic, ClientLogic>(); builder.Services.AddTransient<IClientLogic, ClientLogic>();
builder.Services.AddTransient<IWorkLogic, WorkLogic>(); builder.Services.AddTransient<IWorkLogic, WorkLogic>();