修改使用默认密码登陆，跳转到修改密码的接口

zhaoxiaohao

2020-06-30 147a649dbb6e473e0a0f9d3a6aa854a7add4d990

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java

@@ -86,7 +86,6 @@
    private SysRoleMapper sysRoleMapper;
    @Autowired
    private SysUserRoleMapper sysUserRoleMapper;

    @Override
    public LoginAppUser findByUsername(String username) {
        SysUser sysUser = this.selectByUsername(username);
@@ -114,6 +113,7 @@
    @Override
    public LoginAppUser getLoginAppUser(SysUser sysUser) {
        LoginAppUser loginAppUser = new LoginAppUser();
        SysUser sysUserNew = this.baseMapper.selectById(sysUser);
        if (sysUser != null) {
            //返回的数据为什么要把密码也返回？清空!!
            loginAppUser.setPassword("");
@@ -122,6 +122,7 @@

            BeanUtils.copyProperties(sysUser, loginAppUser);
            //获取用户所属组织机构列表
            loginAppUser.setDefaultAuth(sysUserNew.getDefaultAuth());
            List<SysOrganization> sysOrganizations = organizationService.findListByUserId(sysUser.getId());
            //设置组织机构集合
            loginAppUser.setOrganizations(sysOrganizations);
@@ -241,6 +242,8 @@
        user.setPassword(passwordEncoder.encode(newPassword));
        if (isdefault) {
            user.setDefaultAuth(true);
        }else {
            user.setDefaultAuth(false);
        }
        baseMapper.updateById(user);
        if (isdefault) {
@@ -639,14 +642,17 @@
    @Transactional(rollbackFor = Exception.class)
    @Override
    public ResultBody doctorUserReg(UserRegVo userRegVo, SysUser sysUserd) {
        if(sysUserd.getId()==null){
            sysUserd = this.baseMapper.selectById(userRegVo.getUserId());
        }
        //检查手机号是否已经注册 H端登录名和手机号存一样的值
        if (phoneIsUsed(userRegVo.getMobile())) {
            return ResultBody.failed("该手机号已经注册");
        }
        //创建人id
        Long createUserId = 0L;
        //创建人id
        String createUserName = "自动创建";
        Long createUserId = CommonConstant.CREATE_USER_ID;
        //创建人名称
        String createUserName = CommonConstant.CREATE_USER_NAME;
        //是否注册用户
        Boolean isReg = false;
        //业务成功
@@ -909,7 +915,7 @@
    }

    /**
     * 获取医院科室下的所有有效的医生
     * 获取医院科室下的所有H端有效的医生
     *
     * @param hospitalId
     * @param departmentId
@@ -918,7 +924,7 @@
    @Override
    public ResultBody hospitalDoctorList(Long hospitalId, Long departmentId) {
        if (hospitalId > 0 && departmentId > 0) {
            List<HospitalDoctorListVo> listVoList = baseMapper.hospitalDoctorList(hospitalId, departmentId);
            List<HospitalDoctorListVo> listVoList = baseMapper.hospitalDoctorList(hospitalId, departmentId,CommonConstant.HOSPITAL_DOCTOR_ID,CommonConstant.HOSPITAL_ADMIN_ID);
            return ResultBody.ok().data(listVoList);
        } else {
            return ResultBody.failed("医院数据有误");
@@ -931,7 +937,7 @@
     * @param phone
     * @return
     */
    private boolean phoneIsUsed(String phone) {
    public boolean phoneIsUsed(String phone) {
        Map<String, Object> selectMap = new HashMap<>();
        selectMap.put("mobile", phone);
        List<SysUser> sysUsers = baseMapper.selectByMap(selectMap);
@@ -949,12 +955,9 @@
        if (sysDepartment == null) {
            return 0;
        } else {
            Map<String, Object> selectMap = new HashMap<>();
            selectMap.put("departmentId", depatmentId);
            selectMap.put("enabled", 1);
            List<SysDoctor> sysDoctorList = sysDoctorMapper.selectByMap(selectMap);
            if (sysDoctorList == null) {
                int doctorCount = sysDoctorList.size();
            List<HospitalDoctorListVo> hospitalDoctorListVos = baseMapper.hospitalDoctorList(sysDepartment.getHospitalId(), depatmentId, CommonConstant.HOSPITAL_DOCTOR_ID, CommonConstant.HOSPITAL_ADMIN_ID);
            if (hospitalDoctorListVos != null) {
                int doctorCount = hospitalDoctorListVos.size();
                int accountCount = sysDepartment.getAccountsCount();
                return (accountCount - doctorCount);
            } else {
@@ -962,6 +965,24 @@
            }
        }
    }
//    private Integer departmetAccountsCount(Long depatmentId) {
//        SysDepartment sysDepartment = departmentService.getById(depatmentId);
//        if (sysDepartment == null) {
//            return 0;
//        } else {
//            Map<String, Object> selectMap = new HashMap<>();
//            selectMap.put("department_id", depatmentId);
//            selectMap.put("enabled", 1);
//            List<SysDoctor> sysDoctorList = sysDoctorMapper.selectByMap(selectMap);
//            if (sysDoctorList != null) {
//                int doctorCount = sysDoctorList.size();
//                int accountCount = sysDepartment.getAccountsCount();
//                return (accountCount - doctorCount);
//            } else {
//                return 0;
//            }
//        }
//    }

    /**
     * 检查用户登录名是否已经注册 true存在  false不存在
@@ -987,4 +1008,33 @@
        }
        return new com.kidgrow.usercenter.model.SysDoctor();
    }

    /**
     * 检查手机号是注册用户还是正式用户
     * @param userTel
     * @return
     */
    public ResultBody isRegUser(String userTel)
    {
        if (StringUtils.isNotBlank(userTel)) {
            List<SysUser> users = baseMapper.selectList(
                    new QueryWrapper<SysUser>().eq("username", userTel)
            );
            if (users != null&&users.size()==1) {
                SysUser sysUser=users.get(0);
                if (sysUser.getCreateUserId()==CommonConstant.CREATE_USER_ID&&sysUser.getCreateUserName().equals(CommonConstant.CREATE_USER_NAME)) {
                    return ResultBody.ok().data(true);
                }
                return ResultBody.ok().data(false);
            }
            else
            {
                return ResultBody.failed("用户数据有误！");
            }
        }
        else
        {
            return ResultBody.failed("必要参数有误！");
        }
    }
}