yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

移动端-pc添加用户后，移动端登录

master
dimengzhe 3 years ago
parent
193a3ca784
commit
4beb371961
2 changed files with 70 additions and 55 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java
  2. 25
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/app/AppSysUserRest.java

16
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java
View File

@ -4,14 +4,10 @@ import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.portal.api.sysorganization.AppContactSysOrganizationVo;
import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.syspost.SysPost;
import com.yxt.anrui.portal.api.sysstaffinfo.*;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgDetailsVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgDto;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPost;
import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostDetailsVo;
import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostDto;
@ -23,6 +19,7 @@ import com.yxt.anrui.portal.biz.sysstaffpost.SysStaffPostService;
import com.yxt.anrui.portal.biz.sysuser.SysUserService;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.Encodes;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.base.utils.PinYinUtils;
import com.yxt.common.core.query.PagerQuery;
@ -186,7 +183,8 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
}
//查询员工的手机号是否重复
SysStaffinfo sysStaffinfo1 = baseMapper.selectByMobile(dto.getMobile());
if (sysStaffinfo1 != null) {
SysUser sysUser1 = sysUserService.selectByMobile(dto.getMobile());
if (sysStaffinfo1 != null || sysUser1 != null) {
return rb.setMsg("已存在手机号为" + dto.getMobile() + "的员工");
}
//查询是否存在该身份证号的员工
@ -280,6 +278,7 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
}
sysStaffOrgDto.fillEntity(sysStaffOrg);
sysStaffOrg.setStaffSid(sysStaffinfo3.getSid());
sysStaffOrg.setManageType("3");
sysStaffOrgService.save(sysStaffOrg);
//增加员工的关联的岗位信息
SysStaffPost sysStaffPost = new SysStaffPost();
@ -293,6 +292,10 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
sysUser.setStaffSid(sysStaffinfo3.getSid());
sysUser.setUserName(jobNumber);
sysUser.setMobile(sysStaffinfo3.getMobile());
sysUser.setUserType(1);
String password = sysStaffinfo3.getMobile().substring(5, 11);
String md5 = Encodes.md5(password);
sysUser.setPassword(md5);
boolean isSave = sysUserService.save(sysUser);
sysStaffPostDto.fillEntity(sysStaffPost);
sysStaffPost.setStaffSid(sysStaffinfo3.getSid());
@ -348,7 +351,8 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
}
//查询员工的手机号是否重复
SysStaffinfo sysStaffinfo2 = baseMapper.selectByMobileAndSid(dto.getMobile(), sid);
if (sysStaffinfo2 != null) {
SysUser sysUser = sysUserService.selectByMobile(dto.getMobile());
if (sysStaffinfo2 != null || sysUser != null) {
return rb.setMsg("已存在手机号为" + dto.getMobile() + "的员工");
}
//查询是否存在该身份证号的员工

25
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/app/AppSysUserRest.java
View File

@ -66,6 +66,7 @@ public class AppSysUserRest implements AppSysUserFeign {
1、2、2、根据传参设备appId查询到绑定的账号与用户传递的账号一致，验证登录信息
1）验证登录信息，成功后返回用户信息，验证不成功返回错误信息（验证码、密码错误）
*/
ResultBean<SysUserVo> rb = ResultBean.fireFail();
String userName = userQuery.getUserName();
String password = userQuery.getPassword();
String appId = userQuery.getAppId();
@ -84,7 +85,12 @@ public class AppSysUserRest implements AppSysUserFeign {
SysUser sysUser = sysUserService.selectByAppId(appId);
if (null == sysUser) { // 未查询到绑定的账号
sysUser = sysUserService.selectByUserNameApp(userName);
if (null == sysUser) return new ResultBean<SysUserVo>().fail().setMsg("账号不存在");
if (sysUser == null) {
sysUser = sysUserService.selectByMobile(userName);
if (sysUser == null) {
return rb.setMsg("账号不存在");
}
}
String appIdVal = sysUser.getAppId();
if (StringUtils.isBlank(appIdVal)) { // 设备值为空
if (type.equals("1")) {
@ -92,7 +98,6 @@ public class AppSysUserRest implements AppSysUserFeign {
if (md5.equals(sysUser.getPassword())) {
sysUserService.updateAppId(sysUser.getSid(), appId);
SysUserVo sysUserVo = sysUserService.selectUser(sysUser);
// SysUserVo sysUserVo = sysUserService.selectUserOne(sysUser);
insertLoginLog(sysUser);
return new ResultBean<SysUserVo>().success().setData(sysUserVo);
} else {
@ -100,7 +105,8 @@ public class AppSysUserRest implements AppSysUserFeign {
}
} else {
String codeFromRedis = redisUtil.get("loginCode" + userName);
if(StringUtils.isBlank(codeFromRedis)) return new ResultBean<SysUserVo>().fail().setMsg("短信验证码已失效，请重新发送");
if (StringUtils.isBlank(codeFromRedis))
return new ResultBean<SysUserVo>().fail().setMsg("短信验证码已失效，请重新发送");
if (verifyCode.equals(codeFromRedis.substring(0, 4))) {
sysUserService.updateAppId(sysUser.getSid(), appId);
SysUserVo sysUserVo = sysUserService.selectUser(sysUser);
@ -116,12 +122,11 @@ public class AppSysUserRest implements AppSysUserFeign {
return new ResultBean<SysUserVo>().fail().setMsg("当前账号已被其它设备绑定（错误码：" + res + ")");
}
} else { // 查询到绑定的账号
if(userName.equals(sysUser.getUserName())){ // 设备appId一致,验证用户名
if (userName.equals(sysUser.getUserName()) || userName.equals(sysUser.getMobile())) { // 设备appId一致,验证用户名
if (type.equals("1")) {
String md5 = Encodes.md5(password);
if (md5.equals(sysUser.getPassword())) {
SysUserVo sysUserVo = sysUserService.selectUser(sysUser);
// SysUserVo sysUserVo = sysUserService.selectUserOne(sysUser);
insertLoginLog(sysUser);
return new ResultBean<SysUserVo>().success().setData(sysUserVo);
} else {
@ -129,7 +134,8 @@ public class AppSysUserRest implements AppSysUserFeign {
}
} else {
String codeFromRedis = redisUtil.get("loginCode" + userName);
if(StringUtils.isBlank(codeFromRedis)) return new ResultBean<SysUserVo>().fail().setMsg("短信验证码已失效，请重新发送");
if (StringUtils.isBlank(codeFromRedis))
return new ResultBean<SysUserVo>().fail().setMsg("短信验证码已失效，请重新发送");
if (verifyCode.equals(codeFromRedis.substring(0, 4))) {
SysUserVo sysUserVo = sysUserService.selectUser(sysUser);
redisUtil.remove("loginCode" + userName);
@ -148,6 +154,7 @@ public class AppSysUserRest implements AppSysUserFeign {
/**
* 插入登录日志
*
* @param user
*/
private void insertLoginLog(SysUser user) {
@ -163,6 +170,7 @@ public class AppSysUserRest implements AppSysUserFeign {
/**
* 手机发送短信验证码
*
* @param mobile
* @param type 1、登录2、修改密码3、找回密码
* @param appId 绑定手机的appid
@ -214,6 +222,7 @@ public class AppSysUserRest implements AppSysUserFeign {
/**
* 插入错误的信息
*
* @param operChar
* @param operArg
* @param remark
@ -279,7 +288,8 @@ public class AppSysUserRest implements AppSysUserFeign {
@Override
public ResultBean resetPwdApp(String mobile, String newPwd, HttpServletRequest httpServletRequest) {
String token = httpServletRequest.getHeader("token");
if (StringUtils.isBlank(mobile) || !RegexUtil.isMobile(mobile)) return new ResultBean().fail().setMsg("请输入正确的手机号");
if (StringUtils.isBlank(mobile) || !RegexUtil.isMobile(mobile))
return new ResultBean().fail().setMsg("请输入正确的手机号");
if (StringUtils.isBlank(newPwd)) return new ResultBean().fail().setMsg("请输入密码");
return sysUserService.resetPwdApp(mobile, newPwd, token);
}
@ -302,6 +312,7 @@ public class AppSysUserRest implements AppSysUserFeign {
/**
* 手机端根据token获取userSid
*
* @return
*/
@Override

Write Preview
Loading…
Cancel
Save