jiangping
2025-01-06 67e8a1c12ccb42b82704d989c71607d0cbe33356
最新版本541200007
已修改7个文件
541 ■■■■■ 文件已修改
server/system_gateway/src/main/java/com/doumee/api/gateway/JwtAuthController.java 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_service/src/main/java/com/doumee/dao/system/dto/LoginPhoneDTO.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_service/src/main/java/com/doumee/service/system/SystemLoginService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java 307 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsCloudController.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java 174 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_gateway/src/main/java/com/doumee/api/gateway/JwtAuthController.java
@@ -111,6 +111,23 @@
            return ApiResponse.failed(ResponseStatus.SERVER_ERROR);
        }
    }
    @PreventRepeat(limit = 10, lockTime = 10000)
    @ApiOperation("H5业务登录")
    @PostMapping("/loginH5ByPhone")
    @LoginNoRequired
    public ApiResponse<String> loginH5ByPhone (@Validated @RequestBody LoginPhoneDTO dto, ServerWebExchange serverWebExchange) {
        try {
            ServerHttpRequest request = serverWebExchange.getRequest();
            LoginUserInfo user =  systemLoginService.loginH5ByPhone(dto,request);
            String token = jwtTokenUtil.generateToken(user);
            return ApiResponse.success(token);
        }catch (BusinessException e){
            return ApiResponse.failed(e.getCode(),e.getMessage());
        }catch (Exception e){
            e.printStackTrace();
            return ApiResponse.failed(ResponseStatus.SERVER_ERROR);
        }
    }
    @PreventRepeat(limit = 10, lockTime = 10000)
@@ -133,6 +150,23 @@
    }
    @PreventRepeat(limit = 10, lockTime = 10000)
    @ApiOperation("司机登录(手机号验证码登录)")
    @PostMapping("/loginDriverByPhone")
    @LoginNoRequired
    public ApiResponse<String> loginDriverByPhone (@Validated @RequestBody LoginPhoneDTO dto, ServerWebExchange serverWebExchange) {
        try {
            ServerHttpRequest request = serverWebExchange.getRequest();
            LoginUserInfo user = systemLoginService.loginDriverByPhone(dto,request);
            String token = jwtTokenUtil.generateToken(user);
            return ApiResponse.success(token);
        }catch (BusinessException e){
            return ApiResponse.failed(e.getCode(),e.getMessage());
        }catch (Exception e){
            e.printStackTrace();
            return ApiResponse.failed(ResponseStatus.SERVER_ERROR);
        }
    }
    @PreventRepeat(limit = 10, lockTime = 10000)
    @ApiOperation("司机登录")
    @PostMapping("/loginDriver")
    @LoginNoRequired
server/system_service/src/main/java/com/doumee/dao/system/dto/LoginPhoneDTO.java
@@ -23,4 +23,6 @@
    private String code;
    @ApiModelProperty(value = "openid")
    private String openid;
    @ApiModelProperty(value = "用户类型:0=司机;1=访客;2=内部员工")
    private Integer userType;
}
server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java
@@ -98,8 +98,8 @@
    @ApiModelProperty(value = "微信openid推送海康时间", example = "1", hidden = true)
    private Date openidHkDate;
    //2024年12月6日11:00:30 类型 0司机人员 1普通访客  2内部人员
    @ApiModelProperty(value = "类型 0平台用户 1访客", example = "0")
    //2024年12月6日11:00:30 类型 0司机人员 1普通访客  2内部人员 3tms管控人员
    @ApiModelProperty(value = "类型 0司机人员 1普通访客  2内部人员 3tms管控人员", example = "0")
    private Integer type;
    @ApiModelProperty(value = "微信昵称")
server/system_service/src/main/java/com/doumee/service/system/SystemLoginService.java
@@ -37,4 +37,8 @@
     * @return
     */
    String loginByUserId(Integer userId);
    LoginUserInfo loginH5ByPhone(LoginPhoneDTO dto, ServerHttpRequest request);
    LoginUserInfo loginDriverByPhone(LoginPhoneDTO dto, ServerHttpRequest request);
}
server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
@@ -140,19 +140,9 @@
    @Override
    public LoginUserInfo loginByPasswordNew(LoginDTO dto, ServerHttpRequest request) {
        SystemLoginLog loginLog = new SystemLoginLog();
        loginLog.setLoginUsername(dto.getUsername());
        loginLog.setLoginTime(new Date());
        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());
