user groups add page

luoyunchong · May 22, 2024 · faf7466 · faf7466
1 parent 7df7355
commit faf7466
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 27 deletions.
diff --git a/src/LinCms.Application.Contracts/Cms/Groups/CreateGroupDto.cs b/src/LinCms.Application.Contracts/Cms/Groups/CreateGroupDto.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using LinCms.Data;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
 namespace LinCms.Cms.Groups;
@@ -14,4 +15,14 @@ public IEnumerable<ValidationResult> Validate(ValidationContext validationContex
             yield return new ValidationResult("请选择权限", new List<string> { "PermissionIds" });
         }
     }
+}
+
+public class GroupQuery:PageDto
+{
+    public string Name { get; set; }
+
+    /// <summary>
+    /// 权限组描述
+    /// </summary>
+    public string Info { get; set; }
 }
diff --git a/src/LinCms.Application.Contracts/Cms/Groups/IGroupService.cs b/src/LinCms.Application.Contracts/Cms/Groups/IGroupService.cs
@@ -1,12 +1,13 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using IGeekFan.FreeKit.Extras.Dto;
 using LinCms.Entities;
 
 namespace LinCms.Cms.Groups;
 
 public interface IGroupService
 {
-    Task<List<LinGroup>> GetListAsync();
+    Task<PagedResultDto<LinGroup>> GetListAsync(GroupQuery query);
 
     Task<GroupDto> GetAsync(long id);
 

diff --git a/src/LinCms.Application.Contracts/Cms/Users/IUserService.cs b/src/LinCms.Application.Contracts/Cms/Users/IUserService.cs
@@ -24,7 +24,7 @@ public interface IUserService
     /// </summary>
     /// <param name="searchDto"></param>
     /// <returns></returns>
-    PagedResultDto<UserDto> GetUserListByGroupId(UserSearchDto searchDto);
+    Task<PagedResultDto<UserDto>> GetListAsync(UserSearchDto searchDto);
 
     /// <summary>
     /// 修改用户状态

diff --git a/src/LinCms.Application.Contracts/LinCms.Application.Contracts.xml b/src/LinCms.Application.Contracts/LinCms.Application.Contracts.xml
diff --git a/src/LinCms.Application/Cms/Groups/GroupService.cs b/src/LinCms.Application/Cms/Groups/GroupService.cs
@@ -3,12 +3,15 @@
 using System.Linq;
 using System.Threading.Tasks;
 using FreeSql.Internal.ObjectPool;
+using IGeekFan.FreeKit.Extras.Dto;
 using IGeekFan.FreeKit.Extras.FreeSql;
 using LinCms.Cms.Permissions;
 using LinCms.Common;
+using LinCms.Data;
 using LinCms.Data.Enums;
 using LinCms.Entities;
 using LinCms.Exceptions;
+using LinCms.Extensions;
 using LinCms.Security;
 using Microsoft.AspNetCore.Http;
 
@@ -21,13 +24,15 @@ public class GroupService(IFreeSql freeSql,
         IAuditBaseRepository<LinGroupPermission, long> groupPermissionRepository)
     : ApplicationService, IGroupService
 {
-    public async Task<List<LinGroup>> GetListAsync()
+    public async Task<PagedResultDto<LinGroup>> GetListAsync(GroupQuery query)
     {
         List<LinGroup> linGroups = await groupRepository.Select
+            .WhereIf(query.Name.IsNotNullOrWhiteSpace(), r => r.Name.Contains(query.Name))
+            .WhereIf(query.Info.IsNotNullOrWhiteSpace(), r => r.Info.Contains(query.Info))
             .OrderBy(r => r.SortCode)
-            .ToListAsync();
+            .ToPagerListAsync(query, out long count);
 
-        return linGroups;
+        return new PagedResultDto<LinGroup>(linGroups, count);
     }
 
     public async Task<GroupDto> GetAsync(long id)

diff --git a/src/LinCms.Application/Cms/Users/UserService.cs b/src/LinCms.Application/Cms/Users/UserService.cs
@@ -35,7 +35,7 @@ public async Task ChangePasswordAsync(ChangePasswordDto passwordDto)
         {
             throw new LinCmsException("旧密码不正确");
         }
-        if(user.Salt.IsNullOrWhiteSpace())
+        if (user.Salt.IsNullOrWhiteSpace())
         {
             user.Salt = Guid.NewGuid().ToString();
             await userRepository.UpdateAsync(user);
@@ -75,16 +75,16 @@ public async Task ResetPasswordAsync(long id, ResetPasswordDto resetPasswordDto)
         await userIdentityService.ChangePasswordAsync(id, resetPasswordDto.ConfirmPassword, user.Salt);
     }
 
-    public PagedResultDto<UserDto> GetUserListByGroupId(UserSearchDto searchDto)
+    public async Task<PagedResultDto<UserDto>> GetListAsync(UserSearchDto searchDto)
     {
-        List<UserDto> linUsers = userRepository.Select
+        List<UserDto> linUsers = (await userRepository.Select
             .IncludeMany(r => r.LinGroups)
             .WhereIf(searchDto.GroupId != null, r => r.LinUserGroups.AsSelect().Any(u => u.GroupId == searchDto.GroupId))
             .WhereIf(searchDto.Email.IsNotNullOrWhiteSpace(), r => r.Email.Contains(searchDto.Email))
             .WhereIf(searchDto.Nickname.IsNotNullOrWhiteSpace(), r => r.Nickname.Contains(searchDto.Nickname))
             .WhereIf(searchDto.Username.IsNotNullOrWhiteSpace(), r => r.Username.Contains(searchDto.Username))
             .OrderByDescending(r => r.Id)
-            .ToPagerList(searchDto, out long totalCount)
+            .ToPagerListAsync(searchDto, out long totalCount))
             .Select(r =>
             {
                 UserDto userDto = Mapper.Map<UserDto>(r);

diff --git a/src/LinCms.Web/Controllers/Cms/AdminController.cs b/src/LinCms.Web/Controllers/Cms/AdminController.cs
@@ -25,9 +25,9 @@ public class AdminController(IUserService userSevice, IAdminService adminService
     /// <returns></returns>
     [HttpGet("users")]
     [LinCmsAuthorize("查询所有用户", "管理员")]
-    public PagedResultDto<UserDto> GetUserListByGroupId([FromQuery] UserSearchDto searchDto)
+    public Task<PagedResultDto<UserDto>> GetListAsync([FromQuery] UserSearchDto searchDto)
     {
-        return userSevice.GetUserListByGroupId(searchDto);
+        return userSevice.GetListAsync(searchDto);
     }
 
     /// <summary>

diff --git a/src/LinCms.Web/Controllers/Cms/GroupController.cs b/src/LinCms.Web/Controllers/Cms/GroupController.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using IGeekFan.FreeKit.Extras.Dto;
 using LinCms.Aop.Filter;
 using LinCms.Cms.Groups;
 using LinCms.Data;
@@ -9,22 +10,22 @@
 namespace LinCms.Controllers.Cms;
 
 /// <summary>
-/// 分组
+/// 权限组
 /// </summary>
 [ApiExplorerSettings(GroupName = "cms")]
 [Route("cms/admin/group")]
 [ApiController]
 public class GroupController(IGroupService groupService) : ControllerBase
 {
-    [HttpGet("all")]
-    [LinCmsAuthorize("查询所有权限组", "管理员")]
-    public Task<List<LinGroup>> GetListAsync()
+    [HttpGet]
+    [LinCmsAuthorize("查询权限组", "管理员")]
+    public Task<PagedResultDto<LinGroup>> GetListAsync([FromQuery] GroupQuery query)
     {
-        return groupService.GetListAsync();
+        return groupService.GetListAsync(query);
     }
 
     [HttpGet("{id}")]
-    [LinCmsAuthorize("查询一个权限组及其权限", "管理员")]
+    [LinCmsAuthorize("查询权限组", "管理员")]
     public async Task<GroupDto> GetAsync(long id)
     {
         GroupDto groupDto = await groupService.GetAsync(id);
@@ -36,23 +37,23 @@ public async Task<GroupDto> GetAsync(long id)
     public async Task<UnifyResponseDto> CreateAsync([FromBody] CreateGroupDto inputDto)
     {
         await groupService.CreateAsync(inputDto);
-        return UnifyResponseDto.Success("新建分组成功");
+        return UnifyResponseDto.Success("新建权限组成功");
     }
 
     [HttpPut("{id}")]
-    [LinCmsAuthorize("更新一个权限组", "管理员")]
+    [LinCmsAuthorize("更新权限组", "管理员")]
     public async Task<UnifyResponseDto> UpdateAsync(long id, [FromBody] UpdateGroupDto updateGroupDto)
     {
         await groupService.UpdateAsync(id, updateGroupDto);
-        return UnifyResponseDto.Success("更新分组成功");
+        return UnifyResponseDto.Success("更新权限组成功");
     }
 
     [HttpDelete("{id}")]
-    [LinCmsAuthorize("删除一个权限组", "管理员")]
+    [LinCmsAuthorize("删除权限组", "管理员")]
     public async Task<UnifyResponseDto> DeleteAsync(long id)
     {
         await groupService.DeleteAsync(id);
-        return UnifyResponseDto.Success("删除分组成功");
+        return UnifyResponseDto.Success("删除权限组成功");
     }
 
 }
diff --git a/src/LinCms.Web/LinCms.Web.xml b/src/LinCms.Web/LinCms.Web.xml