diff --git a/langguanApi.xml b/langguanApi.xml index 3728563..a154069 100644 --- a/langguanApi.xml +++ b/langguanApi.xml @@ -341,13 +341,6 @@ - - - 新增用户 - - - - 获取用户列表 @@ -362,13 +355,7 @@ - - - 修改用户信息 - - - - + 删除用户 @@ -1098,6 +1085,11 @@ 邮箱 + + + 手机号 + + 更新用户DTO @@ -1709,6 +1701,14 @@ + + + 分页取数据 + + + + + 新加 @@ -2183,13 +2183,6 @@ - - - 新增用户 - - 新增用户dto - - 获取用户列表 diff --git a/langguanApi/Controllers/UserController.cs b/langguanApi/Controllers/UserController.cs index 5dc9ba2..ca4622f 100644 --- a/langguanApi/Controllers/UserController.cs +++ b/langguanApi/Controllers/UserController.cs @@ -58,29 +58,17 @@ namespace langguanApi.Controllers } #region 用户管理相关接口 - /// - ///新增用户 - /// - /// - /// - [HttpPost("AddUser")] - public async Task AddUser([FromBody] UserDto input) - { - var result = await _userService.AddUser(input); - return Ok(result); - } - //获取用户列表 - /// - /// 获取用户列表 - /// - /// - /// - [HttpGet("GetUserList")] - public async Task GetUserList([FromQuery] UserQueryDto input) - { - var result = await _userService.GetUserList(input); - return Ok(result); - } + ///// + ///// 获取用户列表 + ///// + ///// + ///// + //[HttpGet("GetUserList")] + //public async Task GetUserList([FromQuery] UserQueryDto input) + //{ + // var result = await _userService.GetUserList(input); + // return Ok(result); + //} //根据用户Id获取用户信息 /// /// 根据用户Id获取用户信息 @@ -93,8 +81,6 @@ namespace langguanApi.Controllers var result = await _userService.GetUserById(userId); return Ok(result); } - //修改用户信息 - /// /// 修改用户信息 /// /// diff --git a/langguanApi/Model/Entity/UserEntity.cs b/langguanApi/Model/Entity/UserEntity.cs index 5077f18..c37d11c 100644 --- a/langguanApi/Model/Entity/UserEntity.cs +++ b/langguanApi/Model/Entity/UserEntity.cs @@ -51,16 +51,24 @@ namespace langguanApi.Model.Entity /// 邮箱 /// public string Email { get; set; } + /// + /// 手机号 + /// + public string Phone { get; set; } } /// /// 更新用户DTO /// - public class UpdateDto:AddDto + public class UpdateDto : AddDto { /// /// 用户id /// public string Id { get; set; } } + public class UserViewModel : UserEntity + { + public string RoleName { get; set; } + } } diff --git a/langguanApi/Service/BaseService.cs b/langguanApi/Service/BaseService.cs index a502ab3..bae2756 100644 --- a/langguanApi/Service/BaseService.cs +++ b/langguanApi/Service/BaseService.cs @@ -224,5 +224,20 @@ namespace langguanApi.Service data = new { total, items } }; } + /// + /// 分页取数据 + /// + /// + /// + /// + public async Task>> GetListByPage(ReqPaing req, Expression> exp = null) + { + req.pageSize = req.pageSize == 0 ? 10 : req.pageSize; + var query = await GetListWithExp(exp); + var total = query.Count(); + var items = query.OrderByDescending(s => s.CreateDateTime) + .Skip(req.pageSize * (req.current - 1)).Take(req.pageSize).ToList(); + return new Tuple>(total, items); + } } } diff --git a/langguanApi/Service/UserService.cs b/langguanApi/Service/UserService.cs index 8d5ca4e..606448b 100644 --- a/langguanApi/Service/UserService.cs +++ b/langguanApi/Service/UserService.cs @@ -82,11 +82,20 @@ namespace langguanApi.Service { exp = filter => filter.Username.Contains(input.key) || filter.Phone.Contains(input.key) || filter.Email.Contains(input.key); } - return await base.GetPager(new ReqPaing() + List views = new List(); + var result = await base.GetListByPage(input, exp); + var UserRoleList = await _roleService.GetRoleListByIds(result.Item2.Select(s => s.RoleId).ToList()); + foreach (var item in result.Item2) { - pageSize = input.pageSize, - current = input.current - }, exp); + var view = item.Adapt(); + view.RoleName = UserRoleList.FirstOrDefault(s => s.Id == item.RoleId)?.RoleName; + views.Add(view); + } + return new ApiResult() + { + code = 0, + data = new { total = result.Item1, items = views } + }; } #region 用户管理 @@ -102,63 +111,6 @@ namespace langguanApi.Service return await base.Exist(exp); } /// - ///新增用户 - /// - /// 新增用户dto - /// - public async Task AddUser(UserDto input) - { - try - { - #region 校验参数 - if (string.IsNullOrEmpty(input.Username)) - { - return new ApiResult { code = 1, msg = "用户名非空" }; - } - if (string.IsNullOrEmpty(input.Tel)) - { - return new ApiResult { code = 1, msg = "手机号非空" }; - } - if (string.IsNullOrEmpty(input.Email)) - { - return new ApiResult { code = 1, msg = "邮箱非空" }; - } - if (string.IsNullOrEmpty(input.RoleId)) - { - return new ApiResult { code = 1, msg = "角色不能为空" }; - } - #endregion - #region 组织数据 - var entity = input.Adapt(); - entity.Phone = input.Tel; - if (!string.IsNullOrEmpty(input.Password)) - { - entity.Password = StringHelper.MD5Encrypt32(input.Password); - } - #endregion - #region 保存数据 - if (entity != null && string.IsNullOrEmpty(entity.Id)) - { - await base.CreateAsync(entity); - } - #endregion - } - catch (Exception ex) - { - _logger.LogError($"新增用户出现异常,请求参数：user:{Newtonsoft.Json.JsonConvert.SerializeObject(input)}," + - $"请求接口：'api/User/AddUser'，" + - $"异常信息：{ex.Message}," + - $"异常位置:{ex.StackTrace}" - ); - return new ApiResult { code = 1, msg = "保存用户信息失败" }; - } - finally - { - _logger.LogInformation($"新增用户参数：user:{Newtonsoft.Json.JsonConvert.SerializeObject(input)}"); - } - return new ApiResult { code = 0, msg = "保存用户信息成功" }; - } - /// /// 获取用户列表 /// /// @@ -172,7 +124,7 @@ namespace langguanApi.Service Expression> exp = filter => filter.IsDelete == false; if (!string.IsNullOrEmpty(input.key)) { - exp = filter => filter.Username.Contains(input.key)|| filter.Phone.Contains(input.key)|| filter.Email.Contains(input.key); + exp = filter => filter.Username.Contains(input.key) || filter.Phone.Contains(input.key) || filter.Email.Contains(input.key); } #endregion #region 获取数据 @@ -215,7 +167,7 @@ namespace langguanApi.Service { _logger.LogInformation($"获取用户列表参数：userQuery:{Newtonsoft.Json.JsonConvert.SerializeObject(input)}"); } - return new ApiResult { code = 0, data = list,msg="获取信息成功" }; + return new ApiResult { code = 0, data = list, msg = "获取信息成功" }; } ///