eegov/DepartmentProject
1
1
Fork 0
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

убрали необходимость мапить поля с одинаковым именем

Browse Source
This commit is contained in:
kotcheshir73 2022-03-18 12:57:40 +04:00
parent 9b066d5c25
commit 6e2e10aa14
13 changed files with 28 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DepartmentPortal/Common/DatabaseCore/Models/Security/Access.cs
View File

@ -1,5 +1,4 @@
using CoreModels.ModelsSecurity;
using ModuleTools.Attributes;
using ModuleTools.Enums;
using ModuleTools.Interfaces;
using System;
@ -13,17 +12,14 @@ namespace DatabaseCore.Models.Security
{
[DataMember]
[Required]
[MapConfiguration("RoleId")]
public Guid RoleId { get; set; }
[DataMember]
[Required]
[MapConfiguration("AccessOperation")]
public AccessOperation AccessOperation { get; set; }
[DataMember]
[Required]
[MapConfiguration("AccessType")]
public AccessType AccessType { get; set; }
//-------------------------------------------------------------------------

4
DepartmentPortal/Common/DatabaseCore/Models/Security/EnviromentSetting.cs
View File

@ -1,5 +1,4 @@
using CoreModels.ModelsSecurity;
using ModuleTools.Attributes;
using ModuleTools.Interfaces;
using System.ComponentModel.DataAnnotations;
using System.Runtime.Serialization;
@ -11,16 +10,13 @@ namespace DatabaseCore.Models.Security
{
[DataMember]
[Required]
[MapConfiguration("Key")]
public string Key { get; set; }
[DataMember]
[Required]
[MapConfiguration("Value")]
public string Value { get; set; }
[DataMember]
[MapConfiguration("Description")]
public string Description { get; set; }
//-------------------------------------------------------------------------

3
DepartmentPortal/Common/DatabaseCore/Models/Security/Role.cs
View File

@ -1,5 +1,4 @@
using CoreModels.ModelsSecurity;
using ModuleTools.Attributes;
using ModuleTools.Interfaces;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
@ -13,11 +12,9 @@ namespace DatabaseCore.Models.Security
{
[DataMember]
[Required]
[MapConfiguration("RoleName")]
public string RoleName { get; set; }
[DataMember]
[MapConfiguration("RolePriority")]
public int RolePriority { get; set; }
//-------------------------------------------------------------------------

7
DepartmentPortal/Common/DatabaseCore/Models/Security/User.cs
View File

@ -15,32 +15,25 @@ namespace DatabaseCore.Models.Security
{
[DataMember]
[Required]
[MapConfiguration("UserName")]
public string UserName { get; set; }
[DataMember]
[Required]
[MapConfiguration("PasswordHash")]
public string PasswordHash { get; set; }
[DataMember]
[MapConfiguration("Avatar")]
public byte[] Avatar { get; set; }
[DataMember]
[MapConfiguration("DateLastVisit")]
public DateTime? DateLastVisit { get; set; }
[DataMember]
[MapConfiguration("IsBanned")]
public bool IsBanned { get; set; }
[DataMember]
[MapConfiguration("DateBanned")]
public DateTime? DateBanned { get; set; }
[DataMember]
[MapConfiguration("CountAttempt")]
public int CountAttempt { get; set; }
//-------------------------------------------------------------------------

3
DepartmentPortal/Common/DatabaseCore/Models/Security/UserRole.cs
View File

@ -1,5 +1,4 @@
using CoreModels.ModelsSecurity;
using ModuleTools.Attributes;
using ModuleTools.Interfaces;
using System;
using System.Runtime.Serialization;
@ -10,11 +9,9 @@ namespace DatabaseCore.Models.Security
public class UserRole : BaseEntity, IEntitySecurityExtenstion<UserRole>, IUserRoleModel
{
[DataMember]
[MapConfiguration("RoleId")]
public Guid RoleId { get; set; }
[DataMember]
[MapConfiguration("UserId")]
public Guid UserId { get; set; }
//-------------------------------------------------------------------------

14
DepartmentPortal/Common/ModuleTools/BusinessLogics/Mapper.cs
View File

@ -56,10 +56,10 @@ namespace ModuleTools.BusinessLogics
var properties = typeTo.GetProperties();
foreach (var property in properties)
{
object value = obj;
var customAttribute = property.GetCustomAttribute<MapConfigurationAttribute>();
if (customAttribute != null)
{
object value = obj;
if (customAttribute.IsDifficle)
{
var props = customAttribute.PropertyNameFromModel.Split('.');
@ -136,10 +136,6 @@ namespace ModuleTools.BusinessLogics
value = bindingProperty.GetValue(obj);
}
}
if (value is null)
{
continue;
}
if ((haveRigth && !customAttribute.AllowCopyWithoutRigth) || customAttribute.AllowCopyWithoutRigth)
{
if (property.PropertyType.Name.StartsWith("Nullable"))
@ -153,6 +149,14 @@ namespace ModuleTools.BusinessLogics
property.SetValue(newObject, value);
}
}
else
{
var bindingProperty = value.GetType().GetProperty(property.Name);
if (bindingProperty != null)
{
property.SetValue(newObject, bindingProperty.GetValue(value));
}
}
}
return newObject;

4
DepartmentPortal/Security/SecurityBusinessLogic/BindingModels/AccessBindingModels.cs
View File

@ -1,5 +1,4 @@
using CoreModels.ModelsSecurity;
using ModuleTools.Attributes;
using ModuleTools.BindingModels;
using ModuleTools.Enums;
using System;
@ -23,14 +22,11 @@ namespace SecurityBusinessLogic.BindingModels
/// </summary>
public class AccessSetBindingModel : SetBindingModel, IAccessModel
{
[MapConfiguration("RoleId")]
public Guid RoleId { get; set; }
[Required(ErrorMessage = "required")]
[MapConfiguration("AccessOperation")]
public AccessOperation AccessOperation { get; set; }
[MapConfiguration("AccessType")]
public AccessType AccessType { get; set; }
}
}

4
DepartmentPortal/Security/SecurityBusinessLogic/BindingModels/EnviromentSettingBindingModels.cs
View File

@ -1,5 +1,4 @@
using CoreModels.ModelsSecurity;
using ModuleTools.Attributes;
using ModuleTools.BindingModels;
using System.ComponentModel.DataAnnotations;
@ -19,15 +18,12 @@ namespace SecurityBusinessLogic.BindingModels
public class EnviromentSettingSetBindingModel : SetBindingModel, IEnviromentSettingModel
{
[Required(ErrorMessage = "required")]
[MapConfiguration("Key")]
public string Key { get; set; }
[Required(ErrorMessage = "required")]
[MapConfiguration("Value")]
public string Value { get; set; }
[Required(ErrorMessage = "required")]
[MapConfiguration("Description")]
public string Description { get; set; }
}
}

3
DepartmentPortal/Security/SecurityBusinessLogic/BindingModels/RoleBindingModels.cs
View File

@ -1,5 +1,4 @@
using CoreModels.ModelsSecurity;
using ModuleTools.Attributes;
using ModuleTools.BindingModels;
using System.ComponentModel.DataAnnotations;
@ -16,11 +15,9 @@ namespace SecurityBusinessLogic.BindingModels
public class RoleSetBindingModel : SetBindingModel, IRoleModel
{
[Required(ErrorMessage = "required")]
[MapConfiguration("RoleName")]
public string RoleName { get; set; }
[Required(ErrorMessage = "required")]
[MapConfiguration("RolePriority")]
public int RolePriority { get; set; }
}
}

8
DepartmentPortal/Security/SecurityBusinessLogic/BindingModels/UserBindingModels.cs
View File

@ -1,5 +1,4 @@
using CoreModels.ModelsSecurity;
using ModuleTools.Attributes;
using ModuleTools.BindingModels;
using System;
using System.ComponentModel.DataAnnotations;
@ -22,26 +21,19 @@ namespace SecurityBusinessLogic.BindingModels
public class UserSetBindingModel : SetBindingModel, IUserModel
{
[Required(ErrorMessage = "required")]
[MapConfiguration("UserName")]
public string UserName { get; set; }
[Required(ErrorMessage = "required")]
[MapConfiguration("Password")]
public string PasswordHash { get; set; }
[MapConfiguration("Avatar")]
public byte[] Avatar { get; set; }
[MapConfiguration("DateLastVisit")]
public DateTime? DateLastVisit { get; set; }
[MapConfiguration("IsBanned")]
public bool IsBanned { get; set; }
[MapConfiguration("DateBanned")]
public DateTime? DateBanned { get; set; }
[MapConfiguration("CountAttempt")]
public int CountAttempt { get; set; }
}
}

3
DepartmentPortal/Security/SecurityBusinessLogic/BindingModels/UserRoleBindingModels.cs
View File

@ -1,5 +1,4 @@
using CoreModels.ModelsSecurity;
using ModuleTools.Attributes;
using ModuleTools.BindingModels;
using System;
using System.ComponentModel.DataAnnotations;
@ -22,11 +21,9 @@ namespace SecurityBusinessLogic.BindingModels
public class UserRoleSetBindingModel : SetBindingModel, IUserRoleModel
{
[Required(ErrorMessage = "required")]
[MapConfiguration("UserId")]
public Guid UserId { get; set; }
[Required(ErrorMessage = "required")]
[MapConfiguration("RoleId")]
public Guid RoleId { get; set; }
}
}

2
DepartmentPortal/Security/SecurityBusinessLogic/ViewModels/RoleViewModels.cs
View File

@ -22,12 +22,10 @@ namespace SecurityBusinessLogic.ViewModels
{
[ViewModelControlListProperty("Название роли")]
[ViewModelControlElementProperty("Название роли", ControlType.ControlString, MustHaveValue = true)]
[MapConfiguration("RoleName")]
public string RoleName { get; set; }
[ViewModelControlListProperty("Приоритет", ColumnWidth = 100)]
[ViewModelControlElementProperty("Приоритет", ControlType.ControlInt, MustHaveValue = true)]
[MapConfiguration("RolePriority")]
public int RolePriority { get; set; }
}
}

3
DepartmentPortal/Security/SecurityBusinessLogic/ViewModels/UserViewModels.cs
View File

@ -21,18 +21,15 @@ namespace SecurityBusinessLogic.ViewModels
{
[ViewModelControlListProperty("Пользователь")]
[ViewModelControlElementProperty("Логин", ControlType.ControlString, MustHaveValue = true)]
[MapConfiguration("UserName")]
public string UserName { get; set; }
[MapConfiguration("PasswordHash", AllowCopyWithoutRigth = false)]
public string PasswordHash { get; set; }
[ViewModelControlElementProperty("Фото", ControlType.ControlImage, Width = 200, Height = 200)]
[MapConfiguration("Avatar")]
public byte[] Avatar { get; set; }
[ViewModelControlListProperty("Посл. визит", ColumnWidth = 100, DefaultCellStyleFormat = "dd.MM.yyyy")]
[MapConfiguration("DateLastVisit")]
public DateTime? DateLastVisit { get; set; }
[ViewModelControlElementProperty("Заблокирован", ControlType.ControlBool, MustHaveValue = true)]