//        if(isDebug == null  || !isDebug  && dto.getCheckCode()){
        SystemLoginLog loginLog = getInitLoginlog(dto.getUsername(),request);
        if((isDebug == null  || !isDebug) && (Objects.isNull(dto.getCheckCode()) || dto.getCheckCode()) ){
            // 校验验证码
            try {
                captchaService.check(dto.getUuid(), dto.getCode());
@@ -161,49 +151,17 @@
                loginLog.setReason(e.getMessage().length() > 200 ? (e.getMessage().substring(0, 190) + "...") : e.getMessage());
                loginLog.setSuccess(Boolean.FALSE);
                systemLoginLogService.create(loginLog);
                throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT.getCode(),"对不起,验证码不正确!");
                throw e;
            }
//        }
        // 根据用户名查询用户对象
        SystemUser queryDto = new SystemUser();
        queryDto.setUsername(dto.getUsername());
        queryDto.setDeleted(Boolean.FALSE);
        SystemUser user = systemUserService.findOne(queryDto);
        if (user == null) {
            throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT);
        }
        if(!Constants.equalsInteger(user.getSource(),Constants.ZERO)){
            throw new BusinessException(ResponseStatus.NO_ALLOW_LOGIN);
        }
        String pwd = Utils.Secure.encryptPassword(new String(dto.getPassword()), user.getSalt());
        // 比较密码
        if( !StringUtils.equals(pwd, user.getPassword())){
            throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT);
        }
        dealOpenIdBiz(user,dto.getOpenid());
        Company company = new Company();
        if(Objects.nonNull(user.getCompanyId())){
            company = companyMapper.selectById(user.getCompanyId());
        }
        // 获取登录用户信息
        List<SystemRole> roles = systemRoleService.findByUserId(user.getId());
        List<SystemPermission> permissions = systemPermissionService.findByUserId(user.getId());
        SystemRole rt = new SystemRole();
        rt.setDeleted(Boolean.FALSE);
        //数据部门权限集合
        user.setCompanyIdList(systemDataPermissionService.selectHighRole(new SystemDataPermission(),rt,user));
        LoginUserInfo userInfo = LoginUserInfo.from(user, roles, permissions,company,null);
        return  userInfo;
        LoginUserInfo user = dealLoginByPwdNewBiz(dto.getUsername(),dto.getPassword(),null,dto.getOpenid(),request);
        systemLoginLogService.create(loginLog);
        return  user;
    }
    @Override
    public LoginUserInfo loginByPasswordForPda(LoginDTO dto, ServerHttpRequest request) {
    private SystemLoginLog getInitLoginlog(String username, ServerHttpRequest request) {
        SystemLoginLog loginLog = new SystemLoginLog();
        loginLog.setLoginUsername(dto.getUsername());
        loginLog.setLoginUsername( username);
        loginLog.setLoginTime(new Date());
        loginLog.setSystemVersion(systemVersion);
//        loginLog.setLocation(Utils.Location.getLocationString(loginLog.getIp()));
@@ -214,6 +172,57 @@
            loginLog.setOsInfo(Utils.User_Client.getOS(request));
        }
        loginLog.setServerIp(Utils.Server.getIP());
        return  loginLog;
    }
    @Override
    public LoginUserInfo loginH5ByPhone(LoginPhoneDTO dto, ServerHttpRequest request) {
        isCaptcheValide(dto.getPhone(),dto.getCode());//检查验证码
        SystemLoginLog loginLog = getInitLoginlog(dto.getPhone(),request);
        LoginUserInfo userInfo = dealLoginByPwdNewBiz(null,null,dto.getPhone(),dto.getOpenid(), request );
        systemLoginLogService.create(loginLog);
        return userInfo;
    }
    private LoginUserInfo dealLoginByPwdNewBiz(String username,String pwd, String phone, String openid, ServerHttpRequest request) {
        // 根据用户名查询用户对象
        SystemUser queryDto = new SystemUser();
        queryDto.setMobile(phone);
        queryDto.setUsername(username);
        queryDto.setType(Constants.memberType.internal);
        queryDto.setDeleted(Boolean.FALSE);
        SystemUser user = systemUserService.findOne(queryDto);
        if (user == null) {
            throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT);
        }
        if(!Constants.equalsInteger(user.getSource(),Constants.ZERO)){
            throw new BusinessException(ResponseStatus.NO_ALLOW_LOGIN);
        }
        if(StringUtils.isNotBlank( pwd)){
            String pppp = Utils.Secure.encryptPassword(new String(pwd), user.getSalt());
            // 比较密码
            if( !StringUtils.equals(pppp, user.getPassword())){
                throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT);
            }
        }
        dealOpenIdBiz(user,openid);
        Company company = new Company();
        if(Objects.nonNull(user.getCompanyId())){
            company = companyMapper.selectById(user.getCompanyId());
        }
        // 获取登录用户信息
        List<SystemRole> roles = systemRoleService.findByUserId(user.getId());
        List<SystemPermission> permissions = systemPermissionService.findByUserId(user.getId());
        SystemRole rt = new SystemRole();
        rt.setDeleted(Boolean.FALSE);
        //数据部门权限集合
        user.setCompanyIdList(systemDataPermissionService.selectHighRole(new SystemDataPermission(),rt,user));
        LoginUserInfo userInfo = LoginUserInfo.from(user, roles, permissions,company,null);
        return  userInfo;
    }
    @Override
    public LoginUserInfo loginByPasswordForPda(LoginDTO dto, ServerHttpRequest request) {
        SystemLoginLog loginLog =getInitLoginlog(dto.getUsername(),request);
        // 根据用户名查询用户对象
        SystemUser queryDto = new SystemUser();
        queryDto.setUsername(dto.getUsername());
@@ -290,20 +299,7 @@
    @Override
    public LoginUserInfo loginByPhone(LoginPhoneDTO dto, ServerHttpRequest request) {
        SystemLoginLog loginLog = new SystemLoginLog();
        loginLog.setLoginUsername(dto.getPhone());
        loginLog.setLoginTime(new Date());
        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());
        SystemLoginLog loginLog =getInitLoginlog(dto.getPhone(),request);
        // 根据用户名查询用户对象
        SystemUser queryDto = new SystemUser();
        queryDto.setMobile(dto.getPhone());
@@ -349,42 +345,46 @@
        // 获取登录用户信息
        List<SystemRole> roles = systemRoleService.findByUserId(user.getId());
        List<SystemPermission> permissions = systemPermissionService.findByUserId(user.getId());
        SystemRole rt = new SystemRole();
        rt.setDeleted(Boolean.FALSE);
        //数据部门权限集合
        user.setCompanyIdList(systemDataPermissionService.selectHighRole(new SystemDataPermission(),rt,user));
        LoginUserInfo userInfo = LoginUserInfo.from(user, roles, permissions,company,null);
        systemLoginLogService.create(loginLog);
        return  userInfo;
    }
    @Override
    public LoginUserInfo driverLogin(LoginDTO dto, ServerHttpRequest request) {
        SystemLoginLog loginLog = new SystemLoginLog();
        loginLog.setLoginUsername(dto.getUsername());
        loginLog.setLoginTime(new Date());
        loginLog.setReason("【公众号】司机端登陆:openid="+dto.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());
        SystemLoginLog loginLog =getInitLoginlog(dto.getUsername(),request);
        LoginUserInfo userInfo = dealLoginDriverBiz(dto.getUsername(),dto.getPassword(),null,dto.getOpenid());
        systemLoginLogService.create(loginLog);
        return  userInfo;
    }
    @Override
    public LoginUserInfo loginDriverByPhone(LoginPhoneDTO dto, ServerHttpRequest request){
        isCaptcheValide(dto.getPhone(),dto.getCode());//验证码校验
        SystemLoginLog loginLog =getInitLoginlog(dto.getPhone(),request);
        LoginUserInfo userInfo = dealLoginDriverBiz(null,null,dto.getPhone(),dto.getOpenid());
        systemLoginLogService.create(loginLog);
        return  userInfo;
    }
    private LoginUserInfo dealLoginDriverBiz(String username,String password, String phone, String openid) {
        // 根据用户名查询用户对象
        SystemUser queryDto = new SystemUser();
        queryDto.setUsername(dto.getUsername());
        queryDto.setUsername(username);
        queryDto.setMobile(phone);
        queryDto.setDeleted(Boolean.FALSE);
        SystemUser user = systemUserService.findOne(queryDto);
        if (user == null) {
            throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT);
        }
        //注册司机/劳务人员
        if((Constants.equalsInteger(user.getType(),Constants.ZERO)||Constants.equalsInteger(user.getType(),Constants.TWO)) && Objects.nonNull(user.getMemberId())){
        //注册司机
        if((Constants.equalsInteger(user.getType(),Constants.ZERO)
                ||Constants.equalsInteger(user.getType(),Constants.TWO))
                && Objects.nonNull(user.getMemberId())){
            if(Constants.equalsInteger(user.getType(),Constants.TWO)){
                if(Objects.isNull(user.getCompanyId())){
                    throw new BusinessException(ResponseStatus.NO_ALLOW_LOGIN);
@@ -397,19 +397,22 @@
        }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())){
            throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT);
        if(StringUtils.isNotBlank(password)){
            String pwd = Utils.Secure.encryptPassword(new String(password), user.getSalt());
            // 比较密码
            if( !StringUtils.equals(pwd, user.getPassword())){
                throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT);
            }
        }
        dealOpenIdBiz(user,dto.getOpenid());
        dealOpenIdBiz(user,openid);
        Company company = new Company();
        if(Objects.nonNull(user.getCompanyId())){
            company = companyMapper.selectById(user.getCompanyId());
        }
        LoginUserInfo userInfo = LoginUserInfo.from(user, null, null,company,null);
        return  userInfo;
        return userInfo;
    }
    public   void isCaptcheValide(  String phone, String captche) {
        SmsEmail model = smsEmailMapper.selectOne(new QueryWrapper<SmsEmail>().lambda()
                .eq(SmsEmail::getType, Constants.ZERO)
@@ -439,19 +442,7 @@
    @Transactional
    public LoginUserInfo loginDriverWithCode(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));
        }
        SystemLoginLog loginLog =getInitLoginlog(param.getPhone(),request);
        loginLog.setServerIp(Utils.Server.getIP());
        // 根据用户名查询用户对象
        SystemUser queryDto = new SystemUser();
@@ -459,32 +450,7 @@
        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);
            systemUser = autoRegisterUser(Constants.memberType.driver,param.getPhone(),param.getOpenid(),true);
        }else{
            if(!Constants.equalsInteger(systemUser.getType(),Constants.memberType.driver)){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起,请使用正确的司机账号登陆!");
@@ -496,25 +462,56 @@
            company = companyMapper.selectById(systemUser.getCompanyId());
        }
        LoginUserInfo userInfo = LoginUserInfo.from(systemUser, null, null,company,null);
        systemLoginLogService.create(loginLog);
        return  userInfo;
    }
    private SystemUser autoRegisterUser(int type, String phone,String openid,boolean needMember) {
        String salt = RandomStringUtils.randomAlphabetic(6);
        String pwd =Utils.Secure.encryptPassword(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.INITIAL_PASSWORD).getCode(), salt);
        Integer memberId = null;
        if(needMember){
            Member member = new Member();
            member.setCreateDate(new Date());
            member.setIsdeleted(Constants.ZERO);
            member.setType(Constants.memberType.driver);
            member.setPhone(phone);
            member.setStatus(Constants.ZERO);
            member.setOpenid(openid);
            member.setPassward(pwd);
            memberMapper.insert(member);
            memberId = member.getId();
        }
       SystemUser  systemUser = new SystemUser();
        systemUser.setCreateTime(new Date());
        systemUser.setCreateUser(1);
        systemUser.setDeleted(Boolean.FALSE);
        systemUser.setUsername(phone);
        systemUser.setRealname(null);
        systemUser.setMemberId(memberId);
        systemUser.setMobile(phone);
        systemUser.setSalt(salt);
        systemUser.setPassword(pwd);
        systemUser.setStatus(Constants.ZERO);
        systemUser.setType(type);
        systemUser.setSource(Constants.TWO);
        systemUser.setOpenid(openid);
        systemUserMapper.insert(systemUser);
        return systemUser;
    }
    @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));
        TmsEmployeeListRequest tp = new TmsEmployeeListRequest();
        tp.setTel(param.getPhone());
        TmsEmployeeListResponse response = tmsService.getEmployeeList(tp);
        if(response == null || response.getTel()==null){
            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起,您输入的手机号不正确!");
        }
        loginLog.setServerIp(Utils.Server.getIP());
        SystemLoginLog loginLog = getInitLoginlog(param.getPhone(),request);
        // 根据用户名查询用户对象
        SystemUser queryDto = new SystemUser();
        queryDto.setUsername(param.getPhone());
@@ -522,32 +519,8 @@
        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);
            //新增管控人员数据
            systemUser = systemUser = autoRegisterUser(Constants.memberType.gkuser,param.getPhone(),param.getOpenid(),false);
        }else{
            if(!Constants.equalsInteger(systemUser.getType(),Constants.memberType.gkuser)){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起,请使用正确的管控人员手机号登陆!");
@@ -555,6 +528,7 @@
        }
        dealOpenIdBizForGk(systemUser,param.getOpenid());
        LoginUserInfo userInfo = LoginUserInfo.from(systemUser, null, null,null,null);
        systemLoginLogService.create(loginLog);
        return  userInfo;
    }
@@ -591,7 +565,6 @@
        LoginUserInfo userInfo = LoginUserInfo.from(user, roles, permissions,company,null);
        String token = jwtTokenUtil.generateToken(userInfo);
        return  token;
    }
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsCloudController.java
@@ -33,13 +33,14 @@
    @ApiOperation("【TMS】电子锁上锁时间接口")
    @LoginNoRequired
    @PostMapping("/lockStatusQuery")
    public TmsBaseResponse<List<TmsLockStatusQueryResponse>> lockStatusQuery(@RequestBody TmsLockStatusQueryRequest request )   {
    public TmsBaseResponse<List<TmsLockStatusQueryResponse>> lockStatusQuery(@RequestBody TmsLockStatusQueryRequest request, @RequestHeader(Constants.HEADER_USER_TOKEN) String token )   {
        return  tmsService.lockStatusQuery(request);
    }
    @ApiOperation("【TMS】合同列表接口")
    @LoginNoRequired
//    @LoginNoRequired
    @PostMapping("/orderList")
    public ApiResponse<TmsBasePageResponse<TmsOrderListResponse>> orderList(@RequestBody TmsOrderListRequest param )   {
    public ApiResponse<TmsBasePageResponse<TmsOrderListResponse>> orderList(@RequestBody TmsOrderListRequest param , @RequestHeader(Constants.HEADER_USER_TOKEN) String token)   {
        LoginUserInfo user = this.getLoginUser(token);
        if(param == null){
            param = new TmsOrderListRequest();
        }
@@ -55,18 +56,19 @@
        if(param.getPager().getRows() == null){
            param.getPager().setRows(10);
        }
        if(StringUtils.isBlank(param.getParameters().getPhoneNumber())){
        param.getParameters().setPhoneNumber(user.getMobile());
    /*    if(StringUtils.isBlank(param.getParameters().getPhoneNumber())){
            param.getParameters().setPhoneNumber("00000000000");//手机号必填
        }
        }*/
        if(param.getParameters().getContractNumbers()==null || param.getParameters().getContractNumbers().size()==0){
            param.getParameters().setContractNumbers(null);
        }
        return  ApiResponse.success(tmsService.orderList(param));
    }
    @ApiOperation("【TMS】合同详情接口")
    @LoginNoRequired
//    @LoginNoRequired
    @PostMapping("/orderInfo")
    public ApiResponse<TmsOrderInfoResponse> ordreInfo(@RequestBody TmsOrderInfoRequest request )   {
    public ApiResponse<TmsOrderInfoResponse> ordreInfo(@RequestBody TmsOrderInfoRequest request , @RequestHeader(Constants.HEADER_USER_TOKEN) String token)   {
        return ApiResponse.success(tmsService.orderInfo(request));
    }
    @ApiOperation("【TMS】司机待办任务列表接口")
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -19,6 +19,7 @@
import com.doumee.core.haikang.model.param.respose.UserAddResponse;
import com.doumee.core.haikang.model.param.respose.UserDelResponse;
import com.doumee.core.haikang.service.HKService;
import com.doumee.service.business.third.TmsService;
import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
@@ -49,6 +50,8 @@
import com.doumee.service.business.SmsEmailService;
import com.doumee.service.business.impl.hksync.HkSyncEmpowerServiceImpl;
import com.doumee.service.business.impl.hksync.ferp.HkSyncOrgUserToHKServiceImpl;
import com.doumee.service.business.third.model.request.TmsEmployeeListRequest;
import com.doumee.service.business.third.model.response.TmsEmployeeListResponse;
import com.doumee.service.system.SystemLoginService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.collections.CollectionUtils;
@@ -118,6 +121,8 @@
    @Autowired
    private VisitsMapper visitsMapper;
    @Autowired
    private TmsService tmsService;
    @Autowired
    private SystemUserMapper systemUserMapper;
@@ -1725,76 +1730,119 @@
        }
        wxAuthorizeVO.setOpenid(openId);
        if(source==1){
            //根据openId 查询用户信息
            Member member = memberJoinMapper.selectJoinOne(Member.class,new MPJLambdaWrapper<Member>()
                    .selectAll(Member.class)
                    .selectAs(Company::getName,Member::getCompanyName)
                    .leftJoin(Company.class,Company::getId,Member::getCompanyId)
                    .eq(Member::getOpenid,openId)
                    .eq(Member::getType,source)
                    .eq(Member::getIsdeleted,Constants.ZERO)
                    .orderByDesc(Member::getCreateDate)
                    .last(" limit 1 ")
            );
            //非访客用户 进行判断是否存在用户
            if(!Objects.isNull(member)){
                if(member.getIsdeleted() == Constants.ONE){
                    throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"用户已删除,请联系管理员");
                }
                if(member.getStatus() != Constants.ZERO){
                    throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"用户已禁用,请联系管理员");
                }
                if(StringUtils.isNotBlank(member.getIdcardNo())){
                    member.setIdcardDecode(DESUtil.decrypt(Constants.EDS_PWD, member.getIdcardNo()));
                }
                String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() +
                        systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
                member.setPrefixUrl(prefixUrl);
                wxAuthorizeVO.setMember(member);
                //司机 与 内部人员 提供token
                if(Constants.equalsInteger(source,Constants.ZERO)||Constants.equalsInteger(source,Constants.TWO)){
                    SystemUser systemUser = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda().eq(SystemUser::getMemberId,member.getId())
                            .eq(SystemUser::getStatus,Constants.ZERO).last(" limit 1 "));
                    if(Objects.nonNull(systemUser)){
                        String token = systemLoginService.loginByUserId(systemUser.getId());
                        wxAuthorizeVO.setToken(token);
                    }
                }
            }
            //处理普通访客人员自动授权逻辑
            dealVisitUserAuthBiz(wxAuthorizeVO,openId,source);
        }else if(source == 3){
            //处理tms管控人员自动授权逻辑
            dealGkUserAuthBiz(wxAuthorizeVO,openId,source);
        }else{
            //如果是司机或者内部人员,则从system_user查询
            SystemUser user = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
                    .eq(SystemUser::getOpenid,openId)
                    .eq(Objects.nonNull(source)&&Constants.equalsInteger(source,Constants.TWO),SystemUser::getType,source)
                    .eq(SystemUser::getDeleted,Boolean.FALSE)
                    .last(" limit 1 "));
            //非访客用户 进行判断是否存在用户
            if(!Objects.isNull(user)){
                Member member = memberMapper.selectById(user.getMemberId());
                if(member.getIsdeleted() == Constants.ONE){
                    throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"用户已删除,请联系管理员");
                }
                if(member.getStatus() != Constants.ZERO){
                    throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"用户已禁用,请联系管理员");
                }
                if(StringUtils.isNotBlank(member.getIdcardNo())){
                    member.setIdcardDecode(DESUtil.decrypt(Constants.EDS_PWD, member.getIdcardNo()));
                }
                String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() +
                        systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
                member.setPrefixUrl(prefixUrl);
                wxAuthorizeVO.setMember(member);
                //司机 与 内部人员 提供token
                String token = systemLoginService.loginByUserId(user.getId());
                wxAuthorizeVO.setToken(token);
            }
            dealSystemUserAuthBiz(wxAuthorizeVO,openId,source);
        }
        return wxAuthorizeVO;
    }
    private void dealSystemUserAuthBiz(WxAuthorizeVO wxAuthorizeVO, String openId, Integer source) {
        SystemUser user = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
                .eq(SystemUser::getOpenid,openId)
                .eq(Objects.nonNull(source)&&Constants.equalsInteger(source,Constants.TWO),SystemUser::getType,source)
                .eq(SystemUser::getDeleted,Boolean.FALSE)
                .last(" limit 1 "));
        //非访客用户 进行判断是否存在用户
        if(!Objects.isNull(user)){
            Member member = memberMapper.selectById(user.getMemberId());
            if(member.getIsdeleted() == Constants.ONE){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"用户已删除,请联系管理员");
            }
            if(member.getStatus() != Constants.ZERO){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"用户已禁用,请联系管理员");
            }
            if(StringUtils.isNotBlank(member.getIdcardNo())){
                member.setIdcardDecode(DESUtil.decrypt(Constants.EDS_PWD, member.getIdcardNo()));
            }
            String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() +
                    systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
            member.setPrefixUrl(prefixUrl);
            wxAuthorizeVO.setMember(member);
            //司机 与 内部人员 提供token
            String token = systemLoginService.loginByUserId(user.getId());
            wxAuthorizeVO.setToken(token);
        }
    }
    private void dealGkUserAuthBiz(WxAuthorizeVO wxAuthorizeVO, String openId, Integer source) {
        //如果是司机或者内部人员,则从system_user查询
        SystemUser user = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
                .eq(SystemUser::getOpenid,openId)
                .eq(SystemUser::getType,source)
                .eq(Objects.nonNull(source)&&Constants.equalsInteger(source,Constants.TWO),SystemUser::getType,source)
                .eq(SystemUser::getDeleted,Boolean.FALSE)
                .last(" limit 1 "));
        //非访客用户 进行判断是否存在用户
        if(!Objects.isNull(user)){
            TmsEmployeeListRequest tp = new TmsEmployeeListRequest();
            tp.setTel(user.getMobile());
            TmsEmployeeListResponse response = tmsService.getEmployeeList(tp);
            if(response == null || response.getTel()==null){
                throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起,该账户人员信息不正确,如有疑问请联系系统管理员查看!");
            }
            Member member = memberMapper.selectById(user.getMemberId());
            if(member.getIsdeleted() == Constants.ONE){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"用户已删除,请联系管理员");
            }
            if(member.getStatus() != Constants.ZERO){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"用户已禁用,请联系管理员");
            }
            if(StringUtils.isNotBlank(member.getIdcardNo())){
                member.setIdcardDecode(DESUtil.decrypt(Constants.EDS_PWD, member.getIdcardNo()));
            }
            String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() +
                    systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
            member.setPrefixUrl(prefixUrl);
            wxAuthorizeVO.setMember(member);
            //司机 与 内部人员 提供token
            String token = systemLoginService.loginByUserId(user.getId());
            wxAuthorizeVO.setToken(token);
        }
    }
    private void dealVisitUserAuthBiz(WxAuthorizeVO wxAuthorizeVO, String openId,Integer source) {
        Member member = memberJoinMapper.selectJoinOne(Member.class,new MPJLambdaWrapper<Member>()
                .selectAll(Member.class)
                .selectAs(Company::getName,Member::getCompanyName)
                .leftJoin(Company.class,Company::getId,Member::getCompanyId)
                .eq(Member::getOpenid,openId)
                .eq(Member::getType,source)
                .eq(Member::getIsdeleted,Constants.ZERO)
                .orderByDesc(Member::getCreateDate)
                .last(" limit 1 ")
        );
        //非访客用户 进行判断是否存在用户
        if(!Objects.isNull(member)){
            if(member.getIsdeleted() == Constants.ONE){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"用户已删除,请联系管理员");
            }
            if(member.getStatus() != Constants.ZERO){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"用户已禁用,请联系管理员");
            }
            if(StringUtils.isNotBlank(member.getIdcardNo())){
                member.setIdcardDecode(DESUtil.decrypt(Constants.EDS_PWD, member.getIdcardNo()));
            }
            String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() +
                    systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
            member.setPrefixUrl(prefixUrl);
            wxAuthorizeVO.setMember(member);
            //司机 与 内部人员 提供token
            if(Constants.equalsInteger(source,Constants.ZERO)||Constants.equalsInteger(source,Constants.TWO)){
                SystemUser systemUser = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda().eq(SystemUser::getMemberId,member.getId())
                        .eq(SystemUser::getStatus,Constants.ZERO).last(" limit 1 "));
                if(Objects.nonNull(systemUser)){
                    String token = systemLoginService.loginByUserId(systemUser.getId());
                    wxAuthorizeVO.setToken(token);
                }
            }
        }
    }
    @Override