machunlei/springboot-xinda-dev
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

提交修改

Browse Source
This commit is contained in:
LEED
2025-03-27 17:15:27 +08:00
parent 6a8cbff440
commit 988e68bdc7
47 changed files with 1051 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
xinda-admin/src/main/java/com/xinda/web/controller/system/SysDeptController.java
View File

@@ -135,51 +135,56 @@ public class SysDeptController extends BaseController
return error(StringUtils.format(MessageUtils.message("dept.add.failed.name.exists"), dept.getDeptName()));
}
dept.setCreateBy(getUsername());
// 校验系统账号信息
if (StringUtils.isNotEmpty(dept.getUserName())) {
SysUser sysUser = sysUserService.selectUserByUserName(dept.getUserName());
if (ObjectUtil.isNotNull(sysUser)) {
throw new ServiceException(MessageUtils.message("user.username.exists"));
if(dept.getDeptType()>1){
int result = deptService.insertDept(dept);
return toAjax(result);
}else{
// 校验系统账号信息
if (StringUtils.isNotEmpty(dept.getUserName())) {
SysUser sysUser = sysUserService.selectUserByUserName(dept.getUserName());
if (ObjectUtil.isNotNull(sysUser)) {
throw new ServiceException(MessageUtils.message("user.username.exists"));
}
if (!dept.getPassword().equals(dept.getConfirmPassword())) {
throw new ServiceException(MessageUtils.message("user.password.differ"));
}
}
if (!dept.getPassword().equals(dept.getConfirmPassword())) {
throw new ServiceException(MessageUtils.message("user.password.differ"));
}
}
int result = deptService.insertDept(dept);
// 新增机构关联系统账号
if (result > 0) {
// 添加管理员角色，给所有权限
// 查询所有权限
int result = deptService.insertDept(dept);
// 新增机构关联系统账号
if (result > 0) {
// 添加管理员角色，给所有权限
// 查询所有权限
// List<SysMenu> sysMenuList = sysMenuService.selectMenuList(new SysMenu(), 1L, request.getHeader(LANGUAGE));
SysDept sysDept = deptService.selectDeptById(dept.getParentId());
List<SysMenu> sysMenuList = sysMenuService.selectMenuList(new SysMenu(), sysDept.getDeptUserId());
Long[] menuIdList = sysMenuList.stream().map(SysMenu::getMenuId).toArray(Long[]::new);
SysRole sysRole = new SysRole();
sysRole.setRoleName("管理员");
sysRole.setRoleKey("manager");
sysRole.setRoleSort(1);
sysRole.setStatus("0");
sysRole.setDeptId(dept.getDeptId());
sysRole.setMenuIds(menuIdList);
sysRoleService.insertRole(sysRole);
SysDept sysDept = deptService.selectDeptById(dept.getParentId());
List<SysMenu> sysMenuList = sysMenuService.selectMenuList(new SysMenu(), sysDept.getDeptUserId());
Long[] menuIdList = sysMenuList.stream().map(SysMenu::getMenuId).toArray(Long[]::new);
SysRole sysRole = new SysRole();
sysRole.setRoleName("管理员");
sysRole.setRoleKey("manager");
sysRole.setRoleSort(1);
sysRole.setStatus("0");
sysRole.setDeptId(dept.getDeptId());
sysRole.setMenuIds(menuIdList);
sysRoleService.insertRole(sysRole);
// 注册机构管理员用户
RegisterUserInput registerUserInput = new RegisterUserInput();
registerUserInput.setUsername(dept.getUserName());
registerUserInput.setPassword(dept.getPassword());
registerUserInput.setPhonenumber(dept.getPhone());
registerUserInput.setDeptId(dept.getDeptId());
registerUserInput.setRoleIds(new Long[]{sysRole.getRoleId()});
RegisterUserOutput registerUserOutput = toolService.registerNoCaptcha(registerUserInput);
if (StringUtils.isNotEmpty(registerUserOutput.getMsg())) {
deptService.deleteDeptById(dept.getDeptId());
sysRoleService.deleteRoleById(sysRole.getRoleId());
return AjaxResult.error(registerUserOutput.getMsg());
// 注册机构管理员用户
RegisterUserInput registerUserInput = new RegisterUserInput();
registerUserInput.setUsername(dept.getUserName());
registerUserInput.setPassword(dept.getPassword());
registerUserInput.setPhonenumber(dept.getPhone());
registerUserInput.setDeptId(dept.getDeptId());
registerUserInput.setRoleIds(new Long[]{sysRole.getRoleId()});
RegisterUserOutput registerUserOutput = toolService.registerNoCaptcha(registerUserInput);
if (StringUtils.isNotEmpty(registerUserOutput.getMsg())) {
deptService.deleteDeptById(dept.getDeptId());
sysRoleService.deleteRoleById(sysRole.getRoleId());
return AjaxResult.error(registerUserOutput.getMsg());
}
// 更新机构管理员角色绑定信息
deptService.updateDeptUserId(dept.getDeptId(), registerUserOutput.getSysUserId());
}
// 更新机构管理员角色绑定信息
deptService.updateDeptUserId(dept.getDeptId(), registerUserOutput.getSysUserId());
return toAjax(result);
}
return toAjax(result);
}
/**

10
xinda-admin/src/main/java/com/xinda/web/controller/system/SysUserController.java
View File

@@ -284,6 +284,16 @@ public class SysUserController extends BaseController
return success(deptService.selectDeptTreeList(dept));
}
/**
* 获取部门树列表
*/
@ApiOperation("获取部门树列表")
@GetMapping("/depProTree")
public AjaxResult deptProTree(SysDept dept)
{
return success(deptService.selectDeptProTreeList(dept));
}
/**
* 获取终端用户列表
* @param user 用户信息