完善 PostServiceImpl 单元测试

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmTaskAssignRuleServiceImpl.java

@@ -218,7 +218,7 @@ public class BpmTaskAssignRuleServiceImpl implements BpmTaskAssignRuleService {
             BpmTaskAssignRuleTypeEnum.DEPT_LEADER.getType())) {
             deptApi.validateDeptList(options);
         } else if (Objects.equals(type, BpmTaskAssignRuleTypeEnum.POST.getType())) {
-            postApi.validPosts(options);
+            postApi.validPostList(options);
         } else if (Objects.equals(type, BpmTaskAssignRuleTypeEnum.USER.getType())) {
             adminUserApi.validUsers(options);
         } else if (Objects.equals(type, BpmTaskAssignRuleTypeEnum.USER_GROUP.getType())) {

yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dept/PostApi.java

@@ -20,6 +20,6 @@ public interface PostApi {
     @GetMapping(PREFIX + "/valid")
     @ApiOperation("校验岗位是否合法")
     @ApiImplicitParam(name = "ids", value = "岗位编号数组", example = "1,2", required = true, allowMultiple = true)
-    CommonResult<Boolean> validPosts(@RequestParam("ids") Collection<Long> ids);
+    CommonResult<Boolean> validPostList(@RequestParam("ids") Collection<Long> ids);
 
 }

yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java

@@ -50,7 +50,7 @@ public interface ErrorCodeConstants {
     ErrorCode DEPT_EXITS_CHILDREN = new ErrorCode(1002004003, "存在子部门，无法删除");
     ErrorCode DEPT_PARENT_ERROR = new ErrorCode(1002004004, "不能设置自己为父部门");
     ErrorCode DEPT_EXISTS_USER = new ErrorCode(1002004005, "部门中存在员工，无法删除");
-    ErrorCode DEPT_NOT_ENABLE = new ErrorCode(1002004006, "部门不处于开启状态，不允许选择");
+    ErrorCode DEPT_NOT_ENABLE = new ErrorCode(1002004006, "部门({})不处于开启状态，不允许选择");
     ErrorCode DEPT_PARENT_IS_CHILD = new ErrorCode(1002004007, "不能设置自己的子部门为父部门");
 
     // ========== 岗位模块 1002005000 ==========

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/dept/PostApiImpl.java

@@ -22,8 +22,8 @@ public class PostApiImpl implements PostApi {
     private PostService postService;
 
     @Override
-    public CommonResult<Boolean> validPosts(Collection<Long> ids) {
-        postService.validPosts(ids);
+    public CommonResult<Boolean> validPostList(Collection<Long> ids) {
+        postService.validatePostList(ids);
         return success(true);
     }
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/PostController.java

@@ -72,7 +72,7 @@ public class PostController {
     @ApiOperation(value = "获取岗位精简信息列表", notes = "只包含被开启的岗位，主要用于前端的下拉选项")
     public CommonResult<List<PostSimpleRespVO>> getSimplePosts() {
         // 获得岗位列表，只要开启状态的
-        List<PostDO> list = postService.getPosts(null, Collections.singleton(CommonStatusEnum.ENABLE.getStatus()));
+        List<PostDO> list = postService.getPostList(null, Collections.singleton(CommonStatusEnum.ENABLE.getStatus()));
         // 排序后，返回给前端
         list.sort(Comparator.comparing(PostDO::getSort));
         return success(PostConvert.INSTANCE.convertList02(list));
@@ -90,7 +90,7 @@ public class PostController {
     @PreAuthorize("@ss.hasPermission('system:post:export')")
     @OperateLog(type = EXPORT)
     public void export(HttpServletResponse response, @Validated PostExportReqVO reqVO) throws IOException {
-        List<PostDO> posts = postService.getPosts(reqVO);
+        List<PostDO> posts = postService.getPostList(reqVO);
         List<PostExcelVO> data = PostConvert.INSTANCE.convertList03(posts);
         // 输出
         ExcelUtils.write(response, "岗位数据.xls", "岗位列表", PostExcelVO.class, data);

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2UserController.java

@@ -61,7 +61,7 @@ public class OAuth2UserController {
         }
         // 获得岗位信息
         if (CollUtil.isNotEmpty(user.getPostIds())) {
-            List<PostDO> posts = postService.getPosts(user.getPostIds());
+            List<PostDO> posts = postService.getPostList(user.getPostIds());
             resp.setPosts(OAuth2UserConvert.INSTANCE.convertList(posts));
         }
         return success(resp);

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserProfileController.java

@@ -72,7 +72,7 @@ public class UserProfileController {
         }
         // 获得岗位信息
         if (CollUtil.isNotEmpty(user.getPostIds())) {
-            List<PostDO> posts = postService.getPosts(user.getPostIds());
+            List<PostDO> posts = postService.getPostList(user.getPostIds());
             resp.setPosts(UserConvert.INSTANCE.convertList02(posts));
         }
         // 获得社交用户信息

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/PostService.java

@@ -49,8 +49,8 @@ public interface PostService {
      * @param ids 岗位编号数组。如果为空，不进行筛选
      * @return 部门列表
      */
-    default List<PostDO> getPosts(@Nullable Collection<Long> ids) {
-        return getPosts(ids, asSet(CommonStatusEnum.ENABLE.getStatus(), CommonStatusEnum.DISABLE.getStatus()));
+    default List<PostDO> getPostList(@Nullable Collection<Long> ids) {
+        return getPostList(ids, asSet(CommonStatusEnum.ENABLE.getStatus(), CommonStatusEnum.DISABLE.getStatus()));
     }
 
     /**
@@ -60,7 +60,7 @@ public interface PostService {
      * @param statuses 状态数组。如果为空，不进行筛选
      * @return 部门列表
      */
-    List<PostDO> getPosts(@Nullable Collection<Long> ids, @Nullable Collection<Integer> statuses);
+    List<PostDO> getPostList(@Nullable Collection<Long> ids, @Nullable Collection<Integer> statuses);
 
     /**
      * 获得岗位分页列表
@@ -76,7 +76,7 @@ public interface PostService {
      * @param reqVO 查询条件
      * @return 部门列表
      */
-    List<PostDO> getPosts(PostExportReqVO reqVO);
+    List<PostDO> getPostList(PostExportReqVO reqVO);
 
     /**
      * 获得岗位信息
@@ -93,6 +93,6 @@ public interface PostService {
      *
      * @param ids 岗位编号数组
      */
-    void validPosts(Collection<Long> ids);
+    void validatePostList(Collection<Long> ids);
 
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/PostServiceImpl.java

@@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.system.service.dept;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
-import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostCreateReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostExportReqVO;
@@ -38,7 +37,8 @@ public class PostServiceImpl implements PostService {
     @Override
     public Long createPost(PostCreateReqVO reqVO) {
         // 校验正确性
-        this.checkCreateOrUpdate(null, reqVO.getName(), reqVO.getCode());
+        validatePostForCreateOrUpdate(null, reqVO.getName(), reqVO.getCode());
+
         // 插入岗位
         PostDO post = PostConvert.INSTANCE.convert(reqVO);
         postMapper.insert(post);
@@ -48,7 +48,8 @@ public class PostServiceImpl implements PostService {
     @Override
     public void updatePost(PostUpdateReqVO reqVO) {
         // 校验正确性
-        this.checkCreateOrUpdate(reqVO.getId(), reqVO.getName(), reqVO.getCode());
+        validatePostForCreateOrUpdate(reqVO.getId(), reqVO.getName(), reqVO.getCode());
+
         // 更新岗位
         PostDO updateObj = PostConvert.INSTANCE.convert(reqVO);
         postMapper.updateById(updateObj);
@@ -57,80 +58,79 @@ public class PostServiceImpl implements PostService {
     @Override
     public void deletePost(Long id) {
         // 校验是否存在
-        this.checkPostExists(id);
+        validatePostExists(id);
         // 删除部门
         postMapper.deleteById(id);
     }
 
-    @Override
-    public List<PostDO> getPosts(Collection<Long> ids, Collection<Integer> statuses) {
-        return postMapper.selectList(ids, statuses);
-    }
-
-    @Override
-    public PageResult<PostDO> getPostPage(PostPageReqVO reqVO) {
-        return postMapper.selectPage(reqVO);
-    }
-
-    @Override
-    public List<PostDO> getPosts(PostExportReqVO reqVO) {
-        return postMapper.selectList(reqVO);
-    }
-
-    @Override
-    public PostDO getPost(Long id) {
-        return postMapper.selectById(id);
-    }
-
-    private void checkCreateOrUpdate(Long id, String name, String code) {
+    private void validatePostForCreateOrUpdate(Long id, String name, String code) {
         // 校验自己存在
-        checkPostExists(id);
+        validatePostExists(id);
         // 校验岗位名的唯一性
-        checkPostNameUnique(id, name);
+        validatePostNameUnique(id, name);
         // 校验岗位编码的唯一性
-        checkPostCodeUnique(id, code);
+        validatePostCodeUnique(id, code);
     }
 
-    private void checkPostNameUnique(Long id, String name) {
+    private void validatePostNameUnique(Long id, String name) {
         PostDO post = postMapper.selectByName(name);
         if (post == null) {
             return;
         }
         // 如果 id 为空，说明不用比较是否为相同 id 的岗位
         if (id == null) {
-            throw ServiceExceptionUtil.exception(POST_NAME_DUPLICATE);
+            throw exception(POST_NAME_DUPLICATE);
         }
         if (!post.getId().equals(id)) {
-            throw ServiceExceptionUtil.exception(POST_NAME_DUPLICATE);
+            throw exception(POST_NAME_DUPLICATE);
         }
     }
 
-    private void checkPostCodeUnique(Long id, String code) {
+    private void validatePostCodeUnique(Long id, String code) {
         PostDO post = postMapper.selectByCode(code);
         if (post == null) {
             return;
         }
         // 如果 id 为空，说明不用比较是否为相同 id 的岗位
         if (id == null) {
-            throw ServiceExceptionUtil.exception(POST_CODE_DUPLICATE);
+            throw exception(POST_CODE_DUPLICATE);
         }
         if (!post.getId().equals(id)) {
-            throw ServiceExceptionUtil.exception(POST_CODE_DUPLICATE);
+            throw exception(POST_CODE_DUPLICATE);
         }
     }
 
-    private void checkPostExists(Long id) {
+    private void validatePostExists(Long id) {
         if (id == null) {
             return;
         }
-        PostDO post = postMapper.selectById(id);
-        if (post == null) {
-            throw ServiceExceptionUtil.exception(POST_NOT_FOUND);
+        if (postMapper.selectById(id) == null) {
+            throw exception(POST_NOT_FOUND);
         }
     }
 
     @Override
-    public void validPosts(Collection<Long> ids) {
+    public List<PostDO> getPostList(Collection<Long> ids, Collection<Integer> statuses) {
+        return postMapper.selectList(ids, statuses);
+    }
+
+    @Override
+    public PageResult<PostDO> getPostPage(PostPageReqVO reqVO) {
+        return postMapper.selectPage(reqVO);
+    }
+
+    @Override
+    public List<PostDO> getPostList(PostExportReqVO reqVO) {
+        return postMapper.selectList(reqVO);
+    }
+
+    @Override
+    public PostDO getPost(Long id) {
+        return postMapper.selectById(id);
+    }
+
+    @Override
+    public void validatePostList(Collection<Long> ids) {
         if (CollUtil.isEmpty(ids)) {
             return;
         }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java

@@ -318,7 +318,7 @@ public class AdminUserServiceImpl implements AdminUserService {
         // 校验部门处于开启状态
         deptService.validateDeptList(CollectionUtils.singleton(deptId));
         // 校验岗位处于开启状态
-        postService.validPosts(postIds);
+        postService.validatePostList(postIds);
     }
 
     @VisibleForTesting

yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImplTest.java

@@ -187,7 +187,7 @@ public class DeptServiceImplTest extends BaseDbUnitTest {
     public void testValidateDept_parentNotExitsForCreate() {
         // 准备参数
         DeptCreateReqVO reqVO = randomPojo(DeptCreateReqVO.class,
-                o -> o.setStatus(randomCommonStatus()));
+            o -> o.setStatus(randomCommonStatus()));
 
         // 调用,并断言异常
         assertServiceException(() -> deptService.createDept(reqVO), DEPT_PARENT_NOT_EXITS);
@@ -203,7 +203,7 @@ public class DeptServiceImplTest extends BaseDbUnitTest {
     }
 
     @Test
-    public void testValidateDept_exitsChildrenForDelete() {
+   public void testValidateDept_exitsChildrenForDelete() {
         // mock 数据
         DeptDO parentDept = randomPojo(DeptDO.class, o -> o.setStatus(randomCommonStatus()));
         deptMapper.insert(parentDept);// @Sql: 先插入出一条存在的数据
@@ -337,7 +337,7 @@ public class DeptServiceImplTest extends BaseDbUnitTest {
         List<Long> ids = singletonList(deptDO.getId());
 
         // 调用, 并断言异常
-        assertServiceException(() -> deptService.validateDeptList(ids), DEPT_NOT_ENABLE);
+        assertServiceException(() -> deptService.validateDeptList(ids), DEPT_NOT_ENABLE, deptDO.getName());
     }
 
     @SafeVarargs

yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImplTest.java

@@ -102,7 +102,7 @@ public class AdminUserServiceImplTest extends BaseDbUnitTest {
                     o.setId(postId);
                     o.setStatus(CommonStatusEnum.ENABLE.getStatus());
                 }));
-        when(postService.getPosts(eq(reqVO.getPostIds()), isNull())).thenReturn(posts);
+        when(postService.getPostList(eq(reqVO.getPostIds()), isNull())).thenReturn(posts);
         // mock passwordEncoder 的方法
         when(passwordEncoder.encode(eq(reqVO.getPassword()))).thenReturn("yudaoyuanma");
 
@@ -160,7 +160,7 @@ public class AdminUserServiceImplTest extends BaseDbUnitTest {
                     o.setId(postId);
                     o.setStatus(CommonStatusEnum.ENABLE.getStatus());
                 }));
-        when(postService.getPosts(eq(reqVO.getPostIds()), isNull())).thenReturn(posts);
+        when(postService.getPostList(eq(reqVO.getPostIds()), isNull())).thenReturn(posts);
 
         // 调用
         userService.updateUser(reqVO);