yanghongwei
/
lg_backend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

管理员列表页加入角色名

This commit is contained in:
yanghongwei 2024-05-30 23:42:06 +08:00
parent 6c9a566784
commit 27732189fd
5 changed files with 64 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
langguanApi.xml
View File

@ -341,13 +341,6 @@
<param name="input"></param>
<returns></returns>
</member>
<member name="M:langguanApi.Controllers.UserController.AddUser(langguanApi.Model.Dto.SystemConfigurationDto.UserDto)">
<summary>
新增用户
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:langguanApi.Controllers.UserController.GetUserList(langguanApi.Model.Dto.SystemConfigurationDto.UserQueryDto)">
<summary>
获取用户列表
@ -362,13 +355,7 @@
<param name="userId"></param>
<returns></returns>
</member>
<member name="M:langguanApi.Controllers.UserController.UpdateUser(langguanApi.Model.Dto.SystemConfigurationDto.UserDto)">
<summary>
修改用户信息
</summary>
<param name="input"></param>
<returns></returns>
</member>
<!-- Badly formed XML comment ignored for member "M:langguanApi.Controllers.UserController.UpdateUser(langguanApi.Model.Dto.SystemConfigurationDto.UserDto)" -->
<member name="M:langguanApi.Controllers.UserController.DeleteUser(System.String)">
<summary>
删除用户
@ -1098,6 +1085,11 @@
邮箱
</summary>
</member>
<member name="P:langguanApi.Model.Entity.AddDto.Phone">
<summary>
手机号
</summary>
</member>
<member name="T:langguanApi.Model.Entity.UpdateDto">
<summary>
更新用户DTO
@ -1709,6 +1701,14 @@
<param name="exp"></param>
<returns></returns>
</member>
<member name="M:langguanApi.Service.BaseService`1.GetListByPage(langguanApi.Model.ReqPaing,System.Linq.Expressions.Expression{System.Func{`0,System.Boolean}})">
<summary>
分页取数据
</summary>
<param name="req"></param>
<param name="exp"></param>
<returns></returns>
</member>
<member name="M:langguanApi.Service.DeviceService.Add(langguanApi.Model.DeviceAddDto)">
<summary>
新加
@ -2183,13 +2183,6 @@
<param name="input"></param>
<returns></returns>
</member>
<member name="M:langguanApi.Service.UserService.AddUser(langguanApi.Model.Dto.SystemConfigurationDto.UserDto)">
<summary>
新增用户
</summary>
<param name="input">新增用户dto</param>
<returns></returns>
</member>
<member name="M:langguanApi.Service.UserService.GetUserList(langguanApi.Model.Dto.SystemConfigurationDto.UserQueryDto)">
<summary>
获取用户列表

36
langguanApi/Controllers/UserController.cs
View File

@ -58,29 +58,17 @@ namespace langguanApi.Controllers
}
#region 用户管理相关接口
/// <summary>
///新增用户
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
[HttpPost("AddUser")]
public async Task<IActionResult> AddUser([FromBody] UserDto input)
{
var result = await _userService.AddUser(input);
return Ok(result);
}
//获取用户列表
/// <summary>
/// 获取用户列表
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
[HttpGet("GetUserList")]
public async Task<IActionResult> GetUserList([FromQuery] UserQueryDto input)
{
var result = await _userService.GetUserList(input);
return Ok(result);
}
///// <summary>
///// 获取用户列表
///// </summary>
///// <param name="input"></param>
///// <returns></returns>
//[HttpGet("GetUserList")]
//public async Task<IActionResult> GetUserList([FromQuery] UserQueryDto input)
//{
// var result = await _userService.GetUserList(input);
// return Ok(result);
//}
//根据用户Id获取用户信息
/// <summary>
/// 根据用户Id获取用户信息
@ -93,8 +81,6 @@ namespace langguanApi.Controllers
var result = await _userService.GetUserById(userId);
return Ok(result);
}
//修改用户信息
/// <summary>
/// 修改用户信息
/// </summary>
/// <param name="input"></param>

10
langguanApi/Model/Entity/UserEntity.cs
View File

@ -51,16 +51,24 @@ namespace langguanApi.Model.Entity
/// 邮箱
/// </summary>
public string Email { get; set; }
/// <summary>
/// 手机号
/// </summary>
public string Phone { get; set; }
}
/// <summary>
/// 更新用户DTO
/// </summary>
public class UpdateDto:AddDto
public class UpdateDto : AddDto
{
/// <summary>
/// 用户id
/// </summary>
public string Id { get; set; }
}
public class UserViewModel : UserEntity
{
public string RoleName { get; set; }
}
}

15
langguanApi/Service/BaseService.cs
View File

@ -224,5 +224,20 @@ namespace langguanApi.Service
data = new { total, items }
};
}
/// <summary>
/// 分页取数据
/// </summary>
/// <param name="req"></param>
/// <param name="exp"></param>
/// <returns></returns>
public async Task<Tuple<long, List<T>>> GetListByPage(ReqPaing req, Expression<Func<T, bool>> 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<long, List<T>>(total, items);
}
}
}

78
langguanApi/Service/UserService.cs
View File

@ -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<UserViewModel> views = new List<UserViewModel>();
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<UserViewModel>();
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);
}
/// <summary>
///新增用户
/// </summary>
/// <param name="input">新增用户dto</param>
/// <returns></returns>
public async Task<ApiResult> 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<UserEntity>();
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 = "保存用户信息成功" };
}
/// <summary>
/// 获取用户列表
/// </summary>
/// <param name="input"></param>
@ -172,7 +124,7 @@ namespace langguanApi.Service
Expression<Func<UserEntity, bool>> 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 = "获取信息成功" };
}
/// <summary>