diff --git a/src/main/java/com/four/system/controller/SysDeptController.java b/src/main/java/com/four/system/controller/SysDeptController.java index 985cb57..e94c34d 100644 --- a/src/main/java/com/four/system/controller/SysDeptController.java +++ b/src/main/java/com/four/system/controller/SysDeptController.java @@ -25,7 +25,7 @@ import com.four.system.service.ISysDeptService; /** * 部门信息 - * + * * @author ruoyi */ @RestController @@ -130,4 +130,8 @@ public class SysDeptController extends BaseController deptService.checkDeptDataScope(deptId); return toAjax(deptService.deleteDeptById(deptId)); } + + + + } diff --git a/src/main/java/com/four/system/controller/SysUserController.java b/src/main/java/com/four/system/controller/SysUserController.java index e35f901..27034ef 100644 --- a/src/main/java/com/four/system/controller/SysUserController.java +++ b/src/main/java/com/four/system/controller/SysUserController.java @@ -171,10 +171,22 @@ public class SysUserController extends BaseController } /** - * 获取用户信息 - * - * @return 用户信息 + * 注册 */ + + @InnerAuth + @PostMapping("/healthRegister") + public R healthRegister(@RequestBody SysUser sysUser){ + if(!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))){ + return R.fail("当前系统没有开启注册功能"); + } + if(!userService.checkEmailUnique(sysUser)){ + return R.fail("保存用户'" + sysUser.getEmail() + "'失败，注册账号已存在"); + } + return R.ok(userService.healthRegister(sysUser)); + } + + @GetMapping("getInfo") public AjaxResult getInfo() { @@ -190,6 +202,22 @@ public class SysUserController extends BaseController return ajax; } + /** + * 维度健康获取用户信息 + * */ + @GetMapping("healthGetInfo") + public AjaxResult healthGetInfo(){ + SysUser user = userService.selectHealthUserById(SecurityUtils.getUserId()); + Set roles = permissionService.getRolePermission(user); + + Set permission = permissionService.getMenuPermission(user); + AjaxResult ajax = AjaxResult.success(); + ajax.put("user",user); + ajax.put("roles",roles); + ajax.put("permission",permission); + return ajax; + + } /** * 根据用户编号获取详细信息 diff --git a/src/main/java/com/four/system/mapper/SysUserMapper.java b/src/main/java/com/four/system/mapper/SysUserMapper.java index 88b0b2f..595473e 100644 --- a/src/main/java/com/four/system/mapper/SysUserMapper.java +++ b/src/main/java/com/four/system/mapper/SysUserMapper.java @@ -144,4 +144,10 @@ public interface SysUserMapper * @return 结果 */ public SysUser selectByEmail(String email); + + Boolean selectHealthUserId(SysUser sysUser); + + public int insertHealthUser(SysUser sysUser); + + SysUser selectHealthUserById(Long userId); } diff --git a/src/main/java/com/four/system/service/ISysUserService.java b/src/main/java/com/four/system/service/ISysUserService.java index 313684f..385d59a 100644 --- a/src/main/java/com/four/system/service/ISysUserService.java +++ b/src/main/java/com/four/system/service/ISysUserService.java @@ -208,4 +208,8 @@ public interface ISysUserService SysUser selectUserByUserName(String userName); SysUser selectByEmail(String email); + + public boolean healthRegister(SysUser sysUser); + + public SysUser selectHealthUserById(Long userId); } diff --git a/src/main/java/com/four/system/service/impl/SysUserServiceImpl.java b/src/main/java/com/four/system/service/impl/SysUserServiceImpl.java index e8bb770..0e18e88 100644 --- a/src/main/java/com/four/system/service/impl/SysUserServiceImpl.java +++ b/src/main/java/com/four/system/service/impl/SysUserServiceImpl.java @@ -549,4 +549,24 @@ public class SysUserServiceImpl implements ISysUserService return userMapper.selectByEmail(email); } + @Override + @Transactional(rollbackFor = Exception.class) + public boolean healthRegister(SysUser sysUser) { + System.out.println(sysUser); + int i = userMapper.insertHealthUser(sysUser); + Long userId = sysUser.getUserId(); + Long[] logs =new Long[]{sysUser.getUserId()}; + insertUserRole(userId,logs); + + if(i>0 && sysUser.getRoleId() == 101 && StringUtils.isNotNull(sysUser.getInvitationCode())){ + System.out.println("等待接口开放"); + } + return i>0; + } + + @Override + public SysUser selectHealthUserById(Long userId) { + return userMapper.selectHealthUserById(userId); + } + } diff --git a/src/main/resources/mapper/system/SysUserMapper.xml b/src/main/resources/mapper/system/SysUserMapper.xml index 4bf38ea..a55033e 100644 --- a/src/main/resources/mapper/system/SysUserMapper.xml +++ b/src/main/resources/mapper/system/SysUserMapper.xml @@ -136,10 +136,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ${params.dataScope} - - - - + insert into sys_user( - user_id, - dept_id, - user_name, - nick_name, + user_id, + dept_id, + user_name, + nick_name, + user_type, email, - avatar, phonenumber, sex, + avatar, password, status, - create_by, + del_flag, + login_ip, + login_date, + create_by, + create_time, + update_by, + update_time, remark, + user_sign, + bind_wechat_status, + real_name_authentication_status, + bind_bank_card_status, + user_money, + invitation_code, create_time )values( - #{userId}, - #{deptId}, - #{userName}, - #{nickName}, - #{email}, - #{avatar}, - #{phonenumber}, - #{sex}, - #{password}, - #{status}, - #{createBy}, - #{remark}, + #{userId}, + #{deptId}, + #{userName}, + #{nickName}, + #{userType}, + #{email}, + #{phonenumber}, + #{sex}, + #{avatar}, + #{password}, + #{status}, + #{delFlag}, + #{loginIp}, + #{loginDate}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + #{userSign}, + #{bindWechatStatus}, + #{realNameAuthenticationStatus}, + #{bindBankCardStatus}, + #{userMoney}, + #{invitationCode}, sysdate() )