From 7bee609669f09b35c54e6ae0e8618158ed5cbc87 Mon Sep 17 00:00:00 2001 From: "ns.potapov" Date: Sun, 19 May 2024 18:35:07 +0400 Subject: [PATCH 01/13] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D1=8B=20=D0=B0=D1=82?= =?UTF-8?q?=D1=80=D0=B8=D0=B1=D1=83=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Attributes/ColumnAttribute.cs | 21 +++++++++++++++++++ .../Attributes/GridViewAutoSize.cs | 14 +++++++++++++ .../SecuritySystemContracts.csproj | 2 +- 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 SecuritySystem/SecuritySystemContracts/Attributes/ColumnAttribute.cs create mode 100644 SecuritySystem/SecuritySystemContracts/Attributes/GridViewAutoSize.cs diff --git a/SecuritySystem/SecuritySystemContracts/Attributes/ColumnAttribute.cs b/SecuritySystem/SecuritySystemContracts/Attributes/ColumnAttribute.cs new file mode 100644 index 0000000..a630931 --- /dev/null +++ b/SecuritySystem/SecuritySystemContracts/Attributes/ColumnAttribute.cs @@ -0,0 +1,21 @@ +namespace SecuritySystemContracts.Attributes +{ + [AttributeUsage(AttributeTargets.Property)] + public class ColumnAttribute : Attribute + { + public ColumnAttribute(string title = "", bool visible = true, int width = 0, + GridViewAutoSize gridViewAutoSize = GridViewAutoSize.None, bool isUseAutoSize = false) + { + Title = title; + Visible = visible; + Width = width; + GridViewAutoSize = gridViewAutoSize; + IsUseAutoSize = isUseAutoSize; + } + public string Title { get; private set; } + public bool Visible { get; private set; } + public int Width { get; private set; } + public GridViewAutoSize GridViewAutoSize { get; private set; } + public bool IsUseAutoSize { get; private set; } + } +} diff --git a/SecuritySystem/SecuritySystemContracts/Attributes/GridViewAutoSize.cs b/SecuritySystem/SecuritySystemContracts/Attributes/GridViewAutoSize.cs new file mode 100644 index 0000000..ce36c49 --- /dev/null +++ b/SecuritySystem/SecuritySystemContracts/Attributes/GridViewAutoSize.cs @@ -0,0 +1,14 @@ +namespace SecuritySystemContracts.Attributes +{ + public enum GridViewAutoSize + { + NotSet = 0, + None = 1, + ColumnHeader = 2, + AllCellsExceptHeader = 4, + AllCells = 6, + DisplayedCellsExceptHeader = 8, + DisplayedCells = 10, + Fill = 16 + } +} diff --git a/SecuritySystem/SecuritySystemContracts/SecuritySystemContracts.csproj b/SecuritySystem/SecuritySystemContracts/SecuritySystemContracts.csproj index a4b5be5..2554988 100644 --- a/SecuritySystem/SecuritySystemContracts/SecuritySystemContracts.csproj +++ b/SecuritySystem/SecuritySystemContracts/SecuritySystemContracts.csproj @@ -1,4 +1,4 @@ - + net6.0 -- 2.25.1 From f587a9cad625e0688064a276c72cf8e4009dc1f7 Mon Sep 17 00:00:00 2001 From: "ns.potapov" Date: Sun, 19 May 2024 19:33:18 +0400 Subject: [PATCH 02/13] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B4=D0=B5?= =?UTF-8?q?=D0=BB=D0=B0=D0=BD=D0=B0=20=D0=BB=D0=BE=D0=B3=D0=B8=D0=BA=D0=B0?= =?UTF-8?q?=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=D0=B0=20=D0=B8=D0=BD=D1=84?= =?UTF-8?q?=D0=BE=D1=80=D0=BC=D0=B0=D1=86=D0=B8=D0=B8=20=D0=B2=20=D1=82?= =?UTF-8?q?=D0=B0=D0=B1=D0=BB=D0=B8=D1=86=D1=8B=20DataGridView?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SecuritySystemView/Client/FormClients.cs | 10 +---- .../Component/FormComponents.cs | 7 +-- .../DataGridViewExtension.cs | 45 +++++++++++++++++++ SecuritySystem/SecuritySystemView/FormMain.cs | 23 +--------- .../Implementer/FormImplementers.cs | 10 +---- .../SecuritySystemView/Mail/FormMails.cs | 9 +--- .../SecuritySystemView/Secure/FormSecures.cs | 9 +--- 7 files changed, 53 insertions(+), 60 deletions(-) create mode 100644 SecuritySystem/SecuritySystemView/DataGridViewExtension.cs diff --git a/SecuritySystem/SecuritySystemView/Client/FormClients.cs b/SecuritySystem/SecuritySystemView/Client/FormClients.cs index 2091f56..08dc491 100644 --- a/SecuritySystem/SecuritySystemView/Client/FormClients.cs +++ b/SecuritySystem/SecuritySystemView/Client/FormClients.cs @@ -23,15 +23,7 @@ namespace SecuritySystemView.Client { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["Id"].AutoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader; - dataGridView.Columns["ClientFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - dataGridView.Columns["Email"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - dataGridView.Columns["Email"].FillWeight = 50; - } + dataGridView.FillandConfigGrid(_logic.ReadList(null)); _logger.LogInformation("Загрузка клиентов"); } catch (Exception ex) diff --git a/SecuritySystem/SecuritySystemView/Component/FormComponents.cs b/SecuritySystem/SecuritySystemView/Component/FormComponents.cs index 43c569e..9acae52 100644 --- a/SecuritySystem/SecuritySystemView/Component/FormComponents.cs +++ b/SecuritySystem/SecuritySystemView/Component/FormComponents.cs @@ -1,6 +1,7 @@ using Microsoft.Extensions.Logging; using SecuritySystemContracts.BindingModels; using SecuritySystemContracts.BusinessLogicsContracts; +using System.Windows.Forms; namespace SecuritySystemView { @@ -22,11 +23,7 @@ namespace SecuritySystemView { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridViewComponents.DataSource = list; - } + dataGridViewComponents.FillandConfigGrid(_logic.ReadList(null)); _logger.LogInformation("Загрузка компонентов"); } catch (Exception ex) diff --git a/SecuritySystem/SecuritySystemView/DataGridViewExtension.cs b/SecuritySystem/SecuritySystemView/DataGridViewExtension.cs new file mode 100644 index 0000000..0bd3f43 --- /dev/null +++ b/SecuritySystem/SecuritySystemView/DataGridViewExtension.cs @@ -0,0 +1,45 @@ +using SecuritySystemContracts.Attributes; + +namespace SecuritySystemView +{ + public static class DataGridViewExtension + { + public static void FillandConfigGrid(this DataGridView grid, List? data) + { + if (data == null) + { + return; + } + grid.DataSource = data; + var type = typeof(T); + var properties = type.GetProperties(); + foreach (DataGridViewColumn column in grid.Columns) + { + var property = properties.FirstOrDefault(x => x.Name == column.Name); + if (property == null) + { + throw new InvalidOperationException($"В типе {type.Name} не найдено свойство с именем {column.Name}"); + } + var attribute = property.GetCustomAttributes(typeof(ColumnAttribute), true)?.SingleOrDefault(); + if (attribute == null) + { + throw new InvalidOperationException($"Не найден атрибут типа ColumnAttribute для свойства {property.Name}"); + } + if (attribute is ColumnAttribute columnAttr) + { + column.HeaderText = columnAttr.Title; + column.Visible = columnAttr.Visible; + if (columnAttr.IsUseAutoSize) + { + column.AutoSizeMode = (DataGridViewAutoSizeColumnMode)Enum.Parse(typeof(DataGridViewAutoSizeColumnMode), columnAttr.GridViewAutoSize.ToString()); + } + else + { + column.Width = columnAttr.Width; + } + } + } + } + } + +} diff --git a/SecuritySystem/SecuritySystemView/FormMain.cs b/SecuritySystem/SecuritySystemView/FormMain.cs index 4e7bc1a..c0b4fbf 100644 --- a/SecuritySystem/SecuritySystemView/FormMain.cs +++ b/SecuritySystem/SecuritySystemView/FormMain.cs @@ -28,30 +28,9 @@ namespace SecuritySystemView } private void LoadData() { - _logger.LogInformation("Загрузка заказов"); try { - var list = _orderLogic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["SecureId"].Visible = false; - dataGridView.Columns["ClientId"].Visible = false; - dataGridView.Columns["ImplementerId"].Visible = false; - dataGridView.Columns["Count"].AutoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader; - dataGridView.Columns["Count"].HeaderText = "Кол-во"; - dataGridView.Columns["Count"].DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight; - dataGridView.Columns["Sum"].AutoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader; - dataGridView.Columns["Sum"].DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight; - dataGridView.Columns["Id"].AutoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader; - dataGridView.Columns["Status"].AutoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader; - dataGridView.Columns["Status"].HeaderText = "Статус заказа"; - dataGridView.Columns["DateCreate"].AutoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader; - dataGridView.Columns["DateImplement"].AutoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader; - dataGridView.Columns["ClientFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - dataGridView.Columns["ImplementerFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - dataGridView.Columns["SecureName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - } + dataGridView.FillandConfigGrid(_orderLogic.ReadList(null)); _logger.LogInformation("Загрузка заказов"); } catch (Exception ex) diff --git a/SecuritySystem/SecuritySystemView/Implementer/FormImplementers.cs b/SecuritySystem/SecuritySystemView/Implementer/FormImplementers.cs index 4f9ac3d..aef6cfb 100644 --- a/SecuritySystem/SecuritySystemView/Implementer/FormImplementers.cs +++ b/SecuritySystem/SecuritySystemView/Implementer/FormImplementers.cs @@ -22,15 +22,7 @@ namespace SecuritySystemView.Implementer { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["WorkExperience"].AutoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader; - dataGridView.Columns["ImplementerFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - dataGridView.Columns["Qualification"].AutoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader; - } + dataGridView.FillandConfigGrid(_logic.ReadList(null)); _logger.LogInformation("Загрузка исполнителей"); } catch (Exception ex) diff --git a/SecuritySystem/SecuritySystemView/Mail/FormMails.cs b/SecuritySystem/SecuritySystemView/Mail/FormMails.cs index f31cab7..d04798e 100644 --- a/SecuritySystem/SecuritySystemView/Mail/FormMails.cs +++ b/SecuritySystem/SecuritySystemView/Mail/FormMails.cs @@ -1,4 +1,5 @@ using Microsoft.Extensions.Logging; +using SecuritySystemBusinessLogic.BusinessLogics; using SecuritySystemContracts.BusinessLogicsContracts; namespace SecuritySystemView.Mail @@ -22,13 +23,7 @@ namespace SecuritySystemView.Mail { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["MessageId"].Visible = false; - dataGridView.Columns["ClientId"].Visible = false; - } + dataGridView.FillandConfigGrid(_logic.ReadList(null)); _logger.LogInformation("Загрузка почты"); } catch (Exception ex) diff --git a/SecuritySystem/SecuritySystemView/Secure/FormSecures.cs b/SecuritySystem/SecuritySystemView/Secure/FormSecures.cs index 36b76ba..1516778 100644 --- a/SecuritySystem/SecuritySystemView/Secure/FormSecures.cs +++ b/SecuritySystem/SecuritySystemView/Secure/FormSecures.cs @@ -22,14 +22,7 @@ namespace SecuritySystemView { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["SecureName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - dataGridView.Columns["SecureComponents"].Visible = false; - } + dataGridView.FillandConfigGrid(_logic.ReadList(null)); _logger.LogInformation("Загрузка изделий"); } catch (Exception ex) -- 2.25.1 From df06851779fb8cb9f829ffe8da0f982f178c012a Mon Sep 17 00:00:00 2001 From: "ns.potapov" Date: Sun, 19 May 2024 19:55:10 +0400 Subject: [PATCH 03/13] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D0=B0=D1=82=D1=80=D0=B8=D0=B1=D1=83=D1=82=20Col?= =?UTF-8?q?umn=20=D0=B4=D0=BB=D1=8F=20=D0=BF=D0=BE=D0=BB=D0=B5=D0=B9=20?= =?UTF-8?q?=D0=BC=D0=BE=D0=B4=D0=B5=D0=BB=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ViewModels/ClientViewModel.cs | 10 ++++---- .../ViewModels/ComponentViewModel.cs | 8 ++++--- .../ViewModels/ImplementerViewModel.cs | 20 +++++++++------- .../ViewModels/MessageInfoViewModel.cs | 14 ++++++----- .../ViewModels/OrderViewModel.cs | 24 +++++++++++-------- .../ViewModels/SecureViewModel.cs | 9 ++++--- 6 files changed, 50 insertions(+), 35 deletions(-) diff --git a/SecuritySystem/SecuritySystemContracts/ViewModels/ClientViewModel.cs b/SecuritySystem/SecuritySystemContracts/ViewModels/ClientViewModel.cs index a1b53be..2ffdeb3 100644 --- a/SecuritySystem/SecuritySystemContracts/ViewModels/ClientViewModel.cs +++ b/SecuritySystem/SecuritySystemContracts/ViewModels/ClientViewModel.cs @@ -1,16 +1,18 @@ -using SecuritySystemDataModels.Models; +using SecuritySystemContracts.Attributes; +using SecuritySystemDataModels.Models; using System.ComponentModel; namespace SecuritySystemContracts.ViewModels { public class ClientViewModel : IClientModel { + [Column(visible: false)] public int Id { get; set; } - [DisplayName("ФИО клиента")] + [Column(title: "ФИО клиента", width: 150)] public string ClientFIO { get; set; } = string.Empty; - [DisplayName("Логин (эл. почта)")] + [Column(title: "Логин (эл. почта)", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string Email { get; set; } = string.Empty; - [DisplayName("Пароль")] + [Column(title: "Пароль", width: 150)] public string Password { get; set; } = string.Empty; } } diff --git a/SecuritySystem/SecuritySystemContracts/ViewModels/ComponentViewModel.cs b/SecuritySystem/SecuritySystemContracts/ViewModels/ComponentViewModel.cs index 852c89c..221bfa6 100644 --- a/SecuritySystem/SecuritySystemContracts/ViewModels/ComponentViewModel.cs +++ b/SecuritySystem/SecuritySystemContracts/ViewModels/ComponentViewModel.cs @@ -1,14 +1,16 @@ -using SecuritySystemDataModels.Models; +using SecuritySystemContracts.Attributes; +using SecuritySystemDataModels.Models; using System.ComponentModel; namespace SecuritySystemContracts.ViewModels { public class ComponentViewModel : IComponentModel { + [Column(visible: false)] public int Id { get; set; } - [DisplayName("Название компонента")] + [Column(title: "Название компонента", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string ComponentName { get; set; } = string.Empty; - [DisplayName("Цена")] + [Column(title: "Цена", width: 150)] public double Cost { get; set; } } } diff --git a/SecuritySystem/SecuritySystemContracts/ViewModels/ImplementerViewModel.cs b/SecuritySystem/SecuritySystemContracts/ViewModels/ImplementerViewModel.cs index 8b09d53..26cca6d 100644 --- a/SecuritySystem/SecuritySystemContracts/ViewModels/ImplementerViewModel.cs +++ b/SecuritySystem/SecuritySystemContracts/ViewModels/ImplementerViewModel.cs @@ -1,18 +1,20 @@ -using SecuritySystemDataModels.Models; +using SecuritySystemContracts.Attributes; +using SecuritySystemDataModels.Models; using System.ComponentModel; namespace SecuritySystemContracts.ViewModels { public class ImplementerViewModel : IImplementerModel { - [DisplayName("ФИО сотрудника")] - public string ImplementerFIO { get; set; } = string.Empty; - [DisplayName("Пароль")] - public string Password { get; set; } = string.Empty; - [DisplayName("Опыт работы")] - public int WorkExperience { get; set; } - [DisplayName("Квалификация")] - public int Qualification { get; set; } + [Column(visible: false)] public int Id { get; set; } + [Column(title: "ФИО сотрудника", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] + public string ImplementerFIO { get; set; } = string.Empty; + [Column(title: "Пароль", width: 100)] + public string Password { get; set; } = string.Empty; + [Column(title: "Опыт работы", width: 50)] + public int WorkExperience { get; set; } + [Column(title: "Квалификация", width: 50)] + public int Qualification { get; set; } } } diff --git a/SecuritySystem/SecuritySystemContracts/ViewModels/MessageInfoViewModel.cs b/SecuritySystem/SecuritySystemContracts/ViewModels/MessageInfoViewModel.cs index 0d5d25f..3dcd7a2 100644 --- a/SecuritySystem/SecuritySystemContracts/ViewModels/MessageInfoViewModel.cs +++ b/SecuritySystem/SecuritySystemContracts/ViewModels/MessageInfoViewModel.cs @@ -1,20 +1,22 @@ -using SecuritySystemDataModels.Models; +using SecuritySystemContracts.Attributes; +using SecuritySystemDataModels.Models; using System.ComponentModel; namespace SecuritySystemContracts.ViewModels { public class MessageInfoViewModel : IMessageInfoModel { - [DisplayName("Идентификатор")] + [Column(visible: false)] public string MessageId { get; set; } = string.Empty; + [Column(visible: false)] public int? ClientId { get; set; } = null; - [DisplayName("Отправитель")] + [Column(title: "Отправитель", width: 200)] public string SenderName { get; set; } = string.Empty; - [DisplayName("Дата получения")] + [Column(title: "Дата получения", width: 50)] public DateTime DateDelivery { get; set; } = DateTime.Now; - [DisplayName("Тема")] + [Column(title: "Тема", width: 200)] public string Subject { get; set; } = string.Empty; - [DisplayName("Текст")] + [Column(title: "Текст", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string Body { get; set; } = string.Empty; } } diff --git a/SecuritySystem/SecuritySystemContracts/ViewModels/OrderViewModel.cs b/SecuritySystem/SecuritySystemContracts/ViewModels/OrderViewModel.cs index 3d1c1eb..e5478c1 100644 --- a/SecuritySystem/SecuritySystemContracts/ViewModels/OrderViewModel.cs +++ b/SecuritySystem/SecuritySystemContracts/ViewModels/OrderViewModel.cs @@ -1,4 +1,5 @@ -using SecuritySystemDataModels.Enums; +using SecuritySystemContracts.Attributes; +using SecuritySystemDataModels.Enums; using SecuritySystemDataModels.Models; using System.ComponentModel; @@ -6,26 +7,29 @@ namespace SecuritySystemContracts.ViewModels { public class OrderViewModel : IOrderModel { - [DisplayName("Номер")] + [Column(title: "Номер", gridViewAutoSize: GridViewAutoSize.ColumnHeader, isUseAutoSize: true)] public int Id { get; set; } + [Column(visible: false)] public int ClientId { get; set; } + [Column(visible: false)] public int SecureId { get; set; } + [Column(visible: false)] public int? ImplementerId { get; set; } - [DisplayName("ФИО работника")] + [Column(title: "ФИО работника", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string ImplementerFIO { get; set; } = string.Empty; - [DisplayName("ФИО клиента")] + [Column(title: "ФИО клиента", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string ClientFIO { get; set; } = string.Empty; - [DisplayName("Изделие")] + [Column(title: "Изделие", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string SecureName { get; set; } = string.Empty; - [DisplayName("Количество")] + [Column(title: "Количество", gridViewAutoSize: GridViewAutoSize.ColumnHeader, isUseAutoSize: true)] public int Count { get; set; } - [DisplayName("Сумма")] + [Column(title: "Сумма", width: 40)] public double Sum { get; set; } - [DisplayName("Статус")] + [Column(title: "Статус", gridViewAutoSize: GridViewAutoSize.ColumnHeader, isUseAutoSize: true)] public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; - [DisplayName("Дата создания")] + [Column(title: "Дата создания", gridViewAutoSize: GridViewAutoSize.ColumnHeader, isUseAutoSize: true)] public DateTime DateCreate { get; set; } = DateTime.Now; - [DisplayName("Дата выполнения")] + [Column(title: "Дата выполнения", gridViewAutoSize: GridViewAutoSize.ColumnHeader, isUseAutoSize: true)] public DateTime? DateImplement { get; set; } } } diff --git a/SecuritySystem/SecuritySystemContracts/ViewModels/SecureViewModel.cs b/SecuritySystem/SecuritySystemContracts/ViewModels/SecureViewModel.cs index 3da5222..a1c9767 100644 --- a/SecuritySystem/SecuritySystemContracts/ViewModels/SecureViewModel.cs +++ b/SecuritySystem/SecuritySystemContracts/ViewModels/SecureViewModel.cs @@ -1,15 +1,18 @@ -using SecuritySystemDataModels.Models; +using SecuritySystemContracts.Attributes; +using SecuritySystemDataModels.Models; using System.ComponentModel; namespace SecuritySystemContracts.ViewModels { public class SecureViewModel : ISecureModel { + [Column(visible: false)] public int Id { get; set; } - [DisplayName("Название изделия")] + [Column(title: "Название изделия", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string SecureName { get; set; } = string.Empty; - [DisplayName("Цена")] + [Column(title: "Цена", width: 50)] public double Price { get; set; } + [Column(visible: false)] public Dictionary SecureComponents { get; set; } = new(); } } -- 2.25.1 From beb88bcd82178d9825ea4cc3cf22b5e4498168f1 Mon Sep 17 00:00:00 2001 From: "ns.potapov" Date: Sun, 19 May 2024 20:27:25 +0400 Subject: [PATCH 04/13] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=B0=D1=82=D1=80=D0=B8=D0=B1=D1=83=D1=82=D1=8B=20?= =?UTF-8?q?=D0=BA=20=D1=81=D1=83=D1=89=D0=BD=D0=BE=D1=81=D1=82=D1=8F=D0=BC?= =?UTF-8?q?=20=D0=91=D0=94=20=D0=B4=D0=BB=D1=8F=20=D0=B1=D0=B5=D0=BA=D0=B0?= =?UTF-8?q?=D0=BF=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F,=20?= =?UTF-8?q?=D0=B1=D0=B5=D0=BA=D0=B0=D0=BF=D1=8B=20=D1=80=D0=B0=D0=B1=D0=BE?= =?UTF-8?q?=D1=82=D0=B0=D1=8E=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessLogics/BackUpLogic.cs | 95 +++++++++++++++++++ .../BindingModels/BackUpSaveBindingModel.cs | 7 ++ .../BindingModels/MessageInfoBindingModel.cs | 1 + .../BusinessLogicsContracts/IBackUpLogic.cs | 9 ++ .../StoragesContracts/IBackUpInfoStorage.cs | 8 ++ .../ViewModels/MessageInfoViewModel.cs | 2 + .../Models/IMessageInfoModel.cs | 2 +- .../Implements/BackUpInfoStorage.cs | 27 ++++++ .../Models/Client.cs | 6 ++ .../Models/Component.cs | 8 +- .../Models/Implementer.cs | 7 ++ .../Models/MessageInfo.cs | 10 ++ .../Models/Order.cs | 11 +++ .../Models/Secure.cs | 8 +- .../Models/SecureComponent.cs | 6 ++ .../Models/MessageInfo.cs | 2 + .../Models/MessageInfo.cs | 2 + .../SecuritySystemView/FormMain.Designer.cs | 23 +++-- SecuritySystem/SecuritySystemView/FormMain.cs | 34 ++++++- SecuritySystem/SecuritySystemView/Program.cs | 5 + 20 files changed, 260 insertions(+), 13 deletions(-) create mode 100644 SecuritySystem/SecuritySystemBusinessLogic/BusinessLogics/BackUpLogic.cs create mode 100644 SecuritySystem/SecuritySystemContracts/BindingModels/BackUpSaveBindingModel.cs create mode 100644 SecuritySystem/SecuritySystemContracts/BusinessLogicsContracts/IBackUpLogic.cs create mode 100644 SecuritySystem/SecuritySystemContracts/StoragesContracts/IBackUpInfoStorage.cs create mode 100644 SecuritySystem/SecuritySystemDatabaseImplement/Implements/BackUpInfoStorage.cs diff --git a/SecuritySystem/SecuritySystemBusinessLogic/BusinessLogics/BackUpLogic.cs b/SecuritySystem/SecuritySystemBusinessLogic/BusinessLogics/BackUpLogic.cs new file mode 100644 index 0000000..2a6633f --- /dev/null +++ b/SecuritySystem/SecuritySystemBusinessLogic/BusinessLogics/BackUpLogic.cs @@ -0,0 +1,95 @@ +using Microsoft.Extensions.Logging; +using SecuritySystemContracts.BindingModels; +using SecuritySystemContracts.BusinessLogicsContracts; +using SecuritySystemContracts.StoragesContracts; +using SecuritySystemDataModels; +using System.IO.Compression; +using System.Reflection; +using System.Runtime.Serialization.Json; + +namespace SecuritySystemBusinessLogic.BusinessLogics +{ + public class BackUpLogic : IBackUpLogic + { + private readonly ILogger _logger; + private readonly IBackUpInfoStorage _backUpInfo; + public BackUpLogic(ILogger logger, IBackUpInfoStorage backUpInfo) + { + _logger = logger; + _backUpInfo = backUpInfo; + } + public void CreateBackUp(BackUpSaveBindingModel model) + { + if (_backUpInfo == null) + { + return; + } + try + { + _logger.LogDebug("Clear folder"); + // зачистка папки и удаление старого архива + var dirInfo = new DirectoryInfo(model.FolderName); + if (dirInfo.Exists) + { + foreach (var file in dirInfo.GetFiles()) + { + file.Delete(); + } + } + _logger.LogDebug("Delete archive"); + string fileName = $"{model.FolderName}.zip"; + if (File.Exists(fileName)) + { + File.Delete(fileName); + } + // берем метод для сохранения + _logger.LogDebug("Get assembly"); + var typeIId = typeof(IId); + var assembly = typeIId.Assembly; + if (assembly == null) + { + throw new ArgumentNullException("Сборка не найдена", + nameof(assembly)); + } + var types = assembly.GetTypes(); + var method = GetType().GetMethod("SaveToFile", BindingFlags.NonPublic | BindingFlags.Instance); + _logger.LogDebug("Find {count} types", types.Length); + foreach (var type in types) + { + if (type.IsInterface && type.GetInterface(typeIId.Name) != null) + { + var modelType = _backUpInfo.GetTypeByModelInterface(type.Name); + if (modelType == null) + { + throw new InvalidOperationException($"Не найден класс - модель для {type.Name}"); + } + _logger.LogDebug("Call SaveToFile method for {name} type", type.Name); + // вызываем метод на выполнение + method?.MakeGenericMethod(modelType).Invoke(this, new object[] { model.FolderName }); + } + } + _logger.LogDebug("Create zip and remove folder"); + // архивируем + ZipFile.CreateFromDirectory(model.FolderName, fileName); + // удаляем папку + dirInfo.Delete(true); + } + catch (Exception) + { + throw; + } + } + private void SaveToFile(string folderName) where T : class, new() + { + var records = _backUpInfo.GetList(); + if (records == null) + { + _logger.LogWarning("{type} type get null list", typeof(T).Name); + return; + } + var jsonFormatter = new DataContractJsonSerializer(typeof(List)); + using var fs = new FileStream(string.Format("{0}/{1}.json", folderName, typeof(T).Name), FileMode.OpenOrCreate); + jsonFormatter.WriteObject(fs, records); + } + } +} diff --git a/SecuritySystem/SecuritySystemContracts/BindingModels/BackUpSaveBindingModel.cs b/SecuritySystem/SecuritySystemContracts/BindingModels/BackUpSaveBindingModel.cs new file mode 100644 index 0000000..432a6c2 --- /dev/null +++ b/SecuritySystem/SecuritySystemContracts/BindingModels/BackUpSaveBindingModel.cs @@ -0,0 +1,7 @@ +namespace SecuritySystemContracts.BindingModels +{ + public class BackUpSaveBindingModel + { + public string FolderName { get; set; } = string.Empty; + } +} diff --git a/SecuritySystem/SecuritySystemContracts/BindingModels/MessageInfoBindingModel.cs b/SecuritySystem/SecuritySystemContracts/BindingModels/MessageInfoBindingModel.cs index d251a33..0491205 100644 --- a/SecuritySystem/SecuritySystemContracts/BindingModels/MessageInfoBindingModel.cs +++ b/SecuritySystem/SecuritySystemContracts/BindingModels/MessageInfoBindingModel.cs @@ -10,5 +10,6 @@ namespace SecuritySystemContracts.BindingModels public DateTime DateDelivery { get; set; } = DateTime.Now; public string Subject { get; set; } = string.Empty; public string Body { get; set; } = string.Empty; + public int Id => throw new NotImplementedException(); } } diff --git a/SecuritySystem/SecuritySystemContracts/BusinessLogicsContracts/IBackUpLogic.cs b/SecuritySystem/SecuritySystemContracts/BusinessLogicsContracts/IBackUpLogic.cs new file mode 100644 index 0000000..6039bf2 --- /dev/null +++ b/SecuritySystem/SecuritySystemContracts/BusinessLogicsContracts/IBackUpLogic.cs @@ -0,0 +1,9 @@ +using SecuritySystemContracts.BindingModels; + +namespace SecuritySystemContracts.BusinessLogicsContracts +{ + public interface IBackUpLogic + { + void CreateBackUp(BackUpSaveBindingModel model); + } +} diff --git a/SecuritySystem/SecuritySystemContracts/StoragesContracts/IBackUpInfoStorage.cs b/SecuritySystem/SecuritySystemContracts/StoragesContracts/IBackUpInfoStorage.cs new file mode 100644 index 0000000..b216fa9 --- /dev/null +++ b/SecuritySystem/SecuritySystemContracts/StoragesContracts/IBackUpInfoStorage.cs @@ -0,0 +1,8 @@ +namespace SecuritySystemContracts.StoragesContracts +{ + public interface IBackUpInfoStorage + { + List? GetList() where T : class, new(); + Type? GetTypeByModelInterface(string modelInterfaceName); + } +} diff --git a/SecuritySystem/SecuritySystemContracts/ViewModels/MessageInfoViewModel.cs b/SecuritySystem/SecuritySystemContracts/ViewModels/MessageInfoViewModel.cs index 3dcd7a2..89e69b2 100644 --- a/SecuritySystem/SecuritySystemContracts/ViewModels/MessageInfoViewModel.cs +++ b/SecuritySystem/SecuritySystemContracts/ViewModels/MessageInfoViewModel.cs @@ -18,5 +18,7 @@ namespace SecuritySystemContracts.ViewModels public string Subject { get; set; } = string.Empty; [Column(title: "Текст", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string Body { get; set; } = string.Empty; + [Column(visible: false)] + public int Id => throw new NotImplementedException(); } } diff --git a/SecuritySystem/SecuritySystemDataModels/Models/IMessageInfoModel.cs b/SecuritySystem/SecuritySystemDataModels/Models/IMessageInfoModel.cs index 35682f7..3ebe72d 100644 --- a/SecuritySystem/SecuritySystemDataModels/Models/IMessageInfoModel.cs +++ b/SecuritySystem/SecuritySystemDataModels/Models/IMessageInfoModel.cs @@ -1,6 +1,6 @@ namespace SecuritySystemDataModels.Models { - public interface IMessageInfoModel + public interface IMessageInfoModel : IId { string MessageId { get; } int? ClientId { get; } diff --git a/SecuritySystem/SecuritySystemDatabaseImplement/Implements/BackUpInfoStorage.cs b/SecuritySystem/SecuritySystemDatabaseImplement/Implements/BackUpInfoStorage.cs new file mode 100644 index 0000000..bab7da1 --- /dev/null +++ b/SecuritySystem/SecuritySystemDatabaseImplement/Implements/BackUpInfoStorage.cs @@ -0,0 +1,27 @@ +using SecuritySystemContracts.StoragesContracts; + +namespace SecuritySystemDatabaseImplement.Implements +{ + public class BackUpInfoStorage : IBackUpInfoStorage + { + public List? GetList() where T : class, new() + { + using var context = new SecuritySystemDatabase(); + return context.Set().ToList(); + } + public Type? GetTypeByModelInterface(string modelInterfaceName) + { + var assembly = typeof(BackUpInfoStorage).Assembly; + var types = assembly.GetTypes(); + foreach (var type in types) + { + if (type.IsClass && + type.GetInterface(modelInterfaceName) != null) + { + return type; + } + } + return null; + } + } +} diff --git a/SecuritySystem/SecuritySystemDatabaseImplement/Models/Client.cs b/SecuritySystem/SecuritySystemDatabaseImplement/Models/Client.cs index 25376a2..6e24e33 100644 --- a/SecuritySystem/SecuritySystemDatabaseImplement/Models/Client.cs +++ b/SecuritySystem/SecuritySystemDatabaseImplement/Models/Client.cs @@ -3,16 +3,22 @@ using SecuritySystemContracts.ViewModels; using SecuritySystemDataModels.Models; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Runtime.Serialization; namespace SecuritySystemDatabaseImplement.Models { + [DataContract] public class Client : IClientModel { + [DataMember] public int Id { get; private set; } + [DataMember] [Required] public string ClientFIO { get; private set; } = string.Empty; + [DataMember] [Required] public string Email { get; private set; } = string.Empty; + [DataMember] [Required] public string Password { get; private set; } = string.Empty; [ForeignKey("ClientId")] diff --git a/SecuritySystem/SecuritySystemDatabaseImplement/Models/Component.cs b/SecuritySystem/SecuritySystemDatabaseImplement/Models/Component.cs index 040f84f..76c80f2 100644 --- a/SecuritySystem/SecuritySystemDatabaseImplement/Models/Component.cs +++ b/SecuritySystem/SecuritySystemDatabaseImplement/Models/Component.cs @@ -3,19 +3,23 @@ using SecuritySystemContracts.ViewModels; using SecuritySystemDataModels.Models; using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; namespace SecuritySystemDatabaseImplement.Models { + [DataContract] public class Component : IComponentModel { + [DataMember] public int Id { get; private set; } + [DataMember] [Required] public string ComponentName { get; private set; } = string.Empty; + [DataMember] [Required] public double Cost { get; set; } [ForeignKey("ComponentId")] - public virtual List SecureComponents { get; set; } = - new(); + public virtual List SecureComponents { get; set; } = new(); public static Component? Create(ComponentBindingModel model) { if (model == null) diff --git a/SecuritySystem/SecuritySystemDatabaseImplement/Models/Implementer.cs b/SecuritySystem/SecuritySystemDatabaseImplement/Models/Implementer.cs index 0bb5415..b89c7ce 100644 --- a/SecuritySystem/SecuritySystemDatabaseImplement/Models/Implementer.cs +++ b/SecuritySystem/SecuritySystemDatabaseImplement/Models/Implementer.cs @@ -3,18 +3,25 @@ using SecuritySystemContracts.ViewModels; using SecuritySystemDataModels.Models; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Runtime.Serialization; namespace SecuritySystemDatabaseImplement.Models { + [DataContract] public class Implementer : IImplementerModel { + [DataMember] public int Id { get; private set; } + [DataMember] [Required] public string ImplementerFIO { get; private set; } = string.Empty; + [DataMember] [Required] public string Password { get; private set; } = string.Empty; + [DataMember] [Required] public int Qualification { get; private set; } + [DataMember] [Required] public int WorkExperience { get; private set; } [ForeignKey("ImplementerId")] diff --git a/SecuritySystem/SecuritySystemDatabaseImplement/Models/MessageInfo.cs b/SecuritySystem/SecuritySystemDatabaseImplement/Models/MessageInfo.cs index c8564cc..5cfa7f6 100644 --- a/SecuritySystem/SecuritySystemDatabaseImplement/Models/MessageInfo.cs +++ b/SecuritySystem/SecuritySystemDatabaseImplement/Models/MessageInfo.cs @@ -3,21 +3,29 @@ using SecuritySystemContracts.BindingModels; using SecuritySystemContracts.ViewModels; using SecuritySystemDataModels.Models; using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; namespace SecuritySystemDatabaseImplement.Models { + [DataContract] [PrimaryKey("MessageId")] public class MessageInfo : IMessageInfoModel { + [DataMember] public string MessageId { get; set; } = string.Empty; + [DataMember] public int? ClientId { get; set; } public virtual Client? Client { get; set; } + [DataMember] [Required] public string SenderName { get; set; } = string.Empty; + [DataMember] [Required] public DateTime DateDelivery { get; set; } = DateTime.Now; + [DataMember] [Required] public string Subject { get; set; } = string.Empty; + [DataMember] [Required] public string Body { get; set; } = string.Empty; @@ -71,5 +79,7 @@ namespace SecuritySystemDatabaseImplement.Models Subject = Subject, Body = Body, }; + + public int Id => throw new NotImplementedException(); } } diff --git a/SecuritySystem/SecuritySystemDatabaseImplement/Models/Order.cs b/SecuritySystem/SecuritySystemDatabaseImplement/Models/Order.cs index 364d9c6..54b0a5b 100644 --- a/SecuritySystem/SecuritySystemDatabaseImplement/Models/Order.cs +++ b/SecuritySystem/SecuritySystemDatabaseImplement/Models/Order.cs @@ -3,25 +3,36 @@ using SecuritySystemContracts.ViewModels; using SecuritySystemDataModels.Enums; using SecuritySystemDataModels.Models; using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; namespace SecuritySystemDatabaseImplement.Models { + [DataContract] public class Order : IOrderModel { + [DataMember] public int Id { get; private set; } + [DataMember] [Required] public int SecureId { get; private set; } + [DataMember] [Required] public int ClientId { get; private set; } + [DataMember] public int? ImplementerId { get; private set; } + [DataMember] [Required] public int Count { get; private set; } + [DataMember] [Required] public double Sum { get; private set; } + [DataMember] [Required] public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; + [DataMember] [Required] public DateTime DateCreate { get; private set; } = DateTime.Now; + [DataMember] public DateTime? DateImplement { get; private set; } public virtual Secure Secure { get; private set; } public virtual Client Client { get; private set; } diff --git a/SecuritySystem/SecuritySystemDatabaseImplement/Models/Secure.cs b/SecuritySystem/SecuritySystemDatabaseImplement/Models/Secure.cs index 1a971c5..e4c9982 100644 --- a/SecuritySystem/SecuritySystemDatabaseImplement/Models/Secure.cs +++ b/SecuritySystem/SecuritySystemDatabaseImplement/Models/Secure.cs @@ -3,18 +3,22 @@ using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations; using SecuritySystemContracts.BindingModels; using SecuritySystemContracts.ViewModels; +using System.Runtime.Serialization; namespace SecuritySystemDatabaseImplement.Models { + [DataContract] public class Secure : ISecureModel { + [DataMember] public int Id { get; set; } + [DataMember] [Required] public string SecureName { get; set; } = string.Empty; + [DataMember] [Required] public double Price { get; set; } - private Dictionary? _productComponents = - null; + private Dictionary? _productComponents = null; [NotMapped] public Dictionary SecureComponents { diff --git a/SecuritySystem/SecuritySystemDatabaseImplement/Models/SecureComponent.cs b/SecuritySystem/SecuritySystemDatabaseImplement/Models/SecureComponent.cs index 048435a..3fede2f 100644 --- a/SecuritySystem/SecuritySystemDatabaseImplement/Models/SecureComponent.cs +++ b/SecuritySystem/SecuritySystemDatabaseImplement/Models/SecureComponent.cs @@ -1,14 +1,20 @@ using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; namespace SecuritySystemDatabaseImplement.Models { + [DataContract] public class SecureComponent { + [DataMember] public int Id { get; set; } + [DataMember] [Required] public int SecureId { get; set; } + [DataMember] [Required] public int ComponentId { get; set; } + [DataMember] [Required] public int Count { get; set; } public virtual Component Component { get; set; } = new(); diff --git a/SecuritySystem/SecuritySystemFileImplement/Models/MessageInfo.cs b/SecuritySystem/SecuritySystemFileImplement/Models/MessageInfo.cs index f04fe0d..122c7a5 100644 --- a/SecuritySystem/SecuritySystemFileImplement/Models/MessageInfo.cs +++ b/SecuritySystem/SecuritySystemFileImplement/Models/MessageInfo.cs @@ -77,5 +77,7 @@ namespace SecuritySystemFileImplement.Models new XElement("Subject", Subject), new XElement("Body", Body) ); + + public int Id => throw new NotImplementedException(); } } diff --git a/SecuritySystem/SecuritySystemListImplement/Models/MessageInfo.cs b/SecuritySystem/SecuritySystemListImplement/Models/MessageInfo.cs index 5d92b57..edbc32b 100644 --- a/SecuritySystem/SecuritySystemListImplement/Models/MessageInfo.cs +++ b/SecuritySystem/SecuritySystemListImplement/Models/MessageInfo.cs @@ -51,5 +51,7 @@ namespace SecuritySystemListImplement.Models Subject = Subject, Body = Body, }; + + public int Id => throw new NotImplementedException(); } } diff --git a/SecuritySystem/SecuritySystemView/FormMain.Designer.cs b/SecuritySystem/SecuritySystemView/FormMain.Designer.cs index 99c1116..d26ae15 100644 --- a/SecuritySystem/SecuritySystemView/FormMain.Designer.cs +++ b/SecuritySystem/SecuritySystemView/FormMain.Designer.cs @@ -39,11 +39,12 @@ компонентыПоИзделиямToolStripMenuItem = new ToolStripMenuItem(); списокЗаказовToolStripMenuItem = new ToolStripMenuItem(); запускРаботToolStripMenuItem = new ToolStripMenuItem(); + почтаToolStripMenuItem = new ToolStripMenuItem(); dataGridView = new DataGridView(); buttonCreateOrder = new Button(); button4 = new Button(); buttonRefresh = new Button(); - почтаToolStripMenuItem = new ToolStripMenuItem(); + создатьБекапToolStripMenuItem = new ToolStripMenuItem(); menuStrip.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); SuspendLayout(); @@ -51,7 +52,7 @@ // menuStrip // menuStrip.ImageScalingSize = new Size(20, 20); - menuStrip.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, отчетыToolStripMenuItem, запускРаботToolStripMenuItem, почтаToolStripMenuItem }); + menuStrip.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, отчетыToolStripMenuItem, запускРаботToolStripMenuItem, почтаToolStripMenuItem, создатьБекапToolStripMenuItem }); menuStrip.Location = new Point(0, 0); menuStrip.Name = "menuStrip"; menuStrip.Size = new Size(1043, 28); @@ -128,6 +129,13 @@ запускРаботToolStripMenuItem.Text = "Запуск работ"; запускРаботToolStripMenuItem.Click += StartWorksToolStripMenuItem_Click; // + // почтаToolStripMenuItem + // + почтаToolStripMenuItem.Name = "почтаToolStripMenuItem"; + почтаToolStripMenuItem.Size = new Size(65, 24); + почтаToolStripMenuItem.Text = "Почта"; + почтаToolStripMenuItem.Click += MailsToolStripMenuItem_Click; + // // dataGridView // dataGridView.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; @@ -175,12 +183,12 @@ buttonRefresh.UseVisualStyleBackColor = true; buttonRefresh.Click += ButtonRefresh_Click; // - // почтаToolStripMenuItem + // создатьБекапToolStripMenuItem // - почтаToolStripMenuItem.Name = "почтаToolStripMenuItem"; - почтаToolStripMenuItem.Size = new Size(65, 24); - почтаToolStripMenuItem.Text = "Почта"; - почтаToolStripMenuItem.Click += MailsToolStripMenuItem_Click; + создатьБекапToolStripMenuItem.Name = "создатьБекапToolStripMenuItem"; + создатьБекапToolStripMenuItem.Size = new Size(123, 24); + создатьБекапToolStripMenuItem.Text = "Создать бекап"; + создатьБекапToolStripMenuItem.Click += создатьБекапToolStripMenuItem_Click; // // FormMain // @@ -221,5 +229,6 @@ private ToolStripMenuItem исполнителиToolStripMenuItem; private ToolStripMenuItem запускРаботToolStripMenuItem; private ToolStripMenuItem почтаToolStripMenuItem; + private ToolStripMenuItem создатьБекапToolStripMenuItem; } } \ No newline at end of file diff --git a/SecuritySystem/SecuritySystemView/FormMain.cs b/SecuritySystem/SecuritySystemView/FormMain.cs index c0b4fbf..99763b3 100644 --- a/SecuritySystem/SecuritySystemView/FormMain.cs +++ b/SecuritySystem/SecuritySystemView/FormMain.cs @@ -1,4 +1,5 @@ using Microsoft.Extensions.Logging; +using SecuritySystemBusinessLogic.BusinessLogics; using SecuritySystemContracts.BindingModels; using SecuritySystemContracts.BusinessLogicsContracts; using SecuritySystemView.Client; @@ -14,13 +15,20 @@ namespace SecuritySystemView private readonly IOrderLogic _orderLogic; private readonly IReportLogic _reportLogic; private readonly IWorkProcess _workProcess; - public FormMain(ILogger logger, IOrderLogic orderLogic, IReportLogic reportLogic, IWorkProcess workProcess) + private readonly IBackUpLogic _backUpLogic; + public FormMain( + ILogger logger, + IOrderLogic orderLogic, + IReportLogic reportLogic, + IWorkProcess workProcess, + IBackUpLogic backUpLogic) { InitializeComponent(); _logger = logger; _orderLogic = orderLogic; _reportLogic = reportLogic; _workProcess = workProcess; + _backUpLogic = backUpLogic; } private void FormMain_Load(object sender, EventArgs e) { @@ -202,5 +210,29 @@ namespace SecuritySystemView form.ShowDialog(); } } + + private void создатьБекапToolStripMenuItem_Click(object sender, EventArgs e) + { + try + { + if (_backUpLogic != null) + { + var fbd = new FolderBrowserDialog(); + if (fbd.ShowDialog() == DialogResult.OK) + { + _backUpLogic.CreateBackUp(new BackUpSaveBindingModel + { + FolderName = fbd.SelectedPath + }); + MessageBox.Show("Бекап создан", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + } + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + + } } } diff --git a/SecuritySystem/SecuritySystemView/Program.cs b/SecuritySystem/SecuritySystemView/Program.cs index 4e6e102..ba35717 100644 --- a/SecuritySystem/SecuritySystemView/Program.cs +++ b/SecuritySystem/SecuritySystemView/Program.cs @@ -69,6 +69,8 @@ namespace SecuritySystemView services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -76,11 +78,14 @@ namespace SecuritySystemView services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddSingleton(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); -- 2.25.1 From 622fddbe67da0a4bb6a24f97336d05f835578563 Mon Sep 17 00:00:00 2001 From: "ns.potapov" Date: Sun, 19 May 2024 20:36:27 +0400 Subject: [PATCH 05/13] =?UTF-8?q?=D0=A0=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BB=20=D0=BB=D0=BE=D0=B3=D0=B8=D0=BA=D1=83?= =?UTF-8?q?=20=D0=B1=D0=B5=D0=BA=D0=B0=D0=BF=D0=BE=D0=B2=20=D0=B4=D0=BB?= =?UTF-8?q?=D1=8F=20=D0=BF=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=B0=20=D1=85?= =?UTF-8?q?=D1=80=D0=B0=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B2=20=D1=84?= =?UTF-8?q?=D0=B0=D0=B9=D0=BB=D0=B0=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Implements/BackUpInfoStorage.cs | 39 +++++++++++++++++++ .../Models/Client.cs | 6 +++ .../Models/Component.cs | 5 +++ .../Models/Implementer.cs | 7 ++++ .../Models/MessageInfo.cs | 8 ++++ .../Models/Order.cs | 11 ++++++ .../Models/Secure.cs | 6 +++ 7 files changed, 82 insertions(+) create mode 100644 SecuritySystem/SecuritySystemFileImplement/Implements/BackUpInfoStorage.cs diff --git a/SecuritySystem/SecuritySystemFileImplement/Implements/BackUpInfoStorage.cs b/SecuritySystem/SecuritySystemFileImplement/Implements/BackUpInfoStorage.cs new file mode 100644 index 0000000..3144ae8 --- /dev/null +++ b/SecuritySystem/SecuritySystemFileImplement/Implements/BackUpInfoStorage.cs @@ -0,0 +1,39 @@ +using SecuritySystemContracts.StoragesContracts; + +namespace SecuritySystemFileImplement.Implements +{ + public class BackUpInfoStorage : IBackUpInfoStorage + { + private readonly DataFileSingleton source; + public BackUpInfoStorage() + { + source = DataFileSingleton.GetInstance(); + } + + public List? GetList() where T : class, new() + { + return (List?)source + .GetType() + .GetProperties() + .FirstOrDefault( + x => + x.PropertyType.IsGenericType && + x.PropertyType.GetGenericArguments()[0] == typeof(T))? + .GetValue(source); + } + public Type? GetTypeByModelInterface(string modelInterfaceName) + { + var assembly = typeof(BackUpInfoStorage).Assembly; + var types = assembly.GetTypes(); + foreach (var type in types) + { + if (type.IsClass && + type.GetInterface(modelInterfaceName) != null) + { + return type; + } + } + return null; + } + } +} diff --git a/SecuritySystem/SecuritySystemFileImplement/Models/Client.cs b/SecuritySystem/SecuritySystemFileImplement/Models/Client.cs index 894c83a..3ce9966 100644 --- a/SecuritySystem/SecuritySystemFileImplement/Models/Client.cs +++ b/SecuritySystem/SecuritySystemFileImplement/Models/Client.cs @@ -3,15 +3,21 @@ using SecuritySystemContracts.ViewModels; using SecuritySystemDataModels.Models; using SecuritySystemFileImplement.Models; using System.Reflection; +using System.Runtime.Serialization; using System.Xml.Linq; namespace SecuritySystemFileImplement.Models { + [DataContract] public class Client : IClientModel { + [DataMember] public int Id { get; private set; } + [DataMember] public string ClientFIO { get; private set; } = string.Empty; + [DataMember] public string Email { get; private set; } = string.Empty; + [DataMember] public string Password { get; private set; } = string.Empty; public static Client? Create(ClientBindingModel model) { diff --git a/SecuritySystem/SecuritySystemFileImplement/Models/Component.cs b/SecuritySystem/SecuritySystemFileImplement/Models/Component.cs index abfb825..2bf76b6 100644 --- a/SecuritySystem/SecuritySystemFileImplement/Models/Component.cs +++ b/SecuritySystem/SecuritySystemFileImplement/Models/Component.cs @@ -1,14 +1,19 @@ using SecuritySystemContracts.BindingModels; using SecuritySystemContracts.ViewModels; using SecuritySystemDataModels.Models; +using System.Runtime.Serialization; using System.Xml.Linq; namespace SecuritySystemFileImplement.Models { + [DataContract] public class Component : IComponentModel { + [DataMember] public int Id { get; private set; } + [DataMember] public string ComponentName { get; private set; } = string.Empty; + [DataMember] public double Cost { get; set; } public static Component? Create(ComponentBindingModel model) { diff --git a/SecuritySystem/SecuritySystemFileImplement/Models/Implementer.cs b/SecuritySystem/SecuritySystemFileImplement/Models/Implementer.cs index 0c1c5be..6fc395a 100644 --- a/SecuritySystem/SecuritySystemFileImplement/Models/Implementer.cs +++ b/SecuritySystem/SecuritySystemFileImplement/Models/Implementer.cs @@ -1,16 +1,23 @@ using SecuritySystemContracts.BindingModels; using SecuritySystemContracts.ViewModels; using SecuritySystemDataModels.Models; +using System.Runtime.Serialization; using System.Xml.Linq; namespace SecuritySystemFileImplement.Models { + [DataContract] public class Implementer : IImplementerModel { + [DataMember] public string ImplementerFIO { get; private set; } = string.Empty; + [DataMember] public string Password { get; private set; } = string.Empty; + [DataMember] public int WorkExperience { get; private set; } + [DataMember] public int Qualification { get; private set; } + [DataMember] public int Id { get; private set; } public static Implementer? Create(ImplementerBindingModel model) { diff --git a/SecuritySystem/SecuritySystemFileImplement/Models/MessageInfo.cs b/SecuritySystem/SecuritySystemFileImplement/Models/MessageInfo.cs index 122c7a5..e4260a9 100644 --- a/SecuritySystem/SecuritySystemFileImplement/Models/MessageInfo.cs +++ b/SecuritySystem/SecuritySystemFileImplement/Models/MessageInfo.cs @@ -2,17 +2,25 @@ using SecuritySystemContracts.ViewModels; using SecuritySystemDataModels.Models; using System.Reflection; +using System.Runtime.Serialization; using System.Xml.Linq; namespace SecuritySystemFileImplement.Models { + [DataContract] public class MessageInfo : IMessageInfoModel { + [DataMember] public string MessageId { get; set; } = string.Empty; + [DataMember] public int? ClientId { get; set; } + [DataMember] public string SenderName { get; set; } = string.Empty; + [DataMember] public DateTime DateDelivery { get; set; } = DateTime.Now; + [DataMember] public string Subject { get; set; } = string.Empty; + [DataMember] public string Body { get; set; } = string.Empty; public static MessageInfo? Create(MessageInfoBindingModel model) diff --git a/SecuritySystem/SecuritySystemFileImplement/Models/Order.cs b/SecuritySystem/SecuritySystemFileImplement/Models/Order.cs index 13db84d..1c7ebe2 100644 --- a/SecuritySystem/SecuritySystemFileImplement/Models/Order.cs +++ b/SecuritySystem/SecuritySystemFileImplement/Models/Order.cs @@ -2,20 +2,31 @@ using SecuritySystemContracts.ViewModels; using SecuritySystemDataModels.Enums; using SecuritySystemDataModels.Models; +using System.Runtime.Serialization; using System.Xml.Linq; namespace SecuritySystemFileImplement.Models { + [DataContract] public class Order : IOrderModel { + [DataMember] public int Id { get; private set; } + [DataMember] public int SecureId { get; private set; } + [DataMember] public int ClientId { get; private set; } + [DataMember] public int? ImplementerId { get; private set; } + [DataMember] public int Count { get; private set; } + [DataMember] public double Sum { get; private set; } + [DataMember] public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; + [DataMember] public DateTime DateCreate { get; private set; } = DateTime.Now; + [DataMember] public DateTime? DateImplement { get; private set; } public static Order? Create(OrderBindingModel? model) diff --git a/SecuritySystem/SecuritySystemFileImplement/Models/Secure.cs b/SecuritySystem/SecuritySystemFileImplement/Models/Secure.cs index 1b281c5..6df19e8 100644 --- a/SecuritySystem/SecuritySystemFileImplement/Models/Secure.cs +++ b/SecuritySystem/SecuritySystemFileImplement/Models/Secure.cs @@ -1,17 +1,23 @@ using SecuritySystemContracts.BindingModels; using SecuritySystemContracts.ViewModels; using SecuritySystemDataModels.Models; +using System.Runtime.Serialization; using System.Xml.Linq; namespace SecuritySystemFileImplement.Models { + [DataContract] public class Secure : ISecureModel { + [DataMember] public int Id { get; private set; } + [DataMember] public string SecureName { get; private set; } = string.Empty; + [DataMember] public double Price { get; private set; } public Dictionary Components { get; private set; } = new(); private Dictionary? _secureComponents = null; + [DataMember] public Dictionary SecureComponents { get -- 2.25.1 From 0484b22e0381626a300bb67ad02800273022c3b7 Mon Sep 17 00:00:00 2001 From: "ns.potapov" Date: Sun, 19 May 2024 21:08:52 +0400 Subject: [PATCH 06/13] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BB=D0=BE=D0=B3=D0=B8=D0=BA=D1=83=20DI,=20=D0=BD?= =?UTF-8?q?=D1=83=D0=B6=D0=BD=D0=BE=20=D0=BF=D1=80=D0=BE=D0=BF=D0=B8=D1=81?= =?UTF-8?q?=D0=B0=D1=82=D1=8C=20Extension=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81?= =?UTF-8?q?=D1=8B=20=D0=B4=D0=BB=D1=8F=20=D0=BF=D1=80=D0=BE=D0=B5=D0=BA?= =?UTF-8?q?=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DI/DependencyManager.cs | 72 +++++++++++++++++++ .../DI/IDependencyContainer.cs | 36 ++++++++++ .../DI/IImplementationExtension.cs | 14 ++++ .../DI/ServiceDependencyContainer.cs | 56 +++++++++++++++ .../DI/ServiceProviderLoader.cs | 53 ++++++++++++++ .../SecuritySystemContracts.csproj | 4 ++ 6 files changed, 235 insertions(+) create mode 100644 SecuritySystem/SecuritySystemContracts/DI/DependencyManager.cs create mode 100644 SecuritySystem/SecuritySystemContracts/DI/IDependencyContainer.cs create mode 100644 SecuritySystem/SecuritySystemContracts/DI/IImplementationExtension.cs create mode 100644 SecuritySystem/SecuritySystemContracts/DI/ServiceDependencyContainer.cs create mode 100644 SecuritySystem/SecuritySystemContracts/DI/ServiceProviderLoader.cs diff --git a/SecuritySystem/SecuritySystemContracts/DI/DependencyManager.cs b/SecuritySystem/SecuritySystemContracts/DI/DependencyManager.cs new file mode 100644 index 0000000..6691ee4 --- /dev/null +++ b/SecuritySystem/SecuritySystemContracts/DI/DependencyManager.cs @@ -0,0 +1,72 @@ +using Microsoft.Extensions.Logging; + +namespace SecuritySystemContracts.DI +{ + /// + /// Менеджер для работы с зависимостями + /// + public class DependencyManager + { + private readonly IDependencyContainer _dependencyManager; + private static DependencyManager? _manager; + private static readonly object _locjObject = new(); + private DependencyManager() + { + _dependencyManager = new ServiceDependencyContainer(); + } + public static DependencyManager Instance + { + get + { + if (_manager == null) + { + lock (_locjObject) + { + _manager = new DependencyManager(); + } + } + return _manager; + } + } + /// + /// Иницализация библиотек, в которых идут установки зависомстей + /// + public static void InitDependency() + { + var ext = ServiceProviderLoader.GetImplementationExtensions(); + if (ext == null) + { + throw new ArgumentNullException("Отсутствуют компоненты для загрузки зависимостей по модулям"); + } + // регистрируем зависимости + ext.RegisterServices(); + } + /// + /// Регистрация логгера + /// + /// + public void AddLogging(Action configure) => _dependencyManager.AddLogging(configure); + /// + /// Добавление зависимости + /// + /// + /// + public void RegisterType(bool isSingle = false) + where U : class, T + where T : class => _dependencyManager.RegisterType(isSingle); + /// + /// Добавление зависимости + /// + /// + /// + public void RegisterType(bool isSingle = false) + where T : class => _dependencyManager.RegisterType(isSingle); + /// + /// Получение класса со всеми зависмостями + /// + /// + /// + public T Resolve() => _dependencyManager.Resolve(); + } + +} diff --git a/SecuritySystem/SecuritySystemContracts/DI/IDependencyContainer.cs b/SecuritySystem/SecuritySystemContracts/DI/IDependencyContainer.cs new file mode 100644 index 0000000..eb761f0 --- /dev/null +++ b/SecuritySystem/SecuritySystemContracts/DI/IDependencyContainer.cs @@ -0,0 +1,36 @@ +using Microsoft.Extensions.Logging; + +namespace SecuritySystemContracts.DI +{ + /// + /// Интерфейс установки зависмости между элементами + /// + public interface IDependencyContainer + { + /// + /// Регистрация логгера + /// + /// + void AddLogging(Action configure); + /// + /// Добавление зависимости + /// + /// + /// + /// + void RegisterType(bool isSingle) where U : class, T where T : + class; + /// + /// Добавление зависимости + /// + /// + /// + void RegisterType(bool isSingle) where T : class; + /// + /// Получение класса со всеми зависмостями + /// + /// + /// + T Resolve(); + } +} diff --git a/SecuritySystem/SecuritySystemContracts/DI/IImplementationExtension.cs b/SecuritySystem/SecuritySystemContracts/DI/IImplementationExtension.cs new file mode 100644 index 0000000..177bebf --- /dev/null +++ b/SecuritySystem/SecuritySystemContracts/DI/IImplementationExtension.cs @@ -0,0 +1,14 @@ +namespace SecuritySystemContracts.DI +{ + /// + /// Интерфейс для регистрации зависимостей в модулях + /// + public interface IImplementationExtension + { + public int Priority { get; } + /// + /// Регистрация сервисов + /// + public void RegisterServices(); + } +} diff --git a/SecuritySystem/SecuritySystemContracts/DI/ServiceDependencyContainer.cs b/SecuritySystem/SecuritySystemContracts/DI/ServiceDependencyContainer.cs new file mode 100644 index 0000000..7ec4665 --- /dev/null +++ b/SecuritySystem/SecuritySystemContracts/DI/ServiceDependencyContainer.cs @@ -0,0 +1,56 @@ +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; + +namespace SecuritySystemContracts.DI +{ + public class ServiceDependencyContainer : IDependencyContainer + { + private ServiceProvider? _serviceProvider; + private readonly ServiceCollection _serviceCollection; + + public ServiceDependencyContainer() + { + _serviceCollection = new ServiceCollection(); + } + + public void AddLogging(Action configure) + { + _serviceCollection.AddLogging(configure); + } + + public void RegisterType(bool isSingle) where T : class where U : class, T + { + if (isSingle) + { + _serviceCollection.AddSingleton(); + } + else + { + _serviceCollection.AddTransient(); + } + _serviceProvider = null; + } + + public T Resolve() + { + if (_serviceProvider == null) + { + _serviceProvider = _serviceCollection.BuildServiceProvider(); + } + return _serviceProvider.GetService()!; + } + + void IDependencyContainer.RegisterType(bool isSingle) where T : class + { + if (isSingle) + { + _serviceCollection.AddSingleton(); + } + else + { + _serviceCollection.AddTransient(); + } + _serviceProvider = null; + } + } +} diff --git a/SecuritySystem/SecuritySystemContracts/DI/ServiceProviderLoader.cs b/SecuritySystem/SecuritySystemContracts/DI/ServiceProviderLoader.cs new file mode 100644 index 0000000..b128076 --- /dev/null +++ b/SecuritySystem/SecuritySystemContracts/DI/ServiceProviderLoader.cs @@ -0,0 +1,53 @@ +using System.Reflection; + +namespace SecuritySystemContracts.DI +{ + /// + /// Загрузчик данных + /// + public static partial class ServiceProviderLoader + { + /// + /// Загрузка всех классов-реализаций IImplementationExtension + /// + /// + public static IImplementationExtension? GetImplementationExtensions() + { + IImplementationExtension? source = null; + var files = Directory.GetFiles(TryGetImplementationExtensionsFolder(), "*.dll", SearchOption.AllDirectories); + foreach (var file in files.Distinct()) + { + Assembly asm = Assembly.LoadFrom(file); + foreach (var t in asm.GetExportedTypes()) + { + if (t.IsClass && typeof(IImplementationExtension).IsAssignableFrom(t)) + { + if (source == null) + { + source = (IImplementationExtension)Activator.CreateInstance(t)!; + } + else + { + var newSource = (IImplementationExtension)Activator.CreateInstance(t)!; + if (newSource.Priority > source.Priority) + { + source = newSource; + } + } + } + } + } + return source; + } + private static string TryGetImplementationExtensionsFolder() + { + var directory = new DirectoryInfo(Directory.GetCurrentDirectory()); + while (directory != null && !directory.GetDirectories("ImplementationExtensions", SearchOption.AllDirectories).Any(x => x.Name == "ImplementationExtensions")) + { + directory = directory.Parent; + } + return $"{directory?.FullName}\\ImplementationExtensions"; + } + } + +} diff --git a/SecuritySystem/SecuritySystemContracts/SecuritySystemContracts.csproj b/SecuritySystem/SecuritySystemContracts/SecuritySystemContracts.csproj index 2554988..c3a3957 100644 --- a/SecuritySystem/SecuritySystemContracts/SecuritySystemContracts.csproj +++ b/SecuritySystem/SecuritySystemContracts/SecuritySystemContracts.csproj @@ -7,6 +7,10 @@ AnyCPU;x64;x86 + + + + -- 2.25.1 From 2bacaad2c38bb6ce5da04f614f024e570565d017 Mon Sep 17 00:00:00 2001 From: "ns.potapov" Date: Sun, 19 May 2024 21:50:25 +0400 Subject: [PATCH 07/13] =?UTF-8?q?=D0=9F=D0=BE=D0=BC=D0=B5=D0=BD=D1=8F?= =?UTF-8?q?=D0=BB=20=D0=BD=D0=B0=20=D0=B2=D1=81=D0=B5=D1=85=20=D1=84=D0=BE?= =?UTF-8?q?=D1=80=D0=BC=D0=B0=D1=85=20=D0=BA=D0=BE=D0=B4=20=D0=B2=D0=BD?= =?UTF-8?q?=D0=B5=D0=B4=D1=80=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B7=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D1=81=D0=B8=D0=BC=D0=BE=D1=81=D1=82=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + .../DatabaseImplementationExtension .cs | 21 +++++ .../SecuritySystemDatabaseImplement.csproj | 40 ++++----- .../FileImplementationExtension .cs | 21 +++++ .../SecuritySystemFileImplement.csproj | 24 +++--- .../Implements/BackUpInfoStorage.cs | 17 ++++ .../ListImplementationExtension.cs | 21 +++++ .../SecuritySystemListImplement.csproj | 4 + .../Component/FormComponents.cs | 5 +- SecuritySystem/SecuritySystemView/FormMain.cs | 21 +++-- .../Implementer/FormImplementers.cs | 5 +- SecuritySystem/SecuritySystemView/Program.cs | 81 ++++++++++--------- .../SecuritySystemView/Secure/FormSecure.cs | 5 +- .../SecuritySystemView/Secure/FormSecures.cs | 5 +- 14 files changed, 184 insertions(+), 87 deletions(-) create mode 100644 SecuritySystem/SecuritySystemDatabaseImplement/DatabaseImplementationExtension .cs create mode 100644 SecuritySystem/SecuritySystemFileImplement/FileImplementationExtension .cs create mode 100644 SecuritySystem/SecuritySystemListImplement/Implements/BackUpInfoStorage.cs create mode 100644 SecuritySystem/SecuritySystemListImplement/ListImplementationExtension.cs diff --git a/.gitignore b/.gitignore index ca1c7a3..4f51ab0 100644 --- a/.gitignore +++ b/.gitignore @@ -398,3 +398,4 @@ FodyWeavers.xsd # JetBrains Rider *.sln.iml +ImplementationExtensions/ \ No newline at end of file diff --git a/SecuritySystem/SecuritySystemDatabaseImplement/DatabaseImplementationExtension .cs b/SecuritySystem/SecuritySystemDatabaseImplement/DatabaseImplementationExtension .cs new file mode 100644 index 0000000..b8fa178 --- /dev/null +++ b/SecuritySystem/SecuritySystemDatabaseImplement/DatabaseImplementationExtension .cs @@ -0,0 +1,21 @@ +using SecuritySystemContracts.DI; +using SecuritySystemContracts.StoragesContracts; +using SecuritySystemDatabaseImplement.Implements; + +namespace SecuritySystemDatabaseImplement +{ + public class DatabaseImplementationExtension : IImplementationExtension + { + public int Priority => 2; + public void RegisterServices() + { + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + } + } +} diff --git a/SecuritySystem/SecuritySystemDatabaseImplement/SecuritySystemDatabaseImplement.csproj b/SecuritySystem/SecuritySystemDatabaseImplement/SecuritySystemDatabaseImplement.csproj index f2838d1..453e6f5 100644 --- a/SecuritySystem/SecuritySystemDatabaseImplement/SecuritySystemDatabaseImplement.csproj +++ b/SecuritySystem/SecuritySystemDatabaseImplement/SecuritySystemDatabaseImplement.csproj @@ -1,24 +1,28 @@  - - net6.0 - enable - enable - AnyCPU;x64 - + + net6.0 + enable + enable + AnyCPU;x64 + - - - - + + + + - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + diff --git a/SecuritySystem/SecuritySystemFileImplement/FileImplementationExtension .cs b/SecuritySystem/SecuritySystemFileImplement/FileImplementationExtension .cs new file mode 100644 index 0000000..737e734 --- /dev/null +++ b/SecuritySystem/SecuritySystemFileImplement/FileImplementationExtension .cs @@ -0,0 +1,21 @@ +using SecuritySystemContracts.DI; +using SecuritySystemContracts.StoragesContracts; +using SecuritySystemFileImplement.Implements; + +namespace SecuritySystemFileImplement +{ + public class FileImplementationExtension : IImplementationExtension + { + public int Priority => 1; + public void RegisterServices() + { + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + } + } +} diff --git a/SecuritySystem/SecuritySystemFileImplement/SecuritySystemFileImplement.csproj b/SecuritySystem/SecuritySystemFileImplement/SecuritySystemFileImplement.csproj index 2c64771..335113d 100644 --- a/SecuritySystem/SecuritySystemFileImplement/SecuritySystemFileImplement.csproj +++ b/SecuritySystem/SecuritySystemFileImplement/SecuritySystemFileImplement.csproj @@ -1,15 +1,19 @@ - - net6.0 - enable - enable - AnyCPU;x64;x86 - + + net6.0 + enable + enable + AnyCPU;x64;x86 + - - - - + + + + + + + + diff --git a/SecuritySystem/SecuritySystemListImplement/Implements/BackUpInfoStorage.cs b/SecuritySystem/SecuritySystemListImplement/Implements/BackUpInfoStorage.cs new file mode 100644 index 0000000..f0441b3 --- /dev/null +++ b/SecuritySystem/SecuritySystemListImplement/Implements/BackUpInfoStorage.cs @@ -0,0 +1,17 @@ +using SecuritySystemContracts.StoragesContracts; + +namespace SecuritySystemListImplement.Implements +{ + public class BackUpInfoStorage : IBackUpInfoStorage + { + public List? GetList() where T : class, new() + { + throw new NotImplementedException(); + } + + public Type? GetTypeByModelInterface(string modelInterfaceName) + { + throw new NotImplementedException(); + } + } +} diff --git a/SecuritySystem/SecuritySystemListImplement/ListImplementationExtension.cs b/SecuritySystem/SecuritySystemListImplement/ListImplementationExtension.cs new file mode 100644 index 0000000..686b7f2 --- /dev/null +++ b/SecuritySystem/SecuritySystemListImplement/ListImplementationExtension.cs @@ -0,0 +1,21 @@ +using SecuritySystemContracts.DI; +using SecuritySystemContracts.StoragesContracts; +using SecuritySystemListImplement.Implements; + +namespace SecuritySystemListImplement +{ + public class ListImplementationExtension : IImplementationExtension + { + public int Priority => 0; + public void RegisterServices() + { + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + } + } +} diff --git a/SecuritySystem/SecuritySystemListImplement/SecuritySystemListImplement.csproj b/SecuritySystem/SecuritySystemListImplement/SecuritySystemListImplement.csproj index 64fda98..90a5015 100644 --- a/SecuritySystem/SecuritySystemListImplement/SecuritySystemListImplement.csproj +++ b/SecuritySystem/SecuritySystemListImplement/SecuritySystemListImplement.csproj @@ -12,4 +12,8 @@ + + + + diff --git a/SecuritySystem/SecuritySystemView/Component/FormComponents.cs b/SecuritySystem/SecuritySystemView/Component/FormComponents.cs index 9acae52..e059195 100644 --- a/SecuritySystem/SecuritySystemView/Component/FormComponents.cs +++ b/SecuritySystem/SecuritySystemView/Component/FormComponents.cs @@ -1,6 +1,7 @@ using Microsoft.Extensions.Logging; using SecuritySystemContracts.BindingModels; using SecuritySystemContracts.BusinessLogicsContracts; +using SecuritySystemContracts.DI; using System.Windows.Forms; namespace SecuritySystemView @@ -35,7 +36,7 @@ namespace SecuritySystemView } private void ButtonAddComponent_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormComponent)); + var service = DependencyManager.Instance.Resolve(); if (service is FormComponent form) { if (form.ShowDialog() == DialogResult.OK) @@ -48,7 +49,7 @@ namespace SecuritySystemView { if (dataGridViewComponents.SelectedRows.Count == 1) { - var service = Program.ServiceProvider?.GetService(typeof(FormComponent)); + var service = DependencyManager.Instance.Resolve(); if (service is FormComponent form) { form.Id = Convert.ToInt32(dataGridViewComponents.SelectedRows[0].Cells["Id"].Value); diff --git a/SecuritySystem/SecuritySystemView/FormMain.cs b/SecuritySystem/SecuritySystemView/FormMain.cs index 99763b3..b32ef1f 100644 --- a/SecuritySystem/SecuritySystemView/FormMain.cs +++ b/SecuritySystem/SecuritySystemView/FormMain.cs @@ -1,7 +1,7 @@ using Microsoft.Extensions.Logging; -using SecuritySystemBusinessLogic.BusinessLogics; using SecuritySystemContracts.BindingModels; using SecuritySystemContracts.BusinessLogicsContracts; +using SecuritySystemContracts.DI; using SecuritySystemView.Client; using SecuritySystemView.Implementer; using SecuritySystemView.Mail; @@ -49,7 +49,7 @@ namespace SecuritySystemView } private void ComponentsToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormComponents)); + var service = DependencyManager.Instance.Resolve(); if (service is FormComponents form) { form.ShowDialog(); @@ -57,7 +57,7 @@ namespace SecuritySystemView } private void SecuresToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormSecures)); + var service = DependencyManager.Instance.Resolve(); if (service is FormSecures form) { form.ShowDialog(); @@ -65,7 +65,7 @@ namespace SecuritySystemView } private void ButtonCreateOrder_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder)); + var service = DependencyManager.Instance.Resolve(); if (service is FormCreateOrder form) { form.ShowDialog(); @@ -162,7 +162,7 @@ namespace SecuritySystemView private void ReportComponentsSecuresToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormReportSecureComponents)); + var service = DependencyManager.Instance.Resolve(); if (service is FormReportSecureComponents form) { form.ShowDialog(); @@ -171,7 +171,7 @@ namespace SecuritySystemView private void ReportOrdersToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders)); + var service = DependencyManager.Instance.Resolve(); if (service is FormReportOrders form) { form.ShowDialog(); @@ -180,7 +180,7 @@ namespace SecuritySystemView private void ClientsToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormClients)); + var service = DependencyManager.Instance.Resolve(); if (service is FormClients form) { form.ShowDialog(); @@ -189,7 +189,7 @@ namespace SecuritySystemView private void ImplementersToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormImplementers)); + var service = DependencyManager.Instance.Resolve(); if (service is FormImplementers form) { form.ShowDialog(); @@ -198,13 +198,13 @@ namespace SecuritySystemView private void StartWorksToolStripMenuItem_Click(object sender, EventArgs e) { - _workProcess.DoWork((Program.ServiceProvider?.GetService(typeof(IImplementerLogic)) as IImplementerLogic)!, _orderLogic); + _workProcess.DoWork((DependencyManager.Instance.Resolve())!, _orderLogic); MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); } private void MailsToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormMails)); + var service = DependencyManager.Instance.Resolve(); if (service is FormMails form) { form.ShowDialog(); @@ -232,7 +232,6 @@ namespace SecuritySystemView { MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } - } } } diff --git a/SecuritySystem/SecuritySystemView/Implementer/FormImplementers.cs b/SecuritySystem/SecuritySystemView/Implementer/FormImplementers.cs index aef6cfb..01cb14b 100644 --- a/SecuritySystem/SecuritySystemView/Implementer/FormImplementers.cs +++ b/SecuritySystem/SecuritySystemView/Implementer/FormImplementers.cs @@ -1,6 +1,7 @@ using Microsoft.Extensions.Logging; using SecuritySystemContracts.BindingModels; using SecuritySystemContracts.BusinessLogicsContracts; +using SecuritySystemContracts.DI; namespace SecuritySystemView.Implementer { @@ -33,7 +34,7 @@ namespace SecuritySystemView.Implementer } private void ButtonAdd_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormImplementer)); + var service = DependencyManager.Instance.Resolve(); if (service is FormImplementer form) { if (form.ShowDialog() == DialogResult.OK) @@ -46,7 +47,7 @@ namespace SecuritySystemView.Implementer { if (dataGridView.SelectedRows.Count == 1) { - var service = Program.ServiceProvider?.GetService(typeof(FormImplementer)); + var service = DependencyManager.Instance.Resolve(); if (service is FormImplementer form) { form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); diff --git a/SecuritySystem/SecuritySystemView/Program.cs b/SecuritySystem/SecuritySystemView/Program.cs index ba35717..7e1961b 100644 --- a/SecuritySystem/SecuritySystemView/Program.cs +++ b/SecuritySystem/SecuritySystemView/Program.cs @@ -7,6 +7,7 @@ using SecuritySystemBusinessLogic.OfficePackage; using SecuritySystemBusinessLogic.OfficePackage.Implements; using SecuritySystemContracts.BindingModels; using SecuritySystemContracts.BusinessLogicsContracts; +using SecuritySystemContracts.DI; using SecuritySystemContracts.StoragesContracts; using SecuritySystemDatabaseImplement.Implements; using SecuritySystemView.Client; @@ -30,12 +31,11 @@ namespace SecuritySystemView // see https://aka.ms/applicationconfiguration. ApplicationConfiguration.Initialize(); var services = new ServiceCollection(); - ConfigureServices(services); - _serviceProvider = services.BuildServiceProvider(); + InitDependency(); try { - var mailSender = _serviceProvider.GetService(); + var mailSender = DependencyManager.Instance.Resolve(); mailSender?.MailConfig(new MailConfigBindingModel { MailLogin = System.Configuration.ConfigurationManager.AppSettings["MailLogin"] ?? string.Empty, @@ -49,56 +49,57 @@ namespace SecuritySystemView } catch (Exception ex) { - var logger = _serviceProvider.GetService(); + var logger = DependencyManager.Instance.Resolve(); logger?.LogError(ex, " "); } - Application.Run(_serviceProvider.GetRequiredService()); + Application.Run(DependencyManager.Instance.Resolve()); } - private static void ConfigureServices(ServiceCollection services) + private static void InitDependency() { - services.AddLogging(option => + DependencyManager.InitDependency(); + DependencyManager.Instance.AddLogging(option => { option.SetMinimumLevel(LogLevel.Information); option.AddNLog("nlog.config"); }); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddSingleton(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(true); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); } private static void MailCheck(object obj) => ServiceProvider?.GetService()?.MailCheck(); } diff --git a/SecuritySystem/SecuritySystemView/Secure/FormSecure.cs b/SecuritySystem/SecuritySystemView/Secure/FormSecure.cs index 7083b18..453e59f 100644 --- a/SecuritySystem/SecuritySystemView/Secure/FormSecure.cs +++ b/SecuritySystem/SecuritySystemView/Secure/FormSecure.cs @@ -1,6 +1,7 @@ using Microsoft.Extensions.Logging; using SecuritySystemContracts.BindingModels; using SecuritySystemContracts.BusinessLogicsContracts; +using SecuritySystemContracts.DI; using SecuritySystemContracts.SearchModels; using SecuritySystemDataModels.Models; using System.Windows.Forms; @@ -73,7 +74,7 @@ namespace SecuritySystemView } private void ButtonAdd_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormSecureComponent)); + var service = DependencyManager.Instance.Resolve(); if (service is FormSecureComponent form) { if (form.ShowDialog() == DialogResult.OK) @@ -101,7 +102,7 @@ namespace SecuritySystemView { if (dataGridView.SelectedRows.Count == 1) { - var service = Program.ServiceProvider?.GetService(typeof(FormSecureComponent)); + var service = DependencyManager.Instance.Resolve(); if (service is FormSecureComponent form) { int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value); diff --git a/SecuritySystem/SecuritySystemView/Secure/FormSecures.cs b/SecuritySystem/SecuritySystemView/Secure/FormSecures.cs index 1516778..f5b8add 100644 --- a/SecuritySystem/SecuritySystemView/Secure/FormSecures.cs +++ b/SecuritySystem/SecuritySystemView/Secure/FormSecures.cs @@ -1,6 +1,7 @@ using Microsoft.Extensions.Logging; using SecuritySystemContracts.BindingModels; using SecuritySystemContracts.BusinessLogicsContracts; +using SecuritySystemContracts.DI; namespace SecuritySystemView { @@ -34,7 +35,7 @@ namespace SecuritySystemView } private void ButtonAddSecure_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormSecure)); + var service = DependencyManager.Instance.Resolve(); if (service is FormSecure form) { if (form.ShowDialog() == DialogResult.OK) @@ -47,7 +48,7 @@ namespace SecuritySystemView { if (dataGridView.SelectedRows.Count == 1) { - var service = Program.ServiceProvider?.GetService(typeof(FormSecure)); + var service = DependencyManager.Instance.Resolve(); if (service is FormSecure form) { form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); -- 2.25.1 From 56b7de7d18a9599d5e06bc326a954735e9d53b44 Mon Sep 17 00:00:00 2001 From: "ns.potapov" Date: Sun, 19 May 2024 21:52:57 +0400 Subject: [PATCH 08/13] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B8=D0=BB=20Se?= =?UTF-8?q?rviceProvider=20=D0=B8=D0=B7=20Program.cs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SecuritySystem/SecuritySystemView/Program.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/SecuritySystem/SecuritySystemView/Program.cs b/SecuritySystem/SecuritySystemView/Program.cs index 7e1961b..1edc7ed 100644 --- a/SecuritySystem/SecuritySystemView/Program.cs +++ b/SecuritySystem/SecuritySystemView/Program.cs @@ -19,8 +19,6 @@ namespace SecuritySystemView { internal static class Program { - private static ServiceProvider? _serviceProvider; - public static ServiceProvider? ServiceProvider => _serviceProvider; /// /// The main entry point for the application. /// @@ -101,6 +99,6 @@ namespace SecuritySystemView DependencyManager.Instance.RegisterType(); DependencyManager.Instance.RegisterType(); } - private static void MailCheck(object obj) => ServiceProvider?.GetService()?.MailCheck(); + private static void MailCheck(object obj) => DependencyManager.Instance.Resolve()?.MailCheck(); } } \ No newline at end of file -- 2.25.1 From 02d703f55dabb193cb87749f46e3c7f6b1df1308 Mon Sep 17 00:00:00 2001 From: "ns.potapov" Date: Sun, 19 May 2024 22:04:59 +0400 Subject: [PATCH 09/13] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20=D0=BB?= =?UTF-8?q?=D0=B8=D1=88=D0=BD=D0=B8=D0=B5=20=D1=83=D1=81=D0=BB=D0=BE=D0=B2?= =?UTF-8?q?=D0=B8=D1=8F=20=D0=B2=20=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=85=20?= =?UTF-8?q?=D0=BF=D1=80=D0=B8=20=D1=80=D0=B5=D0=B7=D0=BE=D0=BB=D0=B2=D0=B5?= =?UTF-8?q?=20=D0=B7=D0=B0=D0=B2=D0=B8=D1=81=D0=B8=D0=BC=D0=BE=D1=81=D1=82?= =?UTF-8?q?=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Component/FormComponents.cs | 20 ++---- SecuritySystem/SecuritySystemView/FormMain.cs | 35 +++------- .../Implementer/FormImplementers.cs | 20 ++---- .../SecuritySystemView/Secure/FormSecure.cs | 64 +++++++++---------- .../SecuritySystemView/Secure/FormSecures.cs | 20 ++---- 5 files changed, 60 insertions(+), 99 deletions(-) diff --git a/SecuritySystem/SecuritySystemView/Component/FormComponents.cs b/SecuritySystem/SecuritySystemView/Component/FormComponents.cs index e059195..e81da70 100644 --- a/SecuritySystem/SecuritySystemView/Component/FormComponents.cs +++ b/SecuritySystem/SecuritySystemView/Component/FormComponents.cs @@ -36,27 +36,21 @@ namespace SecuritySystemView } private void ButtonAddComponent_Click(object sender, EventArgs e) { - var service = DependencyManager.Instance.Resolve(); - if (service is FormComponent form) + var form = DependencyManager.Instance.Resolve(); + if (form.ShowDialog() == DialogResult.OK) { - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } + LoadData(); } } private void ButtonEditComponent_Click(object sender, EventArgs e) { if (dataGridViewComponents.SelectedRows.Count == 1) { - var service = DependencyManager.Instance.Resolve(); - if (service is FormComponent form) + var form = DependencyManager.Instance.Resolve(); + form.Id = Convert.ToInt32(dataGridViewComponents.SelectedRows[0].Cells["Id"].Value); + if (form.ShowDialog() == DialogResult.OK) { - form.Id = Convert.ToInt32(dataGridViewComponents.SelectedRows[0].Cells["Id"].Value); - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } + LoadData(); } } } diff --git a/SecuritySystem/SecuritySystemView/FormMain.cs b/SecuritySystem/SecuritySystemView/FormMain.cs index b32ef1f..70b9295 100644 --- a/SecuritySystem/SecuritySystemView/FormMain.cs +++ b/SecuritySystem/SecuritySystemView/FormMain.cs @@ -162,38 +162,26 @@ namespace SecuritySystemView private void ReportComponentsSecuresToolStripMenuItem_Click(object sender, EventArgs e) { - var service = DependencyManager.Instance.Resolve(); - if (service is FormReportSecureComponents form) - { - form.ShowDialog(); - } + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); } private void ReportOrdersToolStripMenuItem_Click(object sender, EventArgs e) { - var service = DependencyManager.Instance.Resolve(); - if (service is FormReportOrders form) - { - form.ShowDialog(); - } + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); } private void ClientsToolStripMenuItem_Click(object sender, EventArgs e) { - var service = DependencyManager.Instance.Resolve(); - if (service is FormClients form) - { - form.ShowDialog(); - } + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); } private void ImplementersToolStripMenuItem_Click(object sender, EventArgs e) { - var service = DependencyManager.Instance.Resolve(); - if (service is FormImplementers form) - { - form.ShowDialog(); - } + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); } private void StartWorksToolStripMenuItem_Click(object sender, EventArgs e) @@ -204,11 +192,8 @@ namespace SecuritySystemView private void MailsToolStripMenuItem_Click(object sender, EventArgs e) { - var service = DependencyManager.Instance.Resolve(); - if (service is FormMails form) - { - form.ShowDialog(); - } + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); } private void создатьБекапToolStripMenuItem_Click(object sender, EventArgs e) diff --git a/SecuritySystem/SecuritySystemView/Implementer/FormImplementers.cs b/SecuritySystem/SecuritySystemView/Implementer/FormImplementers.cs index 01cb14b..abe4828 100644 --- a/SecuritySystem/SecuritySystemView/Implementer/FormImplementers.cs +++ b/SecuritySystem/SecuritySystemView/Implementer/FormImplementers.cs @@ -34,27 +34,21 @@ namespace SecuritySystemView.Implementer } private void ButtonAdd_Click(object sender, EventArgs e) { - var service = DependencyManager.Instance.Resolve(); - if (service is FormImplementer form) + var form = DependencyManager.Instance.Resolve(); + if (form.ShowDialog() == DialogResult.OK) { - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } + LoadData(); } } private void ButtonEdit_Click(object sender, EventArgs e) { if (dataGridView.SelectedRows.Count == 1) { - var service = DependencyManager.Instance.Resolve(); - if (service is FormImplementer form) + var form = DependencyManager.Instance.Resolve(); + form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + if (form.ShowDialog() == DialogResult.OK) { - form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } + LoadData(); } } } diff --git a/SecuritySystem/SecuritySystemView/Secure/FormSecure.cs b/SecuritySystem/SecuritySystemView/Secure/FormSecure.cs index 453e59f..b0a79bd 100644 --- a/SecuritySystem/SecuritySystemView/Secure/FormSecure.cs +++ b/SecuritySystem/SecuritySystemView/Secure/FormSecure.cs @@ -74,49 +74,43 @@ namespace SecuritySystemView } private void ButtonAdd_Click(object sender, EventArgs e) { - var service = DependencyManager.Instance.Resolve(); - if (service is FormSecureComponent form) + var form = DependencyManager.Instance.Resolve(); + if (form.ShowDialog() == DialogResult.OK) { - if (form.ShowDialog() == DialogResult.OK) + if (form.ComponentModel == null) { - if (form.ComponentModel == null) - { - return; - } - _logger.LogInformation("Добавление нового компонента: { ComponentName} - { Count}", form.ComponentModel.ComponentName, form.Count); - if (_secureComponents.ContainsKey(form.Id)) - { - _secureComponents[form.Id] = (form.ComponentModel, - form.Count); - } - else - { - _secureComponents.Add(form.Id, (form.ComponentModel, - form.Count)); - } - LoadData(); + return; } + _logger.LogInformation("Добавление нового компонента: { ComponentName} - { Count}", form.ComponentModel.ComponentName, form.Count); + if (_secureComponents.ContainsKey(form.Id)) + { + _secureComponents[form.Id] = (form.ComponentModel, + form.Count); + } + else + { + _secureComponents.Add(form.Id, (form.ComponentModel, + form.Count)); + } + LoadData(); } } private void ButtonEdit_Click(object sender, EventArgs e) { if (dataGridView.SelectedRows.Count == 1) { - var service = DependencyManager.Instance.Resolve(); - if (service is FormSecureComponent form) + var form = DependencyManager.Instance.Resolve(); + int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value); + form.Id = id; + form.Count = _secureComponents[id].Item2; + if (form.ShowDialog() == DialogResult.OK) { - int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value); - form.Id = id; - form.Count = _secureComponents[id].Item2; - if (form.ShowDialog() == DialogResult.OK) + if (form.ComponentModel == null) { - if (form.ComponentModel == null) - { - return; - } - _logger.LogInformation("Изменение компонента: {ComponentName} - {Count}", form.ComponentModel.ComponentName, form.Count); _secureComponents[form.Id] = (form.ComponentModel, form.Count); - LoadData(); + return; } + _logger.LogInformation("Изменение компонента: {ComponentName} - {Count}", form.ComponentModel.ComponentName, form.Count); _secureComponents[form.Id] = (form.ComponentModel, form.Count); + LoadData(); } } } @@ -148,19 +142,19 @@ namespace SecuritySystemView if (string.IsNullOrEmpty(textBoxName.Text)) { MessageBox.Show("Заполните название", "Ошибка", - MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBoxButtons.OK, MessageBoxIcon.Error); return; } if (string.IsNullOrEmpty(textBoxPrice.Text)) { MessageBox.Show("Заполните цену", "Ошибка", MessageBoxButtons.OK, - MessageBoxIcon.Error); + MessageBoxIcon.Error); return; } if (_secureComponents == null || _secureComponents.Count == 0) { - MessageBox.Show("Заполните компоненты", "Ошибка", - MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show("Заполните компоненты", "Ошибка", + MessageBoxButtons.OK, MessageBoxIcon.Error); return; } _logger.LogInformation("Сохранение изделия"); diff --git a/SecuritySystem/SecuritySystemView/Secure/FormSecures.cs b/SecuritySystem/SecuritySystemView/Secure/FormSecures.cs index f5b8add..e75e94c 100644 --- a/SecuritySystem/SecuritySystemView/Secure/FormSecures.cs +++ b/SecuritySystem/SecuritySystemView/Secure/FormSecures.cs @@ -35,27 +35,21 @@ namespace SecuritySystemView } private void ButtonAddSecure_Click(object sender, EventArgs e) { - var service = DependencyManager.Instance.Resolve(); - if (service is FormSecure form) + var form = DependencyManager.Instance.Resolve(); + if (form.ShowDialog() == DialogResult.OK) { - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } + LoadData(); } } private void ButtonEditSecure_Click(object sender, EventArgs e) { if (dataGridView.SelectedRows.Count == 1) { - var service = DependencyManager.Instance.Resolve(); - if (service is FormSecure form) + var form = DependencyManager.Instance.Resolve(); + form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + if (form.ShowDialog() == DialogResult.OK) { - form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } + LoadData(); } } } -- 2.25.1 From 1147f65ab6e93157949e2902e8f8e4872dad8559 Mon Sep 17 00:00:00 2001 From: "ns.potapov" Date: Sun, 19 May 2024 22:06:37 +0400 Subject: [PATCH 10/13] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20=D0=B7?= =?UTF-8?q?=D0=B0=D0=B2=D0=B8=D1=81=D0=B8=D0=BC=D0=BE=D1=81=D1=82=D0=B8=20?= =?UTF-8?q?Storage=20=D0=B8=D0=B7=20Program.cs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SecuritySystem/SecuritySystemView/Program.cs | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/SecuritySystem/SecuritySystemView/Program.cs b/SecuritySystem/SecuritySystemView/Program.cs index 1edc7ed..72533be 100644 --- a/SecuritySystem/SecuritySystemView/Program.cs +++ b/SecuritySystem/SecuritySystemView/Program.cs @@ -62,14 +62,7 @@ namespace SecuritySystemView option.SetMinimumLevel(LogLevel.Information); option.AddNLog("nlog.config"); }); - DependencyManager.Instance.RegisterType(); - DependencyManager.Instance.RegisterType(); - DependencyManager.Instance.RegisterType(); - DependencyManager.Instance.RegisterType(); - DependencyManager.Instance.RegisterType(); - DependencyManager.Instance.RegisterType(); - DependencyManager.Instance.RegisterType(); - + DependencyManager.Instance.RegisterType(); DependencyManager.Instance.RegisterType(); DependencyManager.Instance.RegisterType(); -- 2.25.1 From 7393382dd8b7e5ee450430eb86d865ecc121269e Mon Sep 17 00:00:00 2001 From: "ns.potapov" Date: Sun, 19 May 2024 22:11:10 +0400 Subject: [PATCH 11/13] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20using=20?= =?UTF-8?q?=D0=B8=D0=B7=20Program.cs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SecuritySystem/SecuritySystemView/Program.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/SecuritySystem/SecuritySystemView/Program.cs b/SecuritySystem/SecuritySystemView/Program.cs index 72533be..5c6be5d 100644 --- a/SecuritySystem/SecuritySystemView/Program.cs +++ b/SecuritySystem/SecuritySystemView/Program.cs @@ -8,8 +8,6 @@ using SecuritySystemBusinessLogic.OfficePackage.Implements; using SecuritySystemContracts.BindingModels; using SecuritySystemContracts.BusinessLogicsContracts; using SecuritySystemContracts.DI; -using SecuritySystemContracts.StoragesContracts; -using SecuritySystemDatabaseImplement.Implements; using SecuritySystemView.Client; using SecuritySystemView.Implementer; using SecuritySystemView.Mail; -- 2.25.1 From 56b1ae730c0b29face85e53a0931bee35faabc7a Mon Sep 17 00:00:00 2001 From: "ns.potapov" Date: Sun, 19 May 2024 22:25:15 +0400 Subject: [PATCH 12/13] =?UTF-8?q?=D0=A0=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BB=20Unity=20DI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DI/UnityDependencyContainer.cs | 38 +++++++++++++++++++ .../SecuritySystemContracts.csproj | 2 + .../Models/Order.cs | 2 +- 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 SecuritySystem/SecuritySystemContracts/DI/UnityDependencyContainer.cs diff --git a/SecuritySystem/SecuritySystemContracts/DI/UnityDependencyContainer.cs b/SecuritySystem/SecuritySystemContracts/DI/UnityDependencyContainer.cs new file mode 100644 index 0000000..556c3e7 --- /dev/null +++ b/SecuritySystem/SecuritySystemContracts/DI/UnityDependencyContainer.cs @@ -0,0 +1,38 @@ + +using Microsoft.Extensions.Logging; +using Unity; +using Unity.Microsoft.Logging; + +namespace SecuritySystemContracts.DI +{ + public class UnityDependencyContainer : IDependencyContainer + { + private readonly IUnityContainer _container; + + public UnityDependencyContainer() + { + _container = new UnityContainer(); + } + + public void AddLogging(Action configure) + { + var factory = LoggerFactory.Create(configure); + _container.AddExtension(new LoggingExtension(factory)); + } + + public void RegisterType(bool isSingle) where U : class, T where T : class + { + _container.RegisterType(isSingle ? TypeLifetime.Singleton : TypeLifetime.Transient); + } + + public void RegisterType(bool isSingle) where T : class + { + _container.RegisterType(isSingle ? TypeLifetime.Singleton : TypeLifetime.Transient); + } + + public T Resolve() + { + return _container.Resolve(); + } + } +} diff --git a/SecuritySystem/SecuritySystemContracts/SecuritySystemContracts.csproj b/SecuritySystem/SecuritySystemContracts/SecuritySystemContracts.csproj index c3a3957..4c2843a 100644 --- a/SecuritySystem/SecuritySystemContracts/SecuritySystemContracts.csproj +++ b/SecuritySystem/SecuritySystemContracts/SecuritySystemContracts.csproj @@ -9,6 +9,8 @@ + + diff --git a/SecuritySystem/SecuritySystemFileImplement/Models/Order.cs b/SecuritySystem/SecuritySystemFileImplement/Models/Order.cs index 1c7ebe2..a7a70f8 100644 --- a/SecuritySystem/SecuritySystemFileImplement/Models/Order.cs +++ b/SecuritySystem/SecuritySystemFileImplement/Models/Order.cs @@ -63,7 +63,7 @@ namespace SecuritySystemFileImplement.Models Status = (OrderStatus)Enum.Parse(typeof(OrderStatus), element.Element("Status")!.Value), DateCreate = Convert.ToDateTime(element.Element("DateCreate")!.Value), DateImplement = string.IsNullOrEmpty(element.Element("DateImplement")!.Value) ? null : Convert.ToDateTime(element.Element("DateImplement")!.Value), - ImplementerId = Convert.ToInt32(element.Element("ImplementerId")!.Value), + ImplementerId = string.IsNullOrEmpty(element.Element("ImplementerId")!.Value) ? null : Convert.ToInt32(element.Element("ImplementerId")!.Value), }; } -- 2.25.1 From ffcd5fcef8a4a08a98adc56bc8552ede4e2c7306 Mon Sep 17 00:00:00 2001 From: "ns.potapov" Date: Sun, 19 May 2024 22:36:14 +0400 Subject: [PATCH 13/13] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B8=20?= =?UTF-8?q?=D0=BD=D0=B0=20null=20=D0=B2=20=D1=84=D0=B0=D0=B9=D0=BB=D0=BE?= =?UTF-8?q?=D0=B2=D1=8B=D0=B5=20=D1=80=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7=D0=B0?= =?UTF-8?q?=D1=86=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SecuritySystemFileImplement/Models/MessageInfo.cs | 3 ++- SecuritySystem/SecuritySystemFileImplement/Models/Order.cs | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/SecuritySystem/SecuritySystemFileImplement/Models/MessageInfo.cs b/SecuritySystem/SecuritySystemFileImplement/Models/MessageInfo.cs index e4260a9..c5d6b40 100644 --- a/SecuritySystem/SecuritySystemFileImplement/Models/MessageInfo.cs +++ b/SecuritySystem/SecuritySystemFileImplement/Models/MessageInfo.cs @@ -48,7 +48,8 @@ namespace SecuritySystemFileImplement.Models return new MessageInfo() { MessageId = element.Attribute("MessageId")!.Value, - ClientId = Convert.ToInt32(element.Element("ClientId")!.Value), + ClientId = string.IsNullOrEmpty(element.Element("ClientId")!.Value) ? + null : Convert.ToInt32(element.Element("ClientId")!.Value), SenderName = element.Element("SenderName")!.Value, DateDelivery = Convert.ToDateTime(element.Element("DateDelivery")!.Value), Subject = element.Element("Subject")!.Value, diff --git a/SecuritySystem/SecuritySystemFileImplement/Models/Order.cs b/SecuritySystem/SecuritySystemFileImplement/Models/Order.cs index a7a70f8..b32146c 100644 --- a/SecuritySystem/SecuritySystemFileImplement/Models/Order.cs +++ b/SecuritySystem/SecuritySystemFileImplement/Models/Order.cs @@ -62,8 +62,10 @@ namespace SecuritySystemFileImplement.Models Count = Convert.ToInt32(element.Element("Count")!.Value), Status = (OrderStatus)Enum.Parse(typeof(OrderStatus), element.Element("Status")!.Value), DateCreate = Convert.ToDateTime(element.Element("DateCreate")!.Value), - DateImplement = string.IsNullOrEmpty(element.Element("DateImplement")!.Value) ? null : Convert.ToDateTime(element.Element("DateImplement")!.Value), - ImplementerId = string.IsNullOrEmpty(element.Element("ImplementerId")!.Value) ? null : Convert.ToInt32(element.Element("ImplementerId")!.Value), + DateImplement = string.IsNullOrEmpty(element.Element("DateImplement")!.Value) ? + null : Convert.ToDateTime(element.Element("DateImplement")!.Value), + ImplementerId = string.IsNullOrEmpty(element.Element("ImplementerId")!.Value) ? + null : Convert.ToInt32(element.Element("ImplementerId")!.Value), }; } -- 2.25.1