xieyinlu/zhilu-admin
1
0
Fork 0
mirror of https://github.com/ccmjga/zhilu-admin synced 2026-03-15 06:03:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

重构角色和权限相关DTO，替换RoleDto为RoleRespDto，并更新相关服务和控制器逻辑

Browse Source
This commit is contained in:
Chuck1sn
2025-06-16 10:57:35 +08:00
parent 7b8ef54e7b
commit ea10b156e3
34 changed files with 543 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
backend/src/test/java/com/zl/mjga/integration/mvc/UserRolePermissionMvcTest.java
View File

@@ -178,14 +178,14 @@ class UserRolePermissionMvcTest {
stubRoleQueryDto.setRoleId(stubRoleId);
stubRoleQueryDto.setRoleCode(stubRoleCode);
stubRoleQueryDto.setRoleName(stubRoleName);
RoleDto stubRoleDto = new RoleDto();
stubRoleDto.setId(1L);
stubRoleDto.setName(stubRoleName);
stubRoleDto.setCode(stubRoleCode);
stubRoleDto.setPermissions(
RoleRespDto stubRoleRespDto = new RoleRespDto();
stubRoleRespDto.setId(1L);
stubRoleRespDto.setName(stubRoleName);
stubRoleRespDto.setCode(stubRoleCode);
stubRoleRespDto.setPermissions(
List.of(new PermissionRespDto(1L, "9VWU1nmU89zEVH", "9VWU1nmU89zEVH", false)));
when(identityAccessService.pageQueryRole(PageRequestDto.of(1, 5), stubRoleQueryDto))
.thenReturn(new PageResponseDto<>(1, List.of(stubRoleDto)));
.thenReturn(new PageResponseDto<>(1, List.of(stubRoleRespDto)));
mockMvc
.perform(

18
backend/src/test/java/com/zl/mjga/unit/UserRolePermissionUnitTest.java
View File

@@ -112,19 +112,19 @@ class UserRolePermissionUnitTest {
DSL.field("total_user", Integer.class))
.values(stubUserId2, stubUserName2, stubUserPassword2, true, null, 2));
UserRolePermissionDto mockUserRolePermissionDto1 = new UserRolePermissionDto();
RoleDto mockRoleDto = new RoleDto();
mockRoleDto.setId(stubRoleId);
mockRoleDto.setCode(stubRoleCode);
mockRoleDto.setName(stubRoleName);
RoleRespDto mockRoleRespDto = new RoleRespDto();
mockRoleRespDto.setId(stubRoleId);
mockRoleRespDto.setCode(stubRoleCode);
mockRoleRespDto.setName(stubRoleName);
PermissionRespDto permissionRespDto = new PermissionRespDto();
permissionRespDto.setId(stubPermissionId);
permissionRespDto.setCode(stubPermissionCode);
permissionRespDto.setName(stubPermissionName);
mockRoleDto.getPermissions().add(permissionRespDto);
mockRoleRespDto.getPermissions().add(permissionRespDto);
mockUserRolePermissionDto1.setId(stubUserId1);
mockUserRolePermissionDto1.setUsername(stubUserName1);
mockUserRolePermissionDto1.setPassword(stubUserPassword1);
mockUserRolePermissionDto1.getRoles().add(mockRoleDto);
mockUserRolePermissionDto1.getRoles().add(mockRoleRespDto);
UserRolePermissionDto mockUserRolePermissionDto2 = new UserRolePermissionDto();
mockUserRolePermissionDto2.setId(stubUserId2);
@@ -202,7 +202,7 @@ class UserRolePermissionUnitTest {
mockResult.setId(stubRoleId);
mockResult.setRoles(
List.of(
new RoleDto(
new RoleRespDto(
stubRoleId,
stubRoleName,
stubRoleCode,
@@ -245,12 +245,12 @@ class UserRolePermissionUnitTest {
when(roleRepository.pageFetchBy(any(PageRequestDto.class), any(RoleQueryDto.class)))
.thenReturn(mockRoleResult);
RoleQueryDto roleQueryDto = new RoleQueryDto();
PageResponseDto<List<RoleDto>> pageResult =
PageResponseDto<List<RoleRespDto>> pageResult =
identityAccessService.pageQueryRole(PageRequestDto.of(1, 5), roleQueryDto);
assertThat(pageResult.getTotal()).isEqualTo(0L);
roleQueryDto.setUserId(1L);
PageResponseDto<List<RoleDto>> pageResult2 =
PageResponseDto<List<RoleRespDto>> pageResult2 =
identityAccessService.pageQueryRole(PageRequestDto.of(1, 5), roleQueryDto);
assertThat(pageResult2.getTotal()).isEqualTo(0L);
}