diff --git a/backend/pmd-rules.xml b/backend/pmd-rules.xml index 4fe6859..f275bd0 100644 --- a/backend/pmd-rules.xml +++ b/backend/pmd-rules.xml @@ -9,9 +9,11 @@ + - + - + + \ No newline at end of file diff --git a/backend/src/main/java/com/zl/mjga/component/DepartmentOperatorTool.java b/backend/src/main/java/com/zl/mjga/component/DepartmentOperatorTool.java index d92beef..551d033 100644 --- a/backend/src/main/java/com/zl/mjga/component/DepartmentOperatorTool.java +++ b/backend/src/main/java/com/zl/mjga/component/DepartmentOperatorTool.java @@ -11,6 +11,7 @@ import org.apache.commons.lang3.StringUtils; import org.jooq.generated.mjga.tables.pojos.Department; import org.springframework.stereotype.Component; +@SuppressWarnings("PMD.AvoidDuplicateLiterals") @Description("和部门管理有关的操作工具") @RequiredArgsConstructor @Component diff --git a/backend/src/main/java/com/zl/mjga/component/PositionOperatorTool.java b/backend/src/main/java/com/zl/mjga/component/PositionOperatorTool.java index 26943eb..0615397 100644 --- a/backend/src/main/java/com/zl/mjga/component/PositionOperatorTool.java +++ b/backend/src/main/java/com/zl/mjga/component/PositionOperatorTool.java @@ -9,6 +9,7 @@ import lombok.RequiredArgsConstructor; import org.jooq.generated.mjga.tables.pojos.Position; import org.springframework.stereotype.Component; +@SuppressWarnings("PMD.AvoidDuplicateLiterals") @Description("和岗位管理有关的操作工具") @RequiredArgsConstructor @Component diff --git a/backend/src/main/java/com/zl/mjga/component/UserRolePermissionOperatorTool.java b/backend/src/main/java/com/zl/mjga/component/UserRolePermissionOperatorTool.java index 0a9a324..6e9bc1d 100644 --- a/backend/src/main/java/com/zl/mjga/component/UserRolePermissionOperatorTool.java +++ b/backend/src/main/java/com/zl/mjga/component/UserRolePermissionOperatorTool.java @@ -18,6 +18,7 @@ import org.jooq.generated.mjga.tables.pojos.*; import org.springframework.stereotype.Component; @Description("和用户管理有关的操作工具") +@SuppressWarnings("PMD.AvoidDuplicateLiterals") @RequiredArgsConstructor @Component public class UserRolePermissionOperatorTool { diff --git a/backend/src/main/java/com/zl/mjga/controller/IdentityAccessController.java b/backend/src/main/java/com/zl/mjga/controller/IdentityAccessController.java index 0e381ff..e16d759 100644 --- a/backend/src/main/java/com/zl/mjga/controller/IdentityAccessController.java +++ b/backend/src/main/java/com/zl/mjga/controller/IdentityAccessController.java @@ -66,9 +66,6 @@ public class IdentityAccessController { @PreAuthorize("hasAuthority(T(com.zl.mjga.model.urp.EPermission).WRITE_USER_ROLE_PERMISSION)") @DeleteMapping("/user") void deleteUser(@RequestParam Long userId) { - if (userId == 1) { - throw new BusinessException("演示系统不允许操作管理员角色"); - } userRepository.deleteById(userId); } @@ -81,9 +78,6 @@ public class IdentityAccessController { @PreAuthorize("hasAuthority(T(com.zl.mjga.model.urp.EPermission).WRITE_USER_ROLE_PERMISSION)") @DeleteMapping("/role") void deleteRole(@RequestParam Long roleId) { - if (roleId == 1) { - throw new BusinessException("演示系统不允许删除管理员角色"); - } roleRepository.deleteById(roleId); } @@ -102,9 +96,6 @@ public class IdentityAccessController { @PreAuthorize("hasAuthority(T(com.zl.mjga.model.urp.EPermission).WRITE_USER_ROLE_PERMISSION)") @DeleteMapping("/permission") void deletePermission(@RequestParam Long permissionId) { - if (permissionId < 10) { - throw new BusinessException("演示系统不允许删除原有权限"); - } permissionRepository.deleteById(permissionId); } diff --git a/backend/src/test/java/com/zl/mjga/integration/mvc/JacksonAnnotationMvcTest.java b/backend/src/test/java/com/zl/mjga/integration/mvc/JacksonAnnotationMvcTest.java index a0723df..0eecf94 100644 --- a/backend/src/test/java/com/zl/mjga/integration/mvc/JacksonAnnotationMvcTest.java +++ b/backend/src/test/java/com/zl/mjga/integration/mvc/JacksonAnnotationMvcTest.java @@ -46,7 +46,7 @@ public class JacksonAnnotationMvcTest { stubUserRolePermissionDto.setUsername(stubUsername); stubUserRolePermissionDto.setPassword(stubPassword); when(identityAccessService.pageQueryUser( - PageRequestDto.of(1, 5), new UserQueryDto(stubUsername))) + PageRequestDto.of(1, 5), new UserQueryDto(stubUsername, null, null))) .thenReturn(new PageResponseDto<>(1, List.of(stubUserRolePermissionDto))); mockMvc .perform( diff --git a/backend/src/test/java/com/zl/mjga/integration/mvc/UserRolePermissionMvcTest.java b/backend/src/test/java/com/zl/mjga/integration/mvc/UserRolePermissionMvcTest.java index 3ad73b1..a0164c5 100644 --- a/backend/src/test/java/com/zl/mjga/integration/mvc/UserRolePermissionMvcTest.java +++ b/backend/src/test/java/com/zl/mjga/integration/mvc/UserRolePermissionMvcTest.java @@ -59,7 +59,7 @@ class UserRolePermissionMvcTest { @Test @WithMockUser void deleteUser_givenValidHttpRequest_shouldSucceedWith200() throws Exception { - Long stubUserId = 1L; + Long stubUserId = 2L; mockMvc .perform( delete(String.format("/iam/user?userId=%s", stubUserId)) @@ -152,7 +152,7 @@ class UserRolePermissionMvcTest { stubUserRolePermissionDto.setId(1L); stubUserRolePermissionDto.setUsername(stubUsername); when(identityAccessService.pageQueryUser( - PageRequestDto.of(1, 5), new UserQueryDto(stubUsername))) + PageRequestDto.of(1, 5), new UserQueryDto(stubUsername, null, null))) .thenReturn(new PageResponseDto<>(1, List.of(stubUserRolePermissionDto))); mockMvc .perform( diff --git a/backend/src/test/java/com/zl/mjga/integration/persistence/SortByDALTest.java b/backend/src/test/java/com/zl/mjga/integration/persistence/SortByDALTest.java index 536f6fc..2d17d41 100644 --- a/backend/src/test/java/com/zl/mjga/integration/persistence/SortByDALTest.java +++ b/backend/src/test/java/com/zl/mjga/integration/persistence/SortByDALTest.java @@ -32,7 +32,7 @@ public class SortByDALTest extends AbstractDataAccessLayerTest { "INSERT INTO mjga.user (id, username,password) VALUES (3, 'testC','qFVVFvPqs291k10')", }) void userPageFetchWithNoSort() { - UserQueryDto rbacQueryDto = new UserQueryDto("test"); + UserQueryDto rbacQueryDto = new UserQueryDto("test", null, null); Result records = userRepository.pageFetchBy(PageRequestDto.of(1, 10), rbacQueryDto); assertThat(records.get(0).get(USER.ID)).isEqualTo(1); assertThat(records.get(1).get(USER.ID)).isEqualTo(2); @@ -48,7 +48,7 @@ public class SortByDALTest extends AbstractDataAccessLayerTest { "INSERT INTO mjga.user (id, username,password) VALUES (4, 'testD','3')", }) void userPageFetchWithSort() { - UserQueryDto rbacQueryDto = new UserQueryDto("test"); + UserQueryDto rbacQueryDto = new UserQueryDto("test", null, null); HashMap sortByIdDesc = new HashMap<>(); sortByIdDesc.put("id", PageRequestDto.Direction.DESC); Result records = diff --git a/backend/src/test/java/com/zl/mjga/integration/persistence/UserRolePermissionDALTest.java b/backend/src/test/java/com/zl/mjga/integration/persistence/UserRolePermissionDALTest.java index c094b44..9981a9f 100644 --- a/backend/src/test/java/com/zl/mjga/integration/persistence/UserRolePermissionDALTest.java +++ b/backend/src/test/java/com/zl/mjga/integration/persistence/UserRolePermissionDALTest.java @@ -96,7 +96,7 @@ public class UserRolePermissionDALTest extends AbstractDataAccessLayerTest { "INSERT INTO mjga.user (id, username,password) VALUES (2, 'testB','NTjRCeUq2EqCy')", }) void user_pageFetchBy() { - UserQueryDto rbacQueryDto = new UserQueryDto("test"); + UserQueryDto rbacQueryDto = new UserQueryDto("test", null, null); Result records = userRepository.pageFetchBy(PageRequestDto.of(1, 10), rbacQueryDto); assertThat(records.size()).isEqualTo(2); diff --git a/backend/src/test/java/com/zl/mjga/unit/UserRolePermissionUnitTest.java b/backend/src/test/java/com/zl/mjga/unit/UserRolePermissionUnitTest.java index bd8ffd5..eecc127 100644 --- a/backend/src/test/java/com/zl/mjga/unit/UserRolePermissionUnitTest.java +++ b/backend/src/test/java/com/zl/mjga/unit/UserRolePermissionUnitTest.java @@ -143,7 +143,7 @@ class UserRolePermissionUnitTest { // action PageResponseDto> result = identityAccessService.pageQueryUser( - PageRequestDto.of(1, 10), new UserQueryDto(stubUserName2)); + PageRequestDto.of(1, 10), new UserQueryDto(stubUserName2, null, null)); // assert List userRolePermissionDtoList = result.getData(); @@ -173,7 +173,7 @@ class UserRolePermissionUnitTest { .thenReturn(mockResult); PageResponseDto> result = identityAccessService.pageQueryUser( - PageRequestDto.of(1, 10), new UserQueryDto("agydCO1Yi99a")); + PageRequestDto.of(1, 10), new UserQueryDto("agydCO1Yi99a", null, null)); assertThat(result.getTotal()).isEqualTo(0); assertThat(result.getData()).isNull(); }