Merge remote-tracking branch 'origin/master'

jiangping

2025-01-06 93fc01349aa48a086c71123a2317765a925c0897

 server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java

@@ -5,7 +5,8 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.config.jwt.JwtTokenUtil;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.service.business.third.TmsService;
import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
@@ -16,13 +17,13 @@
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.SmsEmail;
import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.dto.LoginByOpenidDTO;
import com.doumee.dao.system.dto.LoginDTO;
import com.doumee.dao.system.dto.LoginPhoneDTO;
import com.doumee.dao.system.model.*;
import com.doumee.service.business.third.model.request.TmsEmployeeListRequest;
import com.doumee.service.business.third.model.response.TmsEmployeeListResponse;
import com.doumee.service.common.CaptchaService;
import com.doumee.service.system.*;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.StringUtils;
@@ -87,6 +88,8 @@

    @Autowired
    private CompanyMapper companyMapper;
    @Autowired
    private TmsService tmsService;

    @Resource
    private JwtTokenUtil jwtTokenUtil;
@@ -254,7 +257,27 @@
                    .set(SystemUser::getOpenidHkInfo,null)
                    .set(SystemUser::getOpenidHkStatus,Constants.ZERO)
                    .eq(SystemUser::getOpenid,openid)
                    .eq(SystemUser::getType,user.getType()));
//                    .eq(SystemUser::getType,user.getType())
            );
            systemUserMapper.update(null,new UpdateWrapper<SystemUser>().lambda()
                    .set(SystemUser::getOpenid,openid)
                    .set(SystemUser::getOpenidHkStatus,Constants.ZERO)
                    .set(SystemUser::getOpenidHkDate,null)
                    .set(SystemUser::getOpenidHkInfo,null)
                    .eq(SystemUser::getId,user.getId()));
        }
    }
    private void dealOpenIdBizForGk(SystemUser user, String openid) {
        if(StringUtils.isNotBlank(openid)){
            //如果openId不为空,绑定该用户openid
            systemUserMapper.update(null,new UpdateWrapper<SystemUser>().lambda()
                    .set(SystemUser::getOpenid,null)
                    .set(SystemUser::getOpenidHkDate,null)
                    .set(SystemUser::getOpenidHkInfo,null)
                    .set(SystemUser::getOpenidHkStatus,Constants.ZERO)
                    .eq(SystemUser::getOpenid,openid)
                    .eq(SystemUser::getType,user.getType())
            );
            systemUserMapper.update(null,new UpdateWrapper<SystemUser>().lambda()
                    .set(SystemUser::getOpenid,openid)
                    .set(SystemUser::getOpenidHkStatus,Constants.ZERO)
@@ -374,8 +397,6 @@
        }else{
            throw new BusinessException(ResponseStatus.NO_ALLOW_LOGIN);
        }


        String pwd = Utils.Secure.encryptPassword(new String(dto.getPassword()), user.getSalt());
        // 比较密码
        if( !StringUtils.equals(pwd, user.getPassword())){
@@ -451,6 +472,7 @@

            systemUser = new SystemUser();
            systemUser.setCreateTime(new Date());
            systemUser.setCreateUser(1);
            systemUser.setDeleted(Boolean.FALSE);
            systemUser.setUsername(param.getPhone());
            systemUser.setRealname(null);
@@ -468,7 +490,6 @@
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，请使用正确的司机账号登陆！");
            }
        }

        dealOpenIdBiz(systemUser,param.getOpenid());
        Company company = new Company();
        if(Objects.nonNull(systemUser.getCompanyId())){
@@ -477,6 +498,65 @@
        LoginUserInfo userInfo = LoginUserInfo.from(systemUser, null, null,company,null);
        return  userInfo;
    }
    @Override
    @Transactional
    public LoginUserInfo loginGkUserWithCode(LoginPhoneDTO param, ServerHttpRequest request) {
        isCaptcheValide(param.getPhone(),param.getCode());//检查验证码
        SystemLoginLog loginLog = new SystemLoginLog();
        loginLog.setLoginUsername(param.getPhone());
        loginLog.setLoginTime(new Date());
        loginLog.setReason("【公众号】运单查询管控人员验证码登陆：openid="+param.getOpenid());
        loginLog.setSystemVersion(systemVersion);
//        loginLog.setLocation(Utils.Location.getLocationString(loginLog.getIp()));
        if(request!=null&&request.getHeaders()!=null && request.getHeaders().size()>0){
            loginLog.setIp(Utils.User_Client.getIP(request));
            loginLog.setPlatform(Utils.User_Client.getPlatform(request));
            loginLog.setClientInfo(Utils.User_Client.getBrowser(request));
            loginLog.setOsInfo(Utils.User_Client.getOS(request));
        }
        loginLog.setServerIp(Utils.Server.getIP());
        // 根据用户名查询用户对象
        SystemUser queryDto = new SystemUser();
        queryDto.setUsername(param.getPhone());
        queryDto.setType(Constants.memberType.gkuser);
        queryDto.setDeleted(Boolean.FALSE);
        SystemUser systemUser = systemUserService.findOne(queryDto);
        if (systemUser == null) {
            String salt = RandomStringUtils.randomAlphabetic(6);
            Member member = new Member();
            member.setCreateDate(new Date());
            member.setIsdeleted(Constants.ZERO);
            member.setType(Constants.memberType.driver);
            member.setPhone(param.getPhone());
            member.setStatus(Constants.ZERO);
            member.setOpenid(param.getOpenid());
            member.setPassward(Utils.Secure.encryptPassword(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.INITIAL_PASSWORD).getCode(), salt));
            memberMapper.insert(member);

            systemUser = new SystemUser();
            systemUser.setCreateTime(new Date());
            systemUser.setCreateUser(1);
            systemUser.setDeleted(Boolean.FALSE);
            systemUser.setUsername(param.getPhone());
            systemUser.setRealname(null);
            systemUser.setMemberId(member.getId());
            systemUser.setMobile(param.getPhone());
            systemUser.setSalt(salt);
            systemUser.setPassword(member.getPassward());
            systemUser.setStatus(Constants.ZERO);
            systemUser.setType(Constants.memberType.driver);
            systemUser.setSource(Constants.TWO);
            systemUser.setOpenid(param.getOpenid());
            systemUserMapper.insert(systemUser);
        }else{
            if(!Constants.equalsInteger(systemUser.getType(),Constants.memberType.gkuser)){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，请使用正确的管控人员手机号登陆！");
            }
        }
        dealOpenIdBizForGk(systemUser,param.getOpenid());
        LoginUserInfo userInfo = LoginUserInfo.from(systemUser, null, null,null,null);
        return  userInfo;
    }


    /**