Skip to content

P
pica-cloud-account
提交 5f62dbe3 编写于 作者: wenlei.liao's avatar wenlei.liao
浏览文件
操作

机构SaaS登录接口

上级 2bbc7b73
流水线 #42788 已失败 于阶段
    隐藏空白字符变更
    内嵌 并排
    正在显示 包含 262 行增加 和 68 行删除
    server/src/main/java/com/pica/cloud/account/account/server/controller/AccountController.java
    浏览文件 @ 5f62dbe3
    ......@@ -642,55 +642,4 @@ public class AccountController extends AccountBaseController {
    // String newToken = this.generateToken(account, deviceType);
    // return PicaResponse.toResponse(newToken);
    // }
    @ApiOperation("密码或验证码登录")
    @PostMapping("/saasLogin")
    public PicaResponse<SaasLoginResult> saasLogin(@RequestBody AccountReq req) {
    this.checkMobilePhone(req.getMobilePhone());
    logger.info("login:{}", JSONObject.toJSONString(req));
    //接入新旭事务一致性
    String batchNo = IntactUtils.getUUID();
    intactUtil.sendIntact(batchNo,"login",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_1,"req:"+ JSON.toJSONString(req));
    Account account = accountService.getByMobilePhone(req.getMobilePhone());
    if (account == null) {
    intactUtil.sendIntact(batchNo,"login",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3,"未注册，请验证码登录");
    return PicaResponse.toResponse(null, PicaResultCode.RESULE_DATA_NONE.code(), "未注册，请验证码登录");
    }
    if (StringUtils.isBlank(req.getPassword())) {
    //验证码登录
    req.setFlag("0");
    intactUtil.sendIntact(batchNo,"login",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3,"校验验证码前的返回，因为验证码可能校验不通过，就直接返回了");
    //校验验证码
    this.checkAuthCode(req);
    } else { //密码登录
    if (!StringUtils.equals(req.getPassword(), account.getPassword())) {
    intactUtil.sendIntact(batchNo,"login",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3,"请输入正确的密码");
    return PicaResponse.toResponse(null, PicaResultCode.PARAM_IS_INVALID.code(), "请输入正确的密码");
    }
    }
    //更新最后登录时间
    Account update = new Account();
    update.setId(account.getId());
    update.setLastLoginTime(new Date());
    if (StringUtils.isBlank(account.getUnionid()) && StringUtils.isNotBlank(req.getUnionid())) {
    update.setUnionid(req.getUnionid());
    update.setModifyId(account.getId());
    update.setModifyTime(new Date());
    }
    accountService.updateAccountById(update);
    //登录成功，清除旧token，生成新token
    String deviceType = super.getDeviceInfo("device_type");
    String newToken = "";
    if(deviceType.equals("1")){
    newToken = this.generateToken(account, "4");
    }else {
    newToken = this.generateToken(account, deviceType);
    }
    SaasLoginResult result = new SaasLoginResult();
    result.setToken(newToken);
    result.setHospitalId(account.getHospitalId());
    intactUtil.sendIntact(batchNo,"login",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3,"req:"+ JSON.toJSONString(req));
    return PicaResponse.toResponse(result);
    }
    }
    server/src/main/java/com/pica/cloud/account/account/server/controller/LoginController.java
    浏览文件 @ 5f62dbe3
    ......@@ -448,4 +448,30 @@ public class LoginController extends AccountBaseController {
    return PicaResponse.toResponse();
    }
    /**
    * saas机构管理平台密码登录接口
    *
    * @author wenlei.liao
    * @date 2022/3/1 18:45
    * @param
    * @return
    */
    @ApiOperation("saas机构管理平台密码登录接口")
    @PostMapping("/saasLogin")
    public PicaResponse<SaasLoginResult> saasLogin(@RequestBody SaasLoginReq authCodeReq) throws Exception {
    EncryptEntity entity = new EncryptEntity();
    entity.setKey(authCodeReq.getKey());
    entity.setContent(authCodeReq.getContent());
    BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class);
    request.setProductType(super.getProductType());
    Integer sourceType = super.getSourceType();
    request.setSourceType(sourceType == null ? 0 : sourceType);
    request.setLoginIp(super.getIpAddr());
    request.setUserTokenTourist(super.getUserTokenTourist());
    AccountUtils.checkMobilePhone(request.getMobile());
    AccountUtils.checkPassword(request.getPassword());
    SaasLoginResult login = loginService.saasLogin(request);
    return PicaResponse.toResponse(login);
    }
    }
    server/src/main/java/com/pica/cloud/account/account/server/entity/Account.java
    浏览文件 @ 5f62dbe3
    ......@@ -76,8 +76,6 @@ public class Account {
    private Date birthday;
    private Long hospitalId;
    private Integer hospitalId;
    public Integer getHospitalId() {
    ......@@ -335,12 +333,4 @@ public class Account {
    public void setBirthday(Date birthday) {
    this.birthday = birthday;
    }
    public Long getHospitalId() {
    return hospitalId;
    }
    public void setHospitalId(Long hospitalId) {
    this.hospitalId = hospitalId;
    }
    }
    server/src/main/java/com/pica/cloud/account/account/server/entity/SaasLoginReq.java 0 → 100644
    浏览文件 @ 5f62dbe3
    package com.pica.cloud.account.account.server.entity;
    public class SaasLoginReq {
    /**
    * 加密后的密文
    */
    private String key;
    /**
    * 加密后的数据
    */
    private String content;
    public String getKey() {
    return key;
    }
    public void setKey(String key) {
    this.key = key;
    }
    public String getContent() {
    return content;
    }
    public void setContent(String content) {
    this.content = content;
    }
    }
    server/src/main/java/com/pica/cloud/account/account/server/entity/SaasLoginResult.java
    浏览文件 @ 5f62dbe3
    ......@@ -16,7 +16,16 @@ public class SaasLoginResult {
    private String token;
    @ApiModelProperty("机构id")
    private Long hospitalId;
    private Integer hospitalId;
    @ApiModelProperty("用户id 未加密")
    private Long userId;
    @ApiModelProperty("未加密手机号")
    private String mobile;
    @ApiModelProperty("用户id,已经加密处理")
    private String doctorId;
    public String getToken() {
    return token;
    ......@@ -26,11 +35,35 @@ public class SaasLoginResult {
    this.token = token;
    }
    public Long getHospitalId() {
    public Integer getHospitalId() {
    return hospitalId;
    }
    public void setHospitalId(Long hospitalId) {
    public void setHospitalId(Integer hospitalId) {
    this.hospitalId = hospitalId;
    }
    public Long getUserId() {
    return userId;
    }
    public void setUserId(Long userId) {
    this.userId = userId;
    }
    public String getMobile() {
    return mobile;
    }
    public void setMobile(String mobile) {
    this.mobile = mobile;
    }
    public String getDoctorId() {
    return doctorId;
    }
    public void setDoctorId(String doctorId) {
    this.doctorId = doctorId;
    }
    }
    server/src/main/java/com/pica/cloud/account/account/server/service/LoginService.java
    浏览文件 @ 5f62dbe3
    package com.pica.cloud.account.account.server.service;
    import com.pica.cloud.account.account.server.entity.AccountUser;
    import com.pica.cloud.account.account.server.entity.LogLoginAes;
    import com.pica.cloud.account.account.server.entity.LoginResult;
    import com.pica.cloud.account.account.server.entity.PICAPDoctor;
    import com.pica.cloud.account.account.server.entity.*;
    import com.pica.cloud.account.account.server.req.BaseRequest;
    import com.pica.cloud.account.account.server.resp.UnifiedVerificationResp;
    import com.pica.cloud.foundation.entity.PicaResponse;
    ......@@ -105,4 +102,14 @@ public interface LoginService {
    void loginSwitch(AccountUser oldUser, AccountUser loginUser);
    /**
    * saas 密码登录
    *
    * @author wenlei.liao
    * @date 2022/3/1 18:51
    * @param
    * @return
    */
    SaasLoginResult saasLogin(BaseRequest request);
    }
    server/src/main/java/com/pica/cloud/account/account/server/service/impl/LoginServiceImpl.java
    浏览文件 @ 5f62dbe3
    ......@@ -1105,4 +1105,163 @@ public class LoginServiceImpl implements LoginService {
    AccountTypeEnum.LOG_TYPE_LOGIN.getCode(), loginUser.getToken(), 1, oldUser.getUserTokenTourist());
    picaLogUtils.info(entity);
    }
    @Override
    public SaasLoginResult saasLogin(BaseRequest request) {
    //接入新旭事务一致性
    String batchNo = IntactUtils.getUUID();
    intactUtil.sendIntact(batchNo, "login", com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_1, "request:" + JSON.toJSONString(request));
    String mobile = request.getMobile();
    Integer sourceType = request.getSourceType();
    String encrypt = AESUtil.encryptV0(mobile);
    AccountInfoEntity accountInfoEntity = accountInfoDetailMapper.selectByMobile(encrypt);
    logger.info("bizType:{}, account not null：{}", request.getBizType(), accountInfoEntity != null);
    if (accountInfoEntity != null) {
    String oldPwd = accountInfoEntity.getPassword();
    String password = request.getPassword();
    if (null != request.getBizType() &&
    request.getBizType().equals(1)) {
    // 新版-未设置密码
    if (StringUtils.isEmpty(oldPwd)) {
    if (sourceType != null && SourceTypeEnum.H5.getCode().equals(sourceType)) {
    intactUtil.sendIntact(batchNo, "login", com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3, "该手机号尚未设置密码，设置密码请前往云鹊医APP，或使用其他方式登录。");
    throw new PicaWarnException(AccountExceptionEnum.PICA_MOBILE_NOT_SETED_PASSWORD_H5.getCode(),
    AccountExceptionEnum.PICA_MOBILE_NOT_SETED_PASSWORD_H5.getMessage());
    } else {
    intactUtil.sendIntact(batchNo, "login", com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3, "该手机号{mobile}尚未设置密码，请先设置密码。");
    throw new PicaException(AccountExceptionEnum.PICA_PASSWORD_RULE_ERROR.getCode(),
    AccountExceptionEnum.PICA_PASSWORD_RULE_ERROR.getMessage()
    .replace("{mobile}", mobile));
    }
    } else {
    // 判断账号是否已锁
    logger.info("new login failure：" + mobile);
    String lockKey = Constants.ACCOUNT_LOCK_KEY.replace("{mobile}", mobile);
    if (redisClient.exists(lockKey)) {
    if (sourceType != null && SourceTypeEnum.H5.getCode().equals(sourceType)) {
    intactUtil.sendIntact(batchNo, "login", com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3, "该账号密码错误次数已达上限请24小时后再试，或请使用其他登录方式");
    throw new PicaException(AccountExceptionEnum.PICA_PWD_MISMATCH_5_H5.getCode(),
    AccountExceptionEnum.PICA_PWD_MISMATCH_5_H5.getMessage());
    } else {
    intactUtil.sendIntact(batchNo, "login", com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3, "该账号{mobile}的密码错误次数已达上限请24小时后再试，或请使用其他登录方式或找回密码");
    throw new PicaException(AccountExceptionEnum.PICA_PWD_MISMATCH_5.getCode(),
    AccountExceptionEnum.PICA_PWD_MISMATCH_5.getMessage().replace("{mobile}", mobile));
    }
    }
    if (password.equals(oldPwd)) {
    intactUtil.sendIntact(batchNo, "login", com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3, "接下来调用pwdLoginCorrect");
    return pwdSaaSLoginCorrect(request, mobile, encrypt, accountInfoEntity);
    } else {
    String errorKey = Constants.PWD_ERROR_NUM_KEY.replace("{mobile}", mobile);
    if (redisClient.exists(errorKey)) {
    int errorCount = Integer.parseInt(redisClient.get(errorKey));
    errorCount = errorCount + 1;
    redisClient.set(errorKey, errorCount, Constants.PWD_ERROR_NUM_SECONDS);
    if (errorCount <= 4) {
    intactUtil.sendIntact(batchNo, "login", com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3, "密码错误,请重试");
    throw new PicaException(AccountExceptionEnum.PICA_PWD_MISMATCH_4.getCode(),
    AccountExceptionEnum.PICA_PWD_MISMATCH_4.getMessage());
    } else {
    // 设置账号锁定24h
    redisClient.set(lockKey, mobile, Constants.PWD_ERROR_NUM_SECONDS);
    if (sourceType != null && SourceTypeEnum.H5.getCode().equals(sourceType)) {
    intactUtil.sendIntact(batchNo, "login", com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3, "该账号密码错误次数已达上限请24小时后再试，或请使用其他登录方式");
    throw new PicaException(AccountExceptionEnum.PICA_PWD_MISMATCH_5_H5.getCode(),
    AccountExceptionEnum.PICA_PWD_MISMATCH_5_H5.getMessage());
    } else {
    intactUtil.sendIntact(batchNo, "login", com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3, "该账号{mobile}的密码错误次数已达上限请24小时后再试，或请使用其他登录方式或找回密码");
    throw new PicaException(AccountExceptionEnum.PICA_PWD_MISMATCH_5.getCode(),
    AccountExceptionEnum.PICA_PWD_MISMATCH_5.getMessage().replace("{mobile}", mobile));
    }
    }
    } else {
    redisClient.set(errorKey, 1, Constants.PWD_ERROR_NUM_SECONDS);
    intactUtil.sendIntact(batchNo, "login", com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3, "密码错误,请重试");
    throw new PicaException(AccountExceptionEnum.PICA_PWD_MISMATCH_4.getCode(),
    AccountExceptionEnum.PICA_PWD_MISMATCH_4.getMessage());
    }
    }
    }
    } else {
    // 旧版本
    if (password.equals(oldPwd)) {
    intactUtil.sendIntact(batchNo, "login", com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3, "接下来调用pwdLoginCorrect");
    return pwdSaaSLoginCorrect(request, mobile, encrypt, accountInfoEntity);
    } else {
    logger.info("login failure：" + mobile);
    intactUtil.sendIntact(batchNo, "login", com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3, "请输入正确的密码");
    throw new PicaException(AccountExceptionEnum.PICA_PASSWORD_ERROR.getCode(), AccountExceptionEnum.PICA_PASSWORD_ERROR.getMessage());
    }
    }
    } else {
    if (null != request.getBizType() &&
    request.getBizType().equals(1)) {
    if (sourceType != null && SourceTypeEnum.H5.getCode().equals(sourceType)) {
    intactUtil.sendIntact(batchNo, "login", com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3, "该手机号尚未设置密码，设置密码请前往云鹊医APP，或使用其他方式登录。");
    throw new PicaWarnException(AccountExceptionEnum.PICA_MOBILE_NOT_REGIST_H5.getCode(),
    AccountExceptionEnum.PICA_MOBILE_NOT_REGIST_H5.getMessage());
    } else {
    // 新版-未注册
    intactUtil.sendIntact(batchNo, "login", com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3, "该手机号{mobile}尚未设置密码，请先设置密码。");
    throw new PicaException(AccountExceptionEnum.PICA_PASSWORD_RULE_ERROR.getCode(),
    AccountExceptionEnum.PICA_PASSWORD_RULE_ERROR.getMessage()
    .replace("{mobile}", mobile));
    }
    } else {
    intactUtil.sendIntact(batchNo, "login", com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3, "未注册,请先注册");
    throw new PicaException(AccountExceptionEnum.PICA_NOT_REGISTER.getCode(), AccountExceptionEnum.PICA_NOT_REGISTER.getMessage());
    }
    }
    }
    private SaasLoginResult pwdSaaSLoginCorrect(BaseRequest request, String mobile, String encrypt, AccountInfoEntity accountInfoEntity) {
    //接入新旭事务一致性
    String batchNo = IntactUtils.getUUID();
    intactUtil.sendIntact(batchNo, "pwdLoginCorrect", com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_1, "request:" + JSON.toJSONString(request) + ",+mobile:" + mobile + ",encrypt:" + encrypt + ",accountInfoEntity:" + JSON.toJSONString(accountInfoEntity));
    Date currentTime = new Date();
    Integer acctId = accountInfoEntity.getId();
    int productType = request.getProductType();
    int sourceType = request.getSourceType();
    Doctor doctorInfo = null;
    doctorInfo = doctorInfoMapper.getDoctorInfoByMobile(encrypt);
    if (null == doctorInfo) {
    logger.error("此手机号无用户：{}", mobile);
    intactUtil.sendIntact(batchNo, "pwdLoginCorrect", com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3, "request:" + JSON.toJSONString(request) + ",+mobile 此手机号无用户:" + mobile + ",encrypt:" + ",accountInfoEntity:" + JSON.toJSONString(accountInfoEntity));
    }
    Integer userId = 0;
    if (productType != AccountTypeEnum.PRODUCT_TYPE_HEALTH.getCode()) {
    userId = doctorInfo.getId();
    } else if (productType == AccountTypeEnum.PRODUCT_TYPE_HEALTH.getCode()) {
    AccountPatientInfoEntity accountPatientInfoEntity = accountPatientInfoMapper.selectByAcctId(acctId);
    userId = accountPatientInfoEntity.getId();
    }
    Account account = new Account();
    account.setId(userId.longValue());
    account.setAcctId(acctId);
    account.setCreatTime(currentTime);
    account.setMobilePhone(mobile);
    account.setRegisterSource(sourceType);
    String newToken = tokenUtils.generateToken(account);
    SaasLoginResult result = new SaasLoginResult();
    result.setToken(newToken);
    result.setHospitalId(doctorInfo.getHospitalId());
    result.setUserId(userId.longValue());
    result.setMobile(mobile);
    result.setDoctorId(EncryptUtils.encryptContent(userId + "", EncryptConstants.ENCRYPT_TYPE_ID));
    intactUtil.sendIntact(batchNo, "pwdLoginCorrect", com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3, "request:" + JSON.toJSONString(request) + ",+mobile:" + mobile + ",encrypt:" + ",accountInfoEntity:" + JSON.toJSONString(accountInfoEntity));
    return result;
    }
    }
    Markdown 格式
    0% or
    您添加了 0 人 到此讨论。请谨慎行事。
    先完成此消息的编辑！
    想要评论请 注册 或