From e8f9434a92782bea47c73b7f046dfdca428fb76f Mon Sep 17 00:00:00 2001 From: kotcheshir73 Date: Sun, 28 Mar 2021 19:24:53 +0400 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=D0=B8=20=D0=B0?= =?UTF-8?q?=D1=81=D0=B1=D1=82=D1=80=D0=B0=D0=BA=D0=BD=D0=BD=D1=8B=D0=B5=20?= =?UTF-8?q?=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=D1=8B=20=D0=B2=20=D0=B1=D0=B8?= =?UTF-8?q?=D0=B7=D0=BD=D0=B5=D1=81=D0=BB=D0=BE=D0=B3=D0=B8=D0=BA=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessLogics/BusinessLogicCore.cs | 22 ++++--------------- .../BusinessLogics/AccessBusinessLogic.cs | 5 ----- .../EnviromentSettingBusinessLogic.cs | 5 ----- .../BusinessLogics/RoleBusinessLogic.cs | 5 ----- .../BusinessLogics/UserBusinessLogic.cs | 5 ----- 5 files changed, 4 insertions(+), 38 deletions(-) diff --git a/DepartmentPortal/Common/ModuleTools/BusinessLogics/BusinessLogicCore.cs b/DepartmentPortal/Common/ModuleTools/BusinessLogics/BusinessLogicCore.cs index b961277..2869fd7 100644 --- a/DepartmentPortal/Common/ModuleTools/BusinessLogics/BusinessLogicCore.cs +++ b/DepartmentPortal/Common/ModuleTools/BusinessLogics/BusinessLogicCore.cs @@ -81,7 +81,7 @@ namespace ModuleTools.BusinessLogics return null; } - return ConvertToL(result); + return result.Result as L; } catch (Exception ex) { @@ -110,7 +110,7 @@ namespace ModuleTools.BusinessLogics Errors.AddRange(Errors); return null; } - return ConvertToE(result); + return result.Result as E; } catch (Exception ex) { @@ -140,7 +140,7 @@ namespace ModuleTools.BusinessLogics return null; } - return ConvertToE(result); + return result.Result as E; } catch (Exception ex) { @@ -170,7 +170,7 @@ namespace ModuleTools.BusinessLogics return null; } - return ConvertToE(result); + return result.Result as E; } catch (Exception ex) { @@ -208,19 +208,5 @@ namespace ModuleTools.BusinessLogics } return false; } - - /// - /// Получить список элементов - /// - /// - /// - protected abstract L ConvertToL(OperationResultModel model); - - /// - /// Получить элемент - /// - /// - /// - protected abstract E ConvertToE(OperationResultModel model); } } \ No newline at end of file diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/AccessBusinessLogic.cs b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/AccessBusinessLogic.cs index 70ad08a..5089123 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/AccessBusinessLogic.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/AccessBusinessLogic.cs @@ -1,6 +1,5 @@ using ModuleTools.BusinessLogics; using ModuleTools.Enums; -using ModuleTools.Models; using SecurityBusinessLogic.BindingModels; using SecurityBusinessLogic.Interfaces; using SecurityBusinessLogic.ViewModels; @@ -13,9 +12,5 @@ namespace SecurityBusinessLogic.BusinessLogics public class AccessBusinessLogic : BusinessLogicCore { public AccessBusinessLogic(IAccessService service) : base(service, "Доступы", AccessOperation.Доступы) { } - - protected override AccessViewModel ConvertToE(OperationResultModel model) => model.Result as AccessViewModel; - - protected override AccessListViewModel ConvertToL(OperationResultModel model) => model.Result as AccessListViewModel; } } \ No newline at end of file diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/EnviromentSettingBusinessLogic.cs b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/EnviromentSettingBusinessLogic.cs index 6efa781..f8dcf45 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/EnviromentSettingBusinessLogic.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/EnviromentSettingBusinessLogic.cs @@ -1,6 +1,5 @@ using ModuleTools.BusinessLogics; using ModuleTools.Enums; -using ModuleTools.Models; using SecurityBusinessLogic.BindingModels; using SecurityBusinessLogic.Interfaces; using SecurityBusinessLogic.ViewModels; @@ -14,9 +13,5 @@ namespace SecurityBusinessLogic.BusinessLogics EnviromentSettingListViewModel, EnviromentSettingViewModel> { public EnviromentSettingBusinessLogic(IEnviromentSettingService service) : base(service, "Настройки Среды", AccessOperation.НастройкиСреды) { } - - protected override EnviromentSettingViewModel ConvertToE(OperationResultModel model) => model.Result as EnviromentSettingViewModel; - - protected override EnviromentSettingListViewModel ConvertToL(OperationResultModel model) => model.Result as EnviromentSettingListViewModel; } } \ No newline at end of file diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/RoleBusinessLogic.cs b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/RoleBusinessLogic.cs index 926d10d..9cf2323 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/RoleBusinessLogic.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/RoleBusinessLogic.cs @@ -1,6 +1,5 @@ using ModuleTools.BusinessLogics; using ModuleTools.Enums; -using ModuleTools.Models; using SecurityBusinessLogic.BindingModels; using SecurityBusinessLogic.Interfaces; using SecurityBusinessLogic.ViewModels; @@ -13,9 +12,5 @@ namespace SecurityBusinessLogic.BusinessLogics public class RoleBusinessLogic : BusinessLogicCore { public RoleBusinessLogic(IRoleService service) : base(service, "Роли", AccessOperation.Роли) { } - - protected override RoleViewModel ConvertToE(OperationResultModel model) => model.Result as RoleViewModel; - - protected override RoleListViewModel ConvertToL(OperationResultModel model) => model.Result as RoleListViewModel; } } \ No newline at end of file diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/UserBusinessLogic.cs b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/UserBusinessLogic.cs index 7f49456..17b5f6f 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/UserBusinessLogic.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/UserBusinessLogic.cs @@ -1,6 +1,5 @@ using ModuleTools.BusinessLogics; using ModuleTools.Enums; -using ModuleTools.Models; using SecurityBusinessLogic.BindingModels; using SecurityBusinessLogic.Interfaces; using SecurityBusinessLogic.ViewModels; @@ -13,9 +12,5 @@ namespace SecurityBusinessLogic.BusinessLogics public class UserBusinessLogic : BusinessLogicCore { public UserBusinessLogic(IUserService service) : base(service, "Пользователи", AccessOperation.Пользователи) { } - - protected override UserViewModel ConvertToE(OperationResultModel model) => model.Result as UserViewModel; - - protected override UserListViewModel ConvertToL(OperationResultModel model) => model.Result as UserListViewModel; } } \ No newline at end of file