irving/peipei-backend
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

fix

Browse Source
This commit is contained in:
hucs
2024-06-13 17:40:08 +08:00
parent 8a475d795e
commit 9cc27b3ba1
6 changed files with 65 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
play-admin/src/main/java/com/starry/admin/modules/platform/service/impl/SysTenantServiceImpl.java
View File

@@ -67,6 +67,8 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
private SysRoleMenuMapper sysRoleMenuMapper;
@Resource
private RedisCache redisCache;
@Resource
private SysMenuMapper menuMapper;
@Override
@@ -209,11 +211,55 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
this.createDomainAndDns(sysTenantEntity.getTenantKey());
// 新增客服和组长
this.initRole(sysTenantEntity);
initOtherRule(sysTenantEntity, "waiter", "客服");
initOtherRule(sysTenantEntity, "leader", "组长");
initOtherRule(sysTenantEntity, "operator", "管理员");
return R.ok("租户创建成功!");
}
private void initRole(SysTenantEntity sysTenantEntity) {
SysRoleEntity waiter = new SysRoleEntity();
waiter.setRoleName(sysTenantEntity.getTenantName() + "客服");
waiter.setRoleKey("waiter");
waiter.setDataScope("1");
waiter.setMenuCheckStrictly(true);
waiter.setDeptCheckStrictly(true);
waiter.setTenantId(sysTenantEntity.getTenantId());
roleMapper.insert(waiter);
SysRoleEntity leader = new SysRoleEntity();
leader.setRoleName(sysTenantEntity.getTenantName() + "组长");
leader.setRoleKey("leader");
leader.setDataScope("3");
leader.setMenuCheckStrictly(true);
leader.setDeptCheckStrictly(true);
leader.setTenantId(sysTenantEntity.getTenantId());
roleMapper.insert(leader);
SysRoleEntity operator = new SysRoleEntity();
operator.setRoleName(sysTenantEntity.getTenantName() + "管理员");
operator.setRoleKey("operator");
operator.setDataScope("3");
operator.setMenuCheckStrictly(true);
operator.setDeptCheckStrictly(true);
operator.setTenantId(sysTenantEntity.getTenantId());
roleMapper.insert(operator);
List<SysMenuEntity> menuList = menuMapper.selectMenuList(new SysMenuEntity());
if (CollectionUtil.isNotEmpty(menuList)) {
List<SysRoleMenuEntity> roleMenuEntityList = menuList.stream().map(menu -> {
SysRoleMenuEntity rm = new SysRoleMenuEntity();
rm.setRoleId(operator.getRoleId());
rm.setMenuId(menu.getMenuId());
return rm;
}).collect(Collectors.toList());
roleMenuService.saveBatch(roleMenuEntityList);
}
}
private Long createDept(SysTenantEntity sysTenantEntity) {
// 创建部门
SysDeptEntity dept = new SysDeptEntity();
@@ -257,7 +303,7 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
SysRoleEntity role = new SysRoleEntity();
role.setRoleName(sysTenantEntity.getTenantName() + ruleName);
role.setRoleKey(roleKey);
role.setDataScope("2");
role.setDataScope("3");
role.setMenuCheckStrictly(true);
role.setDeptCheckStrictly(true);
role.setDescription(ruleName);
@@ -291,6 +337,7 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
user.setUserType(1);
user.setUserEmail(sysTenant.getEmail());
user.setMobile(sysTenant.getPhone());
user.setCreatedTime(new Date());
String password = SecurityUtils.encryptPassword(sysTenant.getUserPwd());
user.setPassWord(password);
user.setTenantId(sysTenant.getTenantId());

5
play-admin/src/main/java/com/starry/admin/modules/system/entity/SysUserEntity.java
View File

@@ -34,9 +34,12 @@ public class SysUserEntity extends BaseEntity<SysUserEntity> {
@TableId(value = "user_id", type = IdType.AUTO)
private String userId;
@ApiModelProperty(value = "用户类型;1:admin;2:会员")
@ApiModelProperty(value = "用户类型;1:admin;2:普通，废弃字段")
private Integer userType;
@ApiModelProperty(value = "是否为超管")
private Boolean superAdmin;
@ApiModelProperty(value = "用户名")
private String userCode;