增加对注册流程的接口修改，统一了验证码验证逻辑

houruijun

2020-06-19 e56fe7a384a39822d53ae0cfe226bbac08db9e7e

增加对注册流程的接口修改，统一了验证码验证逻辑

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/vo/UserRegVo.java

@@ -106,4 +106,8 @@
     * 资质证书 图片地址
     */
    private String doctorCcie;
    /**
     * 手机验证码
     */
    private String verification;
}

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

@@ -261,19 +261,7 @@

        if (id > 0 && StringUtils.isNotBlank(oldTel) && StringUtils.isNotBlank(newTel) && StringUtils.isNotBlank(authCode) && StringUtils.isNotBlank(userPassword)) {
            //检查验证码
            Object hget = redisUtils.hget(ConstantSMS.PHONE_SMS, newTel);
            if (hget != null) {
                JSONObject redisJson = JSON.parseObject(JSON.toJSONString(hget));
                Object verificationCodeObject = redisJson.get("verificationCode");
                //核对验证码
                if (authCode.equals(verificationCodeObject)) {
                    //验证旧手机号和密码
                    SysUser sysUser = baseMapper.selectById(id);
                    if (passwordEncoder.matches(userPassword, sysUser.getPassword()) && sysUser.getMobile().equals((oldTel))) {
                        Object date = redisJson.get("endTime");
                        long time = DateUtils.parseDate(date.toString()).getTime();
                        long timeNow = new Date().getTime();
                        if (timeNow <= time) {
            if (CheckVerificationCode(ConstantSMS.PHONE_SMS, newTel, authCode)) {
                            //查询手机号是否已经存在
                            Map<String, Object> selectMap = new HashMap<>();
                            selectMap.put("mobile", newTel);
@@ -281,6 +269,9 @@
                            if (sysUsersList.size() > 0) {
                                return ResultBody.failed("该手机号已经存在!");
                            } else {
                    //验证旧手机号和密码
                    SysUser sysUser = baseMapper.selectById(id);
                    if (passwordEncoder.matches(userPassword, sysUser.getPassword()) && sysUser.getMobile().equals((oldTel))) {
                                //验证通过，修改手机号
                                SysUser user = new SysUser();
                                user.setId(id);
@@ -302,19 +293,14 @@
                                } else {
                                    return ResultBody.failed("手机号修改失败！");
                                }
                            }
                        } else {
                            return ResultBody.failed("手机验证码已过期！");
                        }
                    } else {
                        return ResultBody.failed("用户信息验证失败，请提供正确的手机号和密码！");
                    }
                } else {
                    return ResultBody.failed("手机验证码有误！");
                }
            } else {
                //redis获取失败
                return ResultBody.failed("请重新获取验证码！");
            }
            else
            {
                return ResultBody.failed("无效的验证码");
            }
        } else {
            return ResultBody.failed("必须参数有误！");
@@ -470,6 +456,34 @@
    }

    /**
     * 验证手机验证码
     *
     * @param constantSMS
     * @param phone
     * @param inputCode
     * @return
     */
    public boolean CheckVerificationCode(String constantSMS, String phone, String inputCode) {
        //获取缓存中的验证码对象
        Object hget = redisUtils.hget(constantSMS, phone);
        if (hget != null) {
            //序列化验证码
            JSONObject redisJson = JSON.parseObject(JSON.toJSONString(hget));
            //拿取验证码
            String verificationCodeObject = redisJson.get("verificationCode").toString();
            //核对验证码
            if (inputCode.equals(verificationCodeObject)) {
                Object date = redisJson.get("endTime");
                long time = DateUtils.parseDate(date.toString()).getTime();
                Date dateNow = new Date();
                long timeNow = dateNow.getTime();
                return (timeNow <= time);
            }
        }
        return false;
    }

    /**
     * 通过手机号  修改密码
     *
     * @param map
@@ -490,16 +504,7 @@
        if (newPass == null || "".equals(newPass.trim())) {
            return ResultBody.failed("请输入正确的密码");
        }
        Object hget = redisUtils.hget(ConstantSMS.PASSWORD_SMS, map.get("phone").toString());
        if (hget != null) {
            JSONObject redisJson = JSON.parseObject(JSON.toJSONString(hget));
            Object verificationCodeObject = redisJson.get("verificationCode");
            if (verificationCode.equals(verificationCodeObject)) {
                Object date = redisJson.get("endTime");
                long time = DateUtils.parseDate(date.toString()).getTime();
                Date dateNow = new Date();
                long timeNow = dateNow.getTime();
                if (timeNow <= time) {
        if (CheckVerificationCode(ConstantSMS.PASSWORD_SMS, map.get("phone").toString(), verificationCode)) {
                    //查询表
                    Map<String, Object> selectMap = new HashMap<>();
                    selectMap.put("mobile", phone);
@@ -516,13 +521,7 @@
                        return ResultBody.failed("暂无该手机号信息");
                    }
                } else {
                    return ResultBody.failed("验证码超时");
                }
            } else {
                return ResultBody.failed("验证码错误");
            }
        } else {
            return ResultBody.failed("该手机号没有验证码");
            return ResultBody.failed("无效的验证码");
        }
    }

@@ -633,6 +632,7 @@

    /**
     * H端用户注册  管理员添加用户
     *
     * @param userRegVo
     * @return
     */
@@ -653,39 +653,22 @@
        Boolean isSuccess=true;
        //业务失败提示信息
        String expMsg="";
        //检查判断是注册 还是添加用户，注册用户先走基本数据建设 组织/医院/科室
        SysOrganization sysOrganizationHos=new SysOrganization();
        SysOrganization sysOrganizationDe=new SysOrganization();
        //系统内置的注册医院和科室的组织数据
        Long organizationHos = CommonConstant.HOSPITAL_ORG_ID;
        Long organizationDep = CommonConstant.DEPARTMENT_ORG_ID;
        //检查判断是注册 还是添加用户，注册用户先走基本数据建设 医院/科室
        SysUserOrg sysUserOrgH=new SysUserOrg();
        SysUserOrg sysUserOrgD=new SysUserOrg();
        SysDictionaries sysDictionaries=new SysDictionaries();
        List<SysOrganization> sysOrganizationList=new ArrayList<SysOrganization>();
        SysDoctor sysDoctor=new SysDoctor();
        if (userRegVo.getHospitalId()==null) {
            isReg=true;
            if (CheckVerificationCode(ConstantSMS.REGISTER_SMS, userRegVo.getMobile(), userRegVo.getVerification())) {
            userRegVo.setDoctorState(true);
            //添加医院组织结构数据
            sysOrganizationHos.setOrgAttr(1);
            sysOrganizationHos.setOrgLevel(1);
            sysOrganizationHos.setOrgName(userRegVo.getHospitalName());
            sysOrganizationHos.setCreateUserName(createUserName);
            sysOrganizationHos.setCreateUserId(createUserId);
            Boolean H=organizationService.save(sysOrganizationHos);
            if (H) {
                sysOrganizationList.add(sysOrganizationHos);
                //添加科室组织数据
                sysOrganizationDe.setOrgAttr(2);
                sysOrganizationDe.setOrgLevel(2);
                sysOrganizationDe.setOrgName(userRegVo.getDepartmentName());
                sysOrganizationDe.setCreateUserName(createUserName);
                sysOrganizationDe.setCreateUserId(createUserId);
                Boolean D=organizationService.save(sysOrganizationDe);
                if (D) {
                    sysOrganizationList.add(sysOrganizationDe);
                    //写医院数据
                    SysHospital sysHospital=new SysHospital();
                    sysHospital.setHospitalName(userRegVo.getHospitalName());
                    sysHospital.setOrgId(sysOrganizationHos.getId());
                sysHospital.setOrgId(organizationHos);
                    sysHospital.setHospitalState(0);
                    sysHospital.setCreateUserId(createUserId);
                    sysHospital.setCreateUserName(createUserName);
@@ -696,7 +679,7 @@
                        //保存科室数据
                        SysDepartment sysDepartment=new SysDepartment();
                        sysDepartment.setHospitalId(sysHospital.getId());
                        sysDepartment.setOrgId(sysOrganizationDe.getId());
                    sysDepartment.setOrgId(organizationDep);
                        sysDepartment.setDepartmentName(userRegVo.getDepartmentName());
                        sysDepartment.setSaleUserId(createUserId);
                        sysDepartment.setAccountsCount(1);
@@ -709,34 +692,21 @@
                        if (!d) {
                            isSuccess=false;
                            expMsg="科室数据写入失败";
                        }
                        else
                        {
                    } else {
                            userRegVo.setDepartmentId(sysDepartment.getId());
                        }
                    }
                    else
                    {
                } else {
                        isSuccess=false;
                        expMsg="医院数据写入失败";
                    }
                }
                else
                {
                    isSuccess=false;
                    expMsg="科室组织数据写入失败";
                }
            }
            else
            {
                isSuccess=false;
                expMsg="医院组织数据写入失败";
            } else {
                return ResultBody.failed("无效的验证码");
            }
        }

        //业务执行中途出错  手动撤回数据
        if (isReg&&!isSuccess) {
            RollBackData(sysOrganizationList,userRegVo.getHospitalId(),
            RollBackData(userRegVo.getHospitalId(),
                    userRegVo.getDepartmentId(),0L,0L,
                    0L,0L, 0L);
            return ResultBody.failed(expMsg);
@@ -752,10 +722,9 @@
        if (StringUtils.isBlank(userRegVo.getPassword())) {
            defaultPassWord=com.kidgrow.common.utils.RandomValueUtils.getRandom(6);
            sysUser.setPassword(passwordEncoder.encode(defaultPassWord));
            sysUser.setDefaultAuth(true);
            sysUser.setDefaultAuth(false);
            userRegVo.setPassword(defaultPassWord);
        }
        else {
        } else {
            sysUser.setPassword(passwordEncoder.encode(userRegVo.getPassword()));
            sysUser.setDefaultAuth(false);
        }
@@ -764,9 +733,7 @@
        sysUser.setEnabled(true);
        if (StringUtils.isNotBlank(userRegVo.getType())) {
            sysUser.setType(userRegVo.getType());
        }
        else
        {
        } else {
            sysUser.setType(UserType.DOCTOR.name());
        }
        sysUser.setHAdminUser(false);
@@ -775,8 +742,7 @@
        sysUser.setTenantId("hospital");
        boolean u=this.save(sysUser);
        SysRoleUser sysRoleUser=new SysRoleUser();
        if(u)
        {
        if (u) {
            //保存角色用户绑定信息  sys_role_user
            Map<String,Object> map= new HashMap<>();
            map.put("code",CommonConstant.HOSPITAL_DOCTOR_CODE);
@@ -794,18 +760,18 @@
                    if (StringUtils.isNotBlank(userRegVo.getDoctorRank())) {
                        //检查医生职务是否存在
                        Map<String, Object> selectMap = new HashMap<>();
                        selectMap.put("dictionaries_name", userRegVo.getDoctorRank());
                        selectMap.put("dictionariesName", userRegVo.getDoctorRank());
                        List<SysDictionaries> dictionariesList=sysDictionariesService.findAll(selectMap);
                        boolean dicBool = false;
                        if (dictionariesList.size()>0) {
                            for (int i = dictionariesList.size() - 1; i >= 0; i--) {
                                if (dictionariesList.get(i).getDictionariesName().equals(userRegVo.getDoctorRank())) {
                                    userRegVo.setDoctorRankId(dictionariesList.get(i).getId());
                                    dicBool = true;
                                    break;
                                }
                            }
                        }
                        else
                        {
                        } else {
                            //创建字典数据
                            sysDictionaries.setDictionariesKey(DictionariesConstants.DOCTOR_RANK);
                            sysDictionaries.setDictionariesClassId(DictionariesConstants.DOCTOR_RANK_ID.toString());
@@ -814,20 +780,22 @@
                            sysDictionaries.setDictionariesName(userRegVo.getDoctorRank());
                            sysDictionaries.setCreateUserId(createUserId);
                            sysDictionaries.setCreateUserName(createUserName);
                            boolean d=sysDictionariesService.save(sysDictionaries);
                            if (d) {
                            dicBool = sysDictionariesService.save(sysDictionaries);
                        }

                        if (dicBool) {
                                userRegVo.setDoctorRankId(sysDictionaries.getId());
                                //写用户组织关系表
                                List<SysUserOrg> sysUserOrgList=new ArrayList<SysUserOrg>();

                                sysUserOrgH.setUserId(sysUser.getId());
                                sysUserOrgH.setOrgId(sysOrganizationHos.getId());
                            sysUserOrgH.setOrgId(organizationHos);
                                sysUserOrgH.setCreateUserId(isReg?createUserId:sysUserd.getId());
                                sysUserOrgH.setCreateUserName(isReg?createUserName:sysUserd.getUsername());
                                sysUserOrgList.add(sysUserOrgH);

                                sysUserOrgD.setUserId(sysUser.getId());
                                sysUserOrgD.setOrgId(sysOrganizationHos.getId());
                            sysUserOrgD.setOrgId(organizationDep);
                                sysUserOrgD.setCreateUserId(isReg?createUserId:sysUserd.getId());
                                sysUserOrgD.setCreateUserName(isReg?createUserName:sysUserd.getUsername());
                                sysUserOrgList.add(sysUserOrgD);
@@ -852,73 +820,54 @@
                                        //非自主注册的 返回信息带密码
                                        if (!isReg) {
                                            sysUser.setPassword(userRegVo.getPassword());
                                        }
                                        else
                                        {
                                    } else {
                                            sysUser.setPassword("");
                                        }
                                    }
                                    else
                                    {
                                } else {
                                        isSuccess=false;
                                        expMsg="医生数据写入失败";
                                    }
                                }
                                else
                                {
                            } else {
                                    isSuccess=false;
                                    expMsg="用户组织数据写入失败";
                                }
                            }
                            else
                            {
                        } else {
                                isSuccess=false;
                                expMsg="职称数据写入失败";
                            }
                        }
                    }
                    else
                    {
                    } else {
                        //没有职务数据
                        isSuccess=false;
                        expMsg="没有职称数据";
                    }
                }
                else
                {
                } else {
                    isSuccess=false;
                    expMsg="角色绑定数据写入失败";
                }
            }
            else
            {
            } else {
                isSuccess=false;
                expMsg="对应角色没有数据";
            }
        }
        else
        {
        } else {
            isSuccess=false;
            expMsg="用户数据写入失败";
        }
        /***返回数据***/
        if (!isSuccess) {
            //撤回数据
            RollBackData(null,0L,
            RollBackData(0L,
                    0L,sysUser.getId(),sysUserOrgH.getId(),
                    sysUserOrgH.getId(),sysDictionaries.getId(),
                    sysDoctor.getId());
            return ResultBody.failed(expMsg);
        }
        else
        {
        } else {
            return ResultBody.ok().data(sysUser);
        }
    }

    /**
     * 手动撤回数据，需要撤回那个，给那个id传值，不需要的传0
     * @param sysOrganizationList
     *
     * @param hospitalId
     * @param departmentId
     * @param userId
@@ -927,14 +876,9 @@
     * @param dicId
     * @param doctorId
     */
    private void RollBackData(List<SysOrganization> sysOrganizationList,Long hospitalId,Long departmentId,
                              Long userId,Long userOrgIdH,Long userOrgIdD,Long dicId,Long doctorId)
    {
        if (sysOrganizationList!=null&&sysOrganizationList.size()>0) {
            for (int i = 0; i < sysOrganizationList.size(); i++) {
                organizationService.removeById(sysOrganizationList.get(i));
            }
        }
    private void RollBackData(Long hospitalId, Long departmentId,
                              Long userId, Long userOrgIdH, Long userOrgIdD,
                              Long dicId, Long doctorId) {
        if (hospitalId>0) {
            hospitalService.removeById(hospitalId);
        }
@@ -958,8 +902,10 @@
            sysDoctorMapper.deleteById(doctorId);
        }
    }

    /**
     * 获取医院科室下的所有有效的医生
     *
     * @param hospitalId
     * @param departmentId
     * @return
@@ -969,9 +915,7 @@
        if (hospitalId>0&&departmentId>0) {
            List<HospitalDoctorListVo> listVoList=baseMapper.hospitalDoctorList(hospitalId,departmentId);
            return ResultBody.ok().data(listVoList);
        }
        else
        {
        } else {
            return ResultBody.failed("医院数据有误");
        }
    }
@@ -988,6 +932,7 @@
        List<SysUser> sysUsers = baseMapper.selectByMap(selectMap);
        return (sysUsers.size() > 0);
    }

    /**
     * 检查科室有效剩余账户数量
     *
@@ -998,8 +943,7 @@
        SysDepartment sysDepartment = departmentService.getById(depatmentId);
        if (sysDepartment == null) {
            return 0;
        }
        else {
        } else {
            Map<String, Object> selectMap = new HashMap<>();
            selectMap.put("departmentId",depatmentId);
            selectMap.put("enabled",1);
@@ -1008,13 +952,12 @@
                int doctorCount=sysDoctorList.size();
                int accountCount=sysDepartment.getAccountsCount();
                return (accountCount-doctorCount);
            }
            else
            {
            } else {
                return 0;
            }
        }
    }

    /**
     * 检查用户登录名是否已经注册 true存在  false不存在
     *

 kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/CommonConstant.java

@@ -264,4 +264,14 @@
     * 管理员医生角色code标识
     */
    public static final String HOSPITAL_ADMIN_CODE="hospital_admin";

    /**
     * 自主注册医院的组织id
     */
    public static final Long HOSPITAL_ORG_ID=1273809987709677569L;

    /**
     * 自主注册的科室组织id
     */
    public static final Long DEPARTMENT_ORG_ID=1273810374550335490L;
}