|
|
|
@ -43,7 +43,7 @@ import com.ruoyi.system.service.ISysUserService; |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 用户 业务层处理 |
|
|
|
|
* |
|
|
|
|
* |
|
|
|
|
* @author ruoyi |
|
|
|
|
*/ |
|
|
|
|
@Service |
|
|
|
@ -80,7 +80,7 @@ public class SysUserServiceImpl implements ISysUserService |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 根据条件分页查询用户列表 |
|
|
|
|
* |
|
|
|
|
* |
|
|
|
|
* @param user 用户信息 |
|
|
|
|
* @return 用户信息集合信息 |
|
|
|
|
*/ |
|
|
|
@ -93,7 +93,7 @@ public class SysUserServiceImpl implements ISysUserService |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 根据条件分页查询已分配用户角色列表 |
|
|
|
|
* |
|
|
|
|
* |
|
|
|
|
* @param user 用户信息 |
|
|
|
|
* @return 用户信息集合信息 |
|
|
|
|
*/ |
|
|
|
@ -106,7 +106,7 @@ public class SysUserServiceImpl implements ISysUserService |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 根据条件分页查询未分配用户角色列表 |
|
|
|
|
* |
|
|
|
|
* |
|
|
|
|
* @param user 用户信息 |
|
|
|
|
* @return 用户信息集合信息 |
|
|
|
|
*/ |
|
|
|
@ -119,7 +119,7 @@ public class SysUserServiceImpl implements ISysUserService |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 通过用户名查询用户 |
|
|
|
|
* |
|
|
|
|
* |
|
|
|
|
* @param userName 用户名 |
|
|
|
|
* @return 用户对象信息 |
|
|
|
|
*/ |
|
|
|
@ -131,7 +131,7 @@ public class SysUserServiceImpl implements ISysUserService |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 通过用户ID查询用户 |
|
|
|
|
* |
|
|
|
|
* |
|
|
|
|
* @param userId 用户ID |
|
|
|
|
* @return 用户对象信息 |
|
|
|
|
*/ |
|
|
|
@ -143,7 +143,7 @@ public class SysUserServiceImpl implements ISysUserService |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 查询用户所属角色组 |
|
|
|
|
* |
|
|
|
|
* |
|
|
|
|
* @param userName 用户名 |
|
|
|
|
* @return 结果 |
|
|
|
|
*/ |
|
|
|
@ -160,7 +160,7 @@ public class SysUserServiceImpl implements ISysUserService |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 查询用户所属岗位组 |
|
|
|
|
* |
|
|
|
|
* |
|
|
|
|
* @param userName 用户名 |
|
|
|
|
* @return 结果 |
|
|
|
|
*/ |
|
|
|
@ -177,7 +177,7 @@ public class SysUserServiceImpl implements ISysUserService |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 校验用户名称是否唯一 |
|
|
|
|
* |
|
|
|
|
* |
|
|
|
|
* @param user 用户信息 |
|
|
|
|
* @return 结果 |
|
|
|
|
*/ |
|
|
|
@ -231,7 +231,7 @@ public class SysUserServiceImpl implements ISysUserService |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 校验用户是否允许操作 |
|
|
|
|
* |
|
|
|
|
* |
|
|
|
|
* @param user 用户信息 |
|
|
|
|
*/ |
|
|
|
|
@Override |
|
|
|
@ -245,7 +245,7 @@ public class SysUserServiceImpl implements ISysUserService |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 校验用户是否有数据权限 |
|
|
|
|
* |
|
|
|
|
* |
|
|
|
|
* @param userId 用户id |
|
|
|
|
*/ |
|
|
|
|
@Override |
|
|
|
@ -265,7 +265,7 @@ public class SysUserServiceImpl implements ISysUserService |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 新增保存用户信息 |
|
|
|
|
* |
|
|
|
|
* |
|
|
|
|
* @param user 用户信息 |
|
|
|
|
* @return 结果 |
|
|
|
|
*/ |
|
|
|
@ -284,7 +284,7 @@ public class SysUserServiceImpl implements ISysUserService |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 注册用户信息 |
|
|
|
|
* |
|
|
|
|
* |
|
|
|
|
* @param user 用户信息 |
|
|
|
|
* @return 结果 |
|
|
|
|
*/ |
|
|
|
@ -305,7 +305,7 @@ public class SysUserServiceImpl implements ISysUserService |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 修改保存用户信息 |
|
|
|
|
* |
|
|
|
|
* |
|
|
|
|
* @param user 用户信息 |
|
|
|
|
* @return 结果 |
|
|
|
|
*/ |
|
|
|
@ -327,7 +327,7 @@ public class SysUserServiceImpl implements ISysUserService |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 用户授权角色 |
|
|
|
|
* |
|
|
|
|
* |
|
|
|
|
* @param userId 用户ID |
|
|
|
|
* @param roleIds 角色组 |
|
|
|
|
*/ |
|
|
|
@ -341,7 +341,7 @@ public class SysUserServiceImpl implements ISysUserService |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 修改用户状态 |
|
|
|
|
* |
|
|
|
|
* |
|
|
|
|
* @param user 用户信息 |
|
|
|
|
* @return 结果 |
|
|
|
|
*/ |
|
|
|
@ -353,7 +353,7 @@ public class SysUserServiceImpl implements ISysUserService |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 修改用户基本信息 |
|
|
|
|
* |
|
|
|
|
* |
|
|
|
|
* @param user 用户信息 |
|
|
|
|
* @return 结果 |
|
|
|
|
*/ |
|
|
|
@ -365,7 +365,7 @@ public class SysUserServiceImpl implements ISysUserService |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 修改用户头像 |
|
|
|
|
* |
|
|
|
|
* |
|
|
|
|
* @param userName 用户名 |
|
|
|
|
* @param avatar 头像地址 |
|
|
|
|
* @return 结果 |
|
|
|
@ -378,7 +378,7 @@ public class SysUserServiceImpl implements ISysUserService |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 重置用户密码 |
|
|
|
|
* |
|
|
|
|
* |
|
|
|
|
* @param user 用户信息 |
|
|
|
|
* @return 结果 |
|
|
|
|
*/ |
|
|
|
@ -390,7 +390,7 @@ public class SysUserServiceImpl implements ISysUserService |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 重置用户密码 |
|
|
|
|
* |
|
|
|
|
* |
|
|
|
|
* @param userName 用户名 |
|
|
|
|
* @param password 密码 |
|
|
|
|
* @return 结果 |
|
|
|
@ -403,7 +403,7 @@ public class SysUserServiceImpl implements ISysUserService |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 新增用户角色信息 |
|
|
|
|
* |
|
|
|
|
* |
|
|
|
|
* @param user 用户对象 |
|
|
|
|
*/ |
|
|
|
|
public void insertUserRole(SysUser user) |
|
|
|
@ -413,7 +413,7 @@ public class SysUserServiceImpl implements ISysUserService |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 新增用户岗位信息 |
|
|
|
|
* |
|
|
|
|
* |
|
|
|
|
* @param user 用户对象 |
|
|
|
|
*/ |
|
|
|
|
public void insertUserPost(SysUser user) |
|
|
|
@ -436,7 +436,7 @@ public class SysUserServiceImpl implements ISysUserService |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 新增用户角色信息 |
|
|
|
|
* |
|
|
|
|
* |
|
|
|
|
* @param userId 用户ID |
|
|
|
|
* @param roleIds 角色组 |
|
|
|
|
*/ |
|
|
|
@ -459,7 +459,7 @@ public class SysUserServiceImpl implements ISysUserService |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 通过用户ID删除用户 |
|
|
|
|
* |
|
|
|
|
* |
|
|
|
|
* @param userId 用户ID |
|
|
|
|
* @return 结果 |
|
|
|
|
*/ |
|
|
|
@ -476,7 +476,7 @@ public class SysUserServiceImpl implements ISysUserService |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 批量删除用户信息 |
|
|
|
|
* |
|
|
|
|
* |
|
|
|
|
* @param userIds 需要删除的用户ID |
|
|
|
|
* @return 结果 |
|
|
|
|
*/ |
|
|
|
@ -498,7 +498,7 @@ public class SysUserServiceImpl implements ISysUserService |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 导入用户数据 |
|
|
|
|
* |
|
|
|
|
* |
|
|
|
|
* @param userList 用户数据列表 |
|
|
|
|
* @param isUpdateSupport 是否更新支持,如果已存在,则进行更新数据 |
|
|
|
|
* @param operName 操作用户 |
|
|
|
@ -586,7 +586,7 @@ public class SysUserServiceImpl implements ISysUserService |
|
|
|
|
} |
|
|
|
|
String verifyCode = String.valueOf((new Random()).nextInt(899999) + 100000); |
|
|
|
|
System.out.println("验证码:"+verifyCode); |
|
|
|
|
String message="【创巨圆】验证码:"+verifyCode+",此验证码只用于注册验证,5分钟内有效。如非本人操作,请忽略。"; |
|
|
|
|
String message="【河北创巨圆科技发展有限公司】验证码:"+verifyCode+",此验证码只用于注册验证,5分钟内有效。如非本人操作,请忽略。"; |
|
|
|
|
String cacheValue = redisCache.getCacheObject(phoneNumber+"_number"); |
|
|
|
|
if(cacheValue != null && Integer.parseInt(cacheValue) > 29){ |
|
|
|
|
return -2; |
|
|
|
@ -623,7 +623,7 @@ public class SysUserServiceImpl implements ISysUserService |
|
|
|
|
return -3; |
|
|
|
|
} |
|
|
|
|
String verifyCode = String.valueOf((new Random()).nextInt(899999) + 100000); |
|
|
|
|
String message="【创巨圆】验证码:"+verifyCode+",此验证码只用于找回密码,5分钟内有效。如非本人操作,请忽略。"; |
|
|
|
|
String message="【河北创巨圆科技发展有限公司】验证码:"+verifyCode+",此验证码只用于找回密码,5分钟内有效。如非本人操作,请忽略。"; |
|
|
|
|
String cacheValue = redisCache.getCacheObject(phoneNumber+"_forgetThePassword"); |
|
|
|
|
System.out.println("验证码:"+verifyCode); |
|
|
|
|
if(cacheValue != null && Integer.parseInt(cacheValue) > 29){ |
|
|
|
|