From 0674b108dfddfded4f1baa2f51d0f45f27d3078f Mon Sep 17 00:00:00 2001 From: yubaolee Date: Thu, 3 Dec 2015 23:39:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96AutoMapper=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Infrastructure/AutoMapperExt.cs | 63 ++++++++++++++++++++++-- OpenAuth.App/LoginApp.cs | 9 ++-- OpenAuth.App/ViewModel/LoginUserVM.cs | 69 +++++++++++++-------------- OpenAuth.App/ViewModel/ModuleView.cs | 18 ++++--- OpenAuth.App/ViewModel/RoleVM.cs | 4 +- OpenAuth.App/ViewModel/UserView.cs | 4 +- OpenAuth.Mvc/Views/Home/Index.cshtml | 2 +- OpenAuth.UnitTest/TestLogin.cs | 63 +++++++++++++----------- 8 files changed, 146 insertions(+), 86 deletions(-) diff --git a/Infrastructure/AutoMapperExt.cs b/Infrastructure/AutoMapperExt.cs index 7a1f4b22..b0d99bf6 100644 --- a/Infrastructure/AutoMapperExt.cs +++ b/Infrastructure/AutoMapperExt.cs @@ -13,15 +13,68 @@ // *********************************************************************** using AutoMapper; +using System.Collections; +using System.Collections.Generic; +using System.Data; namespace Infrastructure { - public class AutoMapperExt + public static class AutoMapperExt { - public static TResult ConvertTo(T source) + /// + /// 类型映射 + /// + public static T MapTo(this object obj) { - var mapper = Mapper.CreateMap(); - return Mapper.Map(source); + if (obj == null) return default(T); + Mapper.CreateMap(obj.GetType(), typeof(T)); + return Mapper.Map(obj); + } + + /// + /// 集合列表类型映射 + /// + public static List MapToList(this IEnumerable source) + { + foreach (var first in source) + { + var type = first.GetType(); + Mapper.CreateMap(type, typeof(TDestination)); + break; + } + return Mapper.Map>(source); + } + + /// + /// 集合列表类型映射 + /// + public static List MapToList(this IEnumerable source) + { + //IEnumerable 类型需要创建元素的映射 + Mapper.CreateMap(); + return Mapper.Map>(source); + } + + /// + /// 类型映射 + /// + public static TDestination MapTo(this TSource source, TDestination destination) + where TSource : class + where TDestination : class + { + if (source == null) return destination; + Mapper.CreateMap(); + return Mapper.Map(source, destination); + } + + /// + /// DataReader映射 + /// + public static IEnumerable DataReaderMapTo(this IDataReader reader) + { + Mapper.Reset(); + Mapper.CreateMap>(); + return Mapper.Map>(reader); } } -} +} \ No newline at end of file diff --git a/OpenAuth.App/LoginApp.cs b/OpenAuth.App/LoginApp.cs index 0d742f7c..e4b654eb 100644 --- a/OpenAuth.App/LoginApp.cs +++ b/OpenAuth.App/LoginApp.cs @@ -14,14 +14,17 @@ namespace OpenAuth.App private IUserRepository _repository; private IModuleRepository _moduleRepository; private IRelevanceRepository _relevanceRepository; + private IRepository _moduleElementRepository; public LoginApp(IUserRepository repository, IModuleRepository moduleRepository, - IRelevanceRepository relevanceRepository) + IRelevanceRepository relevanceRepository, + IRepository moduleElementRepository ) { _repository = repository; _moduleRepository = moduleRepository; _relevanceRepository = relevanceRepository; + _moduleElementRepository = moduleElementRepository; } public LoginUserVM Login(string userName, string password) @@ -48,7 +51,7 @@ namespace OpenAuth.App (u.FirstId == user.Id && u.Key == "UserModule") || (u.Key == "RoleModule" && userRoleIds.Contains(u.FirstId))).Select(u =>u.SecondId).ToList(); //óûӵеģ - loginVM.Modules = _moduleRepository.Find(u => moduleIds.Contains(u.Id)).ToList(); + loginVM.Modules = _moduleRepository.Find(u => moduleIds.Contains(u.Id)).MapToList(); return loginVM; } @@ -65,7 +68,7 @@ namespace OpenAuth.App Name = "˺" } }; - loginUser.Modules = _moduleRepository.Find(null).ToList(); + loginUser.Modules = _moduleRepository.Find(null).MapToList(); return loginUser; } } diff --git a/OpenAuth.App/ViewModel/LoginUserVM.cs b/OpenAuth.App/ViewModel/LoginUserVM.cs index 424cb516..b8ea1a7c 100644 --- a/OpenAuth.App/ViewModel/LoginUserVM.cs +++ b/OpenAuth.App/ViewModel/LoginUserVM.cs @@ -1,37 +1,32 @@ -// *********************************************************************** -// Assembly : OpenAuth.App -// Author : Yubao Li -// Created : 12-01-2015 -// -// Last Modified By : Yubao Li -// Last Modified On : 12-01-2015 -// *********************************************************************** -// -// Copyright (c) . All rights reserved. -// -// 登陆视图模型 -// *********************************************************************** - -using System.Collections.Generic; -using OpenAuth.Domain; - -namespace OpenAuth.App.ViewModel -{ - /// - /// 登陆用户视图模型 - /// - public class LoginUserVM - { - public User User { get; set; } - /// - /// 用户可以访问到的模块（包括所属角色与自己的所有模块） - /// - public List Modules { get; set; } - - /// - /// 用户可以访问到的模块中的元素 - /// - public List ModuleElements { get; set; } - } - -} +// *********************************************************************** +// Assembly : OpenAuth.App +// Author : Yubao Li +// Created : 12-01-2015 +// +// Last Modified By : Yubao Li +// Last Modified On : 12-01-2015 +// *********************************************************************** +// +// Copyright (c) . All rights reserved. +// +// 登陆视图模型 +// *********************************************************************** + +using System.Collections.Generic; +using OpenAuth.Domain; + +namespace OpenAuth.App.ViewModel +{ + /// + /// 登陆用户视图模型 + /// + public class LoginUserVM + { + public User User { get; set; } + /// + /// 用户可以访问到的模块（包括所属角色与自己的所有模块） + /// + public List Modules { get; set; } + } + +} diff --git a/OpenAuth.App/ViewModel/ModuleView.cs b/OpenAuth.App/ViewModel/ModuleView.cs index 8d38504b..b2aeada5 100644 --- a/OpenAuth.App/ViewModel/ModuleView.cs +++ b/OpenAuth.App/ViewModel/ModuleView.cs @@ -1,6 +1,6 @@ -using System.Collections.Generic; -using Infrastructure; +using Infrastructure; using OpenAuth.Domain; +using System.Collections.Generic; namespace OpenAuth.App.ViewModel { @@ -39,17 +39,21 @@ namespace OpenAuth.App.ViewModel /// /// 子节点 /// - public List Childern = new List(); + public List Childern = new List(); + + /// + /// 模块中的元素 + /// + public List Elements = new List(); public static implicit operator ModuleView(Module module) { - return AutoMapperExt.ConvertTo(module); + return module.MapTo(); } public static implicit operator Module(ModuleView view) { - return AutoMapperExt.ConvertTo(view); + return view.MapTo(); } - } -} +} \ No newline at end of file diff --git a/OpenAuth.App/ViewModel/RoleVM.cs b/OpenAuth.App/ViewModel/RoleVM.cs index 00abee63..69168606 100644 --- a/OpenAuth.App/ViewModel/RoleVM.cs +++ b/OpenAuth.App/ViewModel/RoleVM.cs @@ -52,12 +52,12 @@ namespace OpenAuth.App.ViewModel public static implicit operator RoleVM(Role role) { - return AutoMapperExt.ConvertTo(role); + return role.MapTo(); } public static implicit operator Role(RoleVM rolevm) { - return AutoMapperExt.ConvertTo(rolevm); + return rolevm.MapTo(); } } diff --git a/OpenAuth.App/ViewModel/UserView.cs b/OpenAuth.App/ViewModel/UserView.cs index 95446851..38427ee1 100644 --- a/OpenAuth.App/ViewModel/UserView.cs +++ b/OpenAuth.App/ViewModel/UserView.cs @@ -71,12 +71,12 @@ namespace OpenAuth.App.ViewModel public static implicit operator UserView(User user) { - return AutoMapperExt.ConvertTo(user); + return user.MapTo(); } public static implicit operator User(UserView view) { - return AutoMapperExt.ConvertTo(view); + return view.MapTo(); } } } diff --git a/OpenAuth.Mvc/Views/Home/Index.cshtml b/OpenAuth.Mvc/Views/Home/Index.cshtml index 3f1dab32..432407cc 100644 --- a/OpenAuth.Mvc/Views/Home/Index.cshtml +++ b/OpenAuth.Mvc/Views/Home/Index.cshtml @@ -1,4 +1,4 @@ -@model List +@model List diff --git a/OpenAuth.UnitTest/TestLogin.cs b/OpenAuth.UnitTest/TestLogin.cs index 037f8593..156ad048 100644 --- a/OpenAuth.UnitTest/TestLogin.cs +++ b/OpenAuth.UnitTest/TestLogin.cs @@ -1,29 +1,34 @@ -using System; -using System.Text; -using System.Collections.Generic; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using OpenAuth.App; -using OpenAuth.Repository; - -namespace OpenAuth.UnitTest -{ - /// - /// TestLogin 的摘要说明 - /// - [TestClass] - public class TestLogin - { - - - [TestMethod] - public void Test() - { - var login = new LoginApp(new UserRepository(), new ModuleRepository(), new RelevanceRepository()); - var user = login.Login("admin", "admin"); - foreach (var module in user.Modules) - { - Console.WriteLine(module.Id +"\t" + module.Name); - } - } - } -} +using System; +using System.Text; +using System.Collections.Generic; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using OpenAuth.App; +using OpenAuth.Domain; +using OpenAuth.Repository; + +namespace OpenAuth.UnitTest +{ + /// + /// TestLogin 的摘要说明 + /// + [TestClass] + public class TestLogin + { + + + [TestMethod] + public void Test() + { + var login = new LoginApp(new UserRepository(), + new ModuleRepository(), + new RelevanceRepository(), + new BaseRepository() + ); + var user = login.Login("admin", "admin"); + foreach (var module in user.Modules) + { + Console.WriteLine(module.Id +"\t" + module.Name); + } + } + } +}