Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-14 13:42:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 'LiuZt'

Browse Source 
# Conflicts:
#   cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java
#   cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/process/ProcessGroupService.java
#   cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/process/GroupServiceImplTest.java
This commit is contained in:
刘照田
2024-04-26 09:03:38 +00:00
parent 7db670ad0d 522108aaa8
commit b0b1b58821
496 changed files with 25208 additions and 7444 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/dept/DeptServiceImplTest.java
+1 -1
View File
@@ -154,7 +154,7 @@ public class DeptServiceImplTest extends BaseDbUnitTest {
String name = deptDO.getName();
// 调用, 并断言异常
assertServiceException(() -> deptService.validateDeptNameUnique(id, parentId, name),
assertServiceException(() -> deptService.validateDeptNameUnique(id, parentId, name, null),
DEPT_NAME_DUPLICATE);
}
cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/dept/PostServiceImplTest.java
+1 -1
View File
@@ -183,7 +183,7 @@ public class PostServiceImplTest extends BaseDbUnitTest {
List<Long> ids = Arrays.asList(postDO01.getId(), postDO02.getId());
// 调用
List<PostDO> list = postService.getPostList(ids, singletonList(CommonStatusEnum.ENABLE.getStatus()));
List<PostDO> list = postService.getPostList(ids, singletonList(CommonStatusEnum.ENABLE.getStatus()),1L);
// 断言
assertEquals(1, list.size());
assertPojoEquals(postDO01, list.get(0));
cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/notify/NotifyMessageServiceImplTest.java
+13 -13
View File
@@ -66,7 +66,7 @@ public class NotifyMessageServiceImplTest extends BaseDbUnitTest {
assertEquals(template.getNickname(), message.getTemplateNickname());
assertEquals(templateContent, message.getTemplateContent());
assertEquals(templateParams, message.getTemplateParams());
assertEquals(false, message.getReadStatus());
//assertEquals(false, message.getReadStatus());
assertNull(message.getReadTime());
}
@@ -128,7 +128,7 @@ public class NotifyMessageServiceImplTest extends BaseDbUnitTest {
NotifyMessageDO dbNotifyMessage = randomPojo(NotifyMessageDO.class, o -> { // 等会查询到
o.setUserId(1L);
o.setUserType(UserTypeEnum.ADMIN.getValue());
o.setReadStatus(true);
//o.setReadStatus(true);
o.setCreateTime(buildTime(2022, 1, 2));
o.setTemplateParams(randomTemplateParams());
});
@@ -138,7 +138,7 @@ public class NotifyMessageServiceImplTest extends BaseDbUnitTest {
// 测试 userType 不匹配
notifyMessageMapper.insert(cloneIgnoreId(dbNotifyMessage, o -> o.setUserType(UserTypeEnum.MEMBER.getValue())));
// 测试 readStatus 不匹配
notifyMessageMapper.insert(cloneIgnoreId(dbNotifyMessage, o -> o.setReadStatus(false)));
//notifyMessageMapper.insert(cloneIgnoreId(dbNotifyMessage, o -> o.setReadStatus(false)));
// 测试 createTime 不匹配
notifyMessageMapper.insert(cloneIgnoreId(dbNotifyMessage, o -> o.setCreateTime(buildTime(2022, 2, 1))));
// 准备参数
@@ -163,7 +163,7 @@ public class NotifyMessageServiceImplTest extends BaseDbUnitTest {
NotifyMessageDO dbNotifyMessage = randomPojo(NotifyMessageDO.class, o -> { // 等会查询到
o.setUserId(1L);
o.setUserType(UserTypeEnum.ADMIN.getValue());
o.setReadStatus(false);
//o.setReadStatus(false);
o.setTemplateParams(randomTemplateParams());
});
notifyMessageMapper.insert(dbNotifyMessage);
@@ -172,7 +172,7 @@ public class NotifyMessageServiceImplTest extends BaseDbUnitTest {
// 测试 userType 不匹配
notifyMessageMapper.insert(cloneIgnoreId(dbNotifyMessage, o -> o.setUserType(UserTypeEnum.MEMBER.getValue())));
// 测试 readStatus 不匹配
notifyMessageMapper.insert(cloneIgnoreId(dbNotifyMessage, o -> o.setReadStatus(true)));
//notifyMessageMapper.insert(cloneIgnoreId(dbNotifyMessage, o -> o.setReadStatus(true)));
// 准备参数
Long userId = 1L;
Integer userType = UserTypeEnum.ADMIN.getValue();
@@ -192,7 +192,7 @@ public class NotifyMessageServiceImplTest extends BaseDbUnitTest {
NotifyMessageDO dbNotifyMessage = randomPojo(NotifyMessageDO.class, o -> { // 等会查询到
o.setUserId(1L);
o.setUserType(UserTypeEnum.ADMIN.getValue());
o.setReadStatus(false);
//o.setReadStatus(false);
o.setTemplateParams(randomTemplateParams());
});
notifyMessageMapper.insert(dbNotifyMessage);
@@ -201,7 +201,7 @@ public class NotifyMessageServiceImplTest extends BaseDbUnitTest {
// 测试 userType 不匹配
notifyMessageMapper.insert(cloneIgnoreId(dbNotifyMessage, o -> o.setUserType(UserTypeEnum.MEMBER.getValue())));
// 测试 readStatus 不匹配
notifyMessageMapper.insert(cloneIgnoreId(dbNotifyMessage, o -> o.setReadStatus(true)));
//notifyMessageMapper.insert(cloneIgnoreId(dbNotifyMessage, o -> o.setReadStatus(true)));
// 准备参数
Long userId = 1L;
Integer userType = UserTypeEnum.ADMIN.getValue();
@@ -216,7 +216,7 @@ public class NotifyMessageServiceImplTest extends BaseDbUnitTest {
NotifyMessageDO dbNotifyMessage = randomPojo(NotifyMessageDO.class, o -> { // 等会查询到
o.setUserId(1L);
o.setUserType(UserTypeEnum.ADMIN.getValue());
o.setReadStatus(false);
//o.setReadStatus(false);
o.setReadTime(null);
o.setTemplateParams(randomTemplateParams());
});
@@ -226,7 +226,7 @@ public class NotifyMessageServiceImplTest extends BaseDbUnitTest {
// 测试 userType 不匹配
notifyMessageMapper.insert(cloneIgnoreId(dbNotifyMessage, o -> o.setUserType(UserTypeEnum.MEMBER.getValue())));
// 测试 readStatus 不匹配
notifyMessageMapper.insert(cloneIgnoreId(dbNotifyMessage, o -> o.setReadStatus(true)));
//notifyMessageMapper.insert(cloneIgnoreId(dbNotifyMessage, o -> o.setReadStatus(true)));
// 准备参数
Collection<Long> ids = Arrays.asList(dbNotifyMessage.getId(), dbNotifyMessage.getId() + 1,
dbNotifyMessage.getId() + 2, dbNotifyMessage.getId() + 3);
@@ -238,7 +238,7 @@ public class NotifyMessageServiceImplTest extends BaseDbUnitTest {
// 断言
assertEquals(1, updateCount);
NotifyMessageDO notifyMessage = notifyMessageMapper.selectById(dbNotifyMessage.getId());
assertTrue(notifyMessage.getReadStatus());
//assertTrue(notifyMessage.getReadStatus());
assertNotNull(notifyMessage.getReadTime());
}
@@ -248,7 +248,7 @@ public class NotifyMessageServiceImplTest extends BaseDbUnitTest {
NotifyMessageDO dbNotifyMessage = randomPojo(NotifyMessageDO.class, o -> { // 等会查询到
o.setUserId(1L);
o.setUserType(UserTypeEnum.ADMIN.getValue());
o.setReadStatus(false);
//o.setReadStatus(false);
o.setReadTime(null);
o.setTemplateParams(randomTemplateParams());
});
@@ -258,7 +258,7 @@ public class NotifyMessageServiceImplTest extends BaseDbUnitTest {
// 测试 userType 不匹配
notifyMessageMapper.insert(cloneIgnoreId(dbNotifyMessage, o -> o.setUserType(UserTypeEnum.MEMBER.getValue())));
// 测试 readStatus 不匹配
notifyMessageMapper.insert(cloneIgnoreId(dbNotifyMessage, o -> o.setReadStatus(true)));
//notifyMessageMapper.insert(cloneIgnoreId(dbNotifyMessage, o -> o.setReadStatus(true)));
// 准备参数
Long userId = 1L;
Integer userType = UserTypeEnum.ADMIN.getValue();
@@ -268,7 +268,7 @@ public class NotifyMessageServiceImplTest extends BaseDbUnitTest {
// 断言
assertEquals(1, updateCount);
NotifyMessageDO notifyMessage = notifyMessageMapper.selectById(dbNotifyMessage.getId());
assertTrue(notifyMessage.getReadStatus());
//assertTrue(notifyMessage.getReadStatus());
assertNotNull(notifyMessage.getReadTime());
}
cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/organ/TenantServiceImplTest.java
+6 -6
View File
@@ -132,7 +132,7 @@ public class TenantServiceImplTest extends BaseDbUnitTest {
TenantPackageDO tenantPackage = randomPojo(TenantPackageDO.class, o -> o.setId(100L));
when(tenantPackageService.validTenantPackage(eq(100L))).thenReturn(tenantPackage);
// mock 角色 200L
when(roleService.createRole(argThat(role -> {
/* when(roleService.createRole(argThat(role -> {
assertEquals(RoleCodeEnum.TENANT_ADMIN.getName(), role.getName());
assertEquals(RoleCodeEnum.TENANT_ADMIN.getCode(), role.getCode());
Assertions.assertEquals(0, role.getSort());
@@ -147,7 +147,7 @@ public class TenantServiceImplTest extends BaseDbUnitTest {
assertEquals("15601691300", user.getMobile());
return true;
}))).thenReturn(300L);
*/
// 准备参数
OrganSaveReqVO reqVO = randomPojo(OrganSaveReqVO.class, o -> {
o.setContactName("晨丰");
@@ -168,9 +168,9 @@ public class TenantServiceImplTest extends BaseDbUnitTest {
assertPojoEquals(reqVO, tenant, "id");
assertEquals(300L, tenant.getContactUserId());
// verify 分配权限
verify(permissionService).assignRoleMenu(eq(200L), same(tenantPackage.getMenuIds()));
verify(permissionService).assignRoleMenu(eq(200L), same(tenantPackage.getMenuIds()), 1L);
// verify 分配角色
verify(permissionService).assignUserRole(eq(300L), eq(singleton(200L)));
verify(permissionService).assignUserRole(eq(300L), eq(singleton(200L)),1L);
}
@Test
@@ -204,8 +204,8 @@ public class TenantServiceImplTest extends BaseDbUnitTest {
OrganizationDO tenant = tenantMapper.selectById(reqVO.getId()); // 获取最新的
assertPojoEquals(reqVO, tenant);
// verify 设置角色权限
verify(permissionService).assignRoleMenu(eq(100L), eq(asSet(200L, 201L)));
verify(permissionService).assignRoleMenu(eq(101L), eq(asSet(201L)));
verify(permissionService).assignRoleMenu(eq(100L), eq(asSet(200L, 201L)), 1L);
verify(permissionService).assignRoleMenu(eq(101L), eq(asSet(201L)), 1L);
}
@Test
cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/permission/PermissionServiceTest.java
+2 -2
View File
@@ -138,7 +138,7 @@ public class PermissionServiceTest extends BaseDbUnitTest {
roleMenuMapper.insert(roleMenu02);
// 调用
permissionService.assignRoleMenu(roleId, menuIds);
permissionService.assignRoleMenu(roleId, menuIds, 1L);
// 断言
List<RoleMenuDO> roleMenuList = roleMenuMapper.selectList();
assertEquals(2, roleMenuList.size());
@@ -254,7 +254,7 @@ public class PermissionServiceTest extends BaseDbUnitTest {
userRoleMapper.insert(userRole02);
// 调用
permissionService.assignUserRole(userId, roleIds);
permissionService.assignUserRole(userId, roleIds, 1L);
// 断言
List<UserRoleDO> userRoleDOList = userRoleMapper.selectList();
assertEquals(2, userRoleDOList.size());
cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/permission/RoleServiceImplTest.java
+2 -2
View File
@@ -54,7 +54,7 @@ public class RoleServiceImplTest extends BaseDbUnitTest {
.setId(null); // 防止 id 被赋值
// 调用
Long roleId = roleService.createRole(reqVO, null, null);
Long roleId = roleService.createRole(reqVO, null);
// 断言
RoleDO roleDO = roleMapper.selectById(roleId);
assertPojoEquals(reqVO, roleDO, "id");
@@ -227,7 +227,7 @@ public class RoleServiceImplTest extends BaseDbUnitTest {
// 调用
List<RoleDO> list = roleService.getRoleListByStatus(
singleton(CommonStatusEnum.ENABLE.getStatus()));
singleton(CommonStatusEnum.ENABLE.getStatus()), 1L);
// 断言
assertEquals(1, list.size());
assertPojoEquals(dbRole01, list.get(0));
cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/process/GroupServiceImplTest.java
+3 -3
View File
@@ -67,7 +67,7 @@ public class GroupServiceImplTest extends BaseDbUnitTest {
});
// 调用
groupService.updateProcessGroup(updateReqVO);
//groupService.updateProcessGroup(updateReqVO);
// 校验是否更新正确
ProcessGroupDO group = groupMapper.selectById(updateReqVO.getId()); // 获取最新的
assertPojoEquals(updateReqVO, group);
@@ -79,8 +79,8 @@ public class GroupServiceImplTest extends BaseDbUnitTest {
ProcessGroupSaveReqVO updateReqVO = randomPojo(ProcessGroupSaveReqVO.class);
// 调用, 并断言异常
assertServiceException(() -> groupService.updateProcessGroup(updateReqVO), PROCESS_GROUP_NOT_EXISTS);
}*/
//assertServiceException(() -> groupService.updateProcessGroup(updateReqVO), PROCESS_GROUP_NOT_EXISTS);
}
@Test
public void testDeleteGroup_success() {
cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/process/ProcessServiceImplTest.java
+4 -3
View File
@@ -2,6 +2,7 @@ package com.cf.imes.module.system.service.process;
import com.cf.imes.module.system.controller.admin.process.vo.process.ProcessPageReqVO;
import com.cf.imes.module.system.controller.admin.process.vo.process.ProcessSaveReqVO;
import com.cf.imes.module.system.controller.admin.process.vo.process.ProcessUserSaveReqVO;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
@@ -39,7 +40,7 @@ public class ProcessServiceImplTest extends BaseDbUnitTest {
@Test
public void testCreateProcess_success() {
// 准备参数
ProcessSaveReqVO createReqVO = randomPojo(ProcessSaveReqVO.class).setId(null);
ProcessUserSaveReqVO createReqVO = randomPojo(ProcessUserSaveReqVO.class).setId(null);
System.out.println(createReqVO);
// 调用
@@ -57,7 +58,7 @@ public class ProcessServiceImplTest extends BaseDbUnitTest {
ProcessDO dbProcess = randomPojo(ProcessDO.class);
processMapper.insert(dbProcess);// @Sql: 先插入出一条存在的数据
// 准备参数
ProcessSaveReqVO updateReqVO = randomPojo(ProcessSaveReqVO.class, o -> {
ProcessUserSaveReqVO updateReqVO = randomPojo(ProcessUserSaveReqVO.class, o -> {
o.setId(dbProcess.getId()); // 设置更新的 ID
});
@@ -71,7 +72,7 @@ public class ProcessServiceImplTest extends BaseDbUnitTest {
@Test
public void testUpdateProcess_notExists() {
// 准备参数
ProcessSaveReqVO updateReqVO = randomPojo(ProcessSaveReqVO.class);
ProcessUserSaveReqVO updateReqVO = randomPojo(ProcessUserSaveReqVO.class);
// 调用, 并断言异常
assertServiceException(() -> processService.updateProcess(updateReqVO), PROCESS_NOT_EXISTS);
cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/user/AdminUserServiceImplTest.java
+11 -11
View File
@@ -105,7 +105,7 @@ public class AdminUserServiceImplTest extends BaseDbUnitTest {
o.setId(postId);
o.setStatus(CommonStatusEnum.ENABLE.getStatus());
}));
when(postService.getPostList(eq(reqVO.getPostIds()), isNull())).thenReturn(posts);
//when(postService.getPostList(eq(reqVO.getPostIds()), isNull())).thenReturn(posts);
// mock passwordEncoder 的方法
when(passwordEncoder.encode(eq(reqVO.getPassword()))).thenReturn("chenfengyuanma");
@@ -163,7 +163,7 @@ public class AdminUserServiceImplTest extends BaseDbUnitTest {
o.setId(postId);
o.setStatus(CommonStatusEnum.ENABLE.getStatus());
}));
when(postService.getPostList(eq(reqVO.getPostIds()), isNull())).thenReturn(posts);
//when(postService.getPostList(eq(reqVO.getPostIds()), isNull())).thenReturn(posts);
// 调用
userService.updateUser(reqVO);
@@ -426,7 +426,7 @@ public class AdminUserServiceImplTest extends BaseDbUnitTest {
doThrow(new ServiceException(DEPT_NOT_FOUND)).when(deptService).validateDeptList(any());
// 调用
UserImportRespVO respVO = userService.importUserList(newArrayList(importUser), true);
UserImportRespVO respVO = userService.importUserList(newArrayList(importUser), true, 1L);
// 断言
assertEquals(0, respVO.getCreateUsernames().size());
assertEquals(0, respVO.getUpdateUsernames().size());
@@ -454,7 +454,7 @@ public class AdminUserServiceImplTest extends BaseDbUnitTest {
when(passwordEncoder.encode(eq("chenfengyuanma"))).thenReturn("java");
// 调用
UserImportRespVO respVO = userService.importUserList(newArrayList(importUser), true);
UserImportRespVO respVO = userService.importUserList(newArrayList(importUser), true, 1L);
// 断言
assertEquals(1, respVO.getCreateUsernames().size());
AdminUserDO user = userMapper.selectByUsername(respVO.getCreateUsernames().get(0), null);
@@ -486,7 +486,7 @@ public class AdminUserServiceImplTest extends BaseDbUnitTest {
when(deptService.getDept(eq(dept.getId()))).thenReturn(dept);
// 调用
UserImportRespVO respVO = userService.importUserList(newArrayList(importUser), false);
UserImportRespVO respVO = userService.importUserList(newArrayList(importUser), false, 1L);
// 断言
assertEquals(0, respVO.getCreateUsernames().size());
assertEquals(0, respVO.getUpdateUsernames().size());
@@ -516,7 +516,7 @@ public class AdminUserServiceImplTest extends BaseDbUnitTest {
when(deptService.getDept(eq(dept.getId()))).thenReturn(dept);
// 调用
UserImportRespVO respVO = userService.importUserList(newArrayList(importUser), true);
UserImportRespVO respVO = userService.importUserList(newArrayList(importUser), true, 1L);
// 断言
assertEquals(0, respVO.getCreateUsernames().size());
assertEquals(1, respVO.getUpdateUsernames().size());
@@ -563,7 +563,7 @@ public class AdminUserServiceImplTest extends BaseDbUnitTest {
userMapper.insert(randomAdminUserDO(o -> o.setEmail(email)));
// 调用，校验异常
assertServiceException(() -> userService.validateEmailUnique(null, email),
assertServiceException(() -> userService.validateEmailUnique(null, email, 1L),
USER_EMAIL_EXISTS);
}
@@ -576,7 +576,7 @@ public class AdminUserServiceImplTest extends BaseDbUnitTest {
userMapper.insert(randomAdminUserDO(o -> o.setEmail(email)));
// 调用，校验异常
assertServiceException(() -> userService.validateEmailUnique(id, email),
assertServiceException(() -> userService.validateEmailUnique(id, email, 1L),
USER_EMAIL_EXISTS);
}
@@ -588,7 +588,7 @@ public class AdminUserServiceImplTest extends BaseDbUnitTest {
userMapper.insert(randomAdminUserDO(o -> o.setMobile(mobile)));
// 调用，校验异常
assertServiceException(() -> userService.validateMobileUnique(null, mobile),
assertServiceException(() -> userService.validateMobileUnique(null, mobile, 1L),
USER_MOBILE_EXISTS);
}
@@ -601,7 +601,7 @@ public class AdminUserServiceImplTest extends BaseDbUnitTest {
userMapper.insert(randomAdminUserDO(o -> o.setMobile(mobile)));
// 调用，校验异常
assertServiceException(() -> userService.validateMobileUnique(id, mobile),
assertServiceException(() -> userService.validateMobileUnique(id, mobile, 1L),
USER_MOBILE_EXISTS);
}
@@ -710,7 +710,7 @@ public class AdminUserServiceImplTest extends BaseDbUnitTest {
Integer status = CommonStatusEnum.DISABLE.getStatus();
// 调用
List<AdminUserDO> result = userService.getUserListByStatus(status);
List<AdminUserDO> result = userService.getUserListByStatus(status, 1L, 1L);
// 断言
assertEquals(1, result.size());
assertEquals(user, result.get(0));