最新版本541200007

jiangping

2024-12-05 f6ba5de2578c58a738f35b29a708c523ccb518ba

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java

@@ -62,6 +62,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;

import java.math.BigDecimal;
import java.util.Date;
import java.util.*;
import java.util.stream.Collectors;
@@ -210,6 +211,9 @@
        insert.setHkId(UUID.randomUUID().toString().replace("-",""));
        insert.setHkStatus(Constants.ONE);
        insert.setSex(Constants.getSexByCardNo( member.getIdcardNo()));//根据身份证号获取性别
        insert.setJobDate(member.getJobDate());
        insert.setIsDangyuan(member.getIsDangyuan());
        insert.setPositionId(member.getPositionId());
        if(StringUtils.isNotBlank(member.getIdcardNo())){
            insert.setBirthday( DateUtil.fromStringToDate("yyyyMMdd",IdcardUtil.getBirthByIdCard(member.getIdcardNo())));
            insert.setIdcardNo(DESUtil.encrypt(Constants.EDS_PWD, member.getIdcardNo()));//身份证号加密
@@ -1124,6 +1128,7 @@
                .selectAs(Company::getName,Member::getCompanyName) ;
        queryWrapper.selectAs(Position::getName,Member::getPositionName);
        queryWrapper.leftJoin(Position.class,Position::getId,Member::getPositionId);
        queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
        if(StringUtils.isNotBlank(member.getName())){
            queryWrapper.like(Member::getName,member.getName());
        }
@@ -1138,6 +1143,12 @@
        }
        if(null != member.getCompanyId()) {
            queryWrapper.eq(Member::getCompanyId,member.getCompanyId());
        }
        if(null != member.getQuerySpecial() && Constants.equalsInteger(member.getQuerySpecial(),Constants.ONE)){
            String companySpecialId = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SPECIAL_COMPANY_ID).getCode();
            if(StringUtils.isNotBlank(companySpecialId)){
                queryWrapper.apply(" find_in_set('"+companySpecialId+"',REPLACE(t3.company_path,'/',',')) ");
            }
        }
        queryWrapper.eq(Member::getIsdeleted,Constants.ZERO);
        queryWrapper.eq(Member::getWorkStatus,Constants.ZERO);
@@ -1374,6 +1385,8 @@
        queryWrapper.selectAs(Company::getCompanyNamePath,Member::getCompanyNamePath);
        queryWrapper.selectAs(Company::getCompanyPath,Member::getCompanyPath);
        queryWrapper.select(" ( select count(1) from member_card mc where mc.isdeleted = 0 and  mc.member_id = t.id ) as  memberCardCount ");
        queryWrapper.select(" ( select max(tt.END_TIME) from train_time tt where tt.isdeleted = 0 and  tt.member_id = t.id ) as  trainEndTime ");

        queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,Member::getEditor);
        queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
        queryWrapper.selectAs(Position::getName,Member::getPositionName);
@@ -1449,6 +1462,19 @@
                if(StringUtils.isNotBlank(memberInfoDTO.getImgurl())){
                    memberInfoDTO.setImgurlFull(prefixUrl + memberInfoDTO.getImgurl());
                }
                memberInfoDTO.setHasFace(memberInfoDTO.getFaceId()!=null?Constants.ONE:Constants.ZERO);
                if(Constants.equalsInteger(Constants.ONE,memberInfoDTO.getAuthStatus())){
                    if(memberInfoDTO.getStartTime() ==null || memberInfoDTO.getEndTime() ==null ){
                        memberInfoDTO.setRoleTimeInfo("长期有效");
                    }else{
                        memberInfoDTO.setRoleTimeInfo(DateUtil.getPlusTime2(memberInfoDTO.getStartTime())+"至"+DateUtil.getPlusTime2(memberInfoDTO.getEndTime()));
                    }
                }else{
                    memberInfoDTO.setRoleTimeInfo("-");
                }
                memberInfoDTO.setAuthStatus(Constants.formatIntegerNum(memberInfoDTO.getAuthStatus()));
                memberInfoDTO.setWorkStatus(Constants.formatIntegerNum(memberInfoDTO.getWorkStatus()));
                memberInfoDTO.setSex(Constants.formatIntegerNum(memberInfoDTO.getSex()));
            }
        }
        return PageData.from(memberIPage);
@@ -1628,9 +1654,11 @@
        }catch (Exception e){

        }
        List<Member> memberList = memberMapper.selectList(new QueryWrapper<Member>()
                .lambda().eq(Member::getIsdeleted,Constants.ZERO)
                .eq(Member::getType,Constants.memberType.internal)
        List<Member> memberList = memberJoinMapper.selectJoinList(Member.class,new MPJLambdaWrapper<Member>()
                .selectAll(Member.class)
                .leftJoin(Company.class,Company::getId,Member::getCompanyId)
                .eq(Member::getIsdeleted,Constants.ZERO)
                .eq(Company::getType,Constants.ZERO)
                .eq(Member::getStatus,Constants.ZERO)
                .isNotNull(Member::getHkId)
                .apply("to_days(LAST_VISIT_DATE)+ "+days+" < to_days(now())" ));
@@ -1669,6 +1697,7 @@
    /**
     * 微信授权接口
     * @param code
     * 来源:0=司机；1=访客；2=内部员工
     * @return
     */
    @Override
@@ -1688,42 +1717,73 @@
//        String openId = "12345";
        WxAuthorizeVO wxAuthorizeVO = new WxAuthorizeVO();
        wxAuthorizeVO.setOpenid(openId);
        //根据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);
        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);
                    }
                }
            }
        }else{
            //如果是司机或者内部人员，则从system_user查询
            SystemUser user = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
                    .eq(SystemUser::getOpenid,openId)
                    .eq(SystemUser::getType,source)
                    .eq(SystemUser::getDeleted,Boolean.FALSE)
                    .last(" limit 1 "));
            //非访客用户 进行判断是否存在用户
            if(!Objects.isNull(user)){
                Member member = memberMapper.selectById(user.getId());
                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);
            }
        }


        return wxAuthorizeVO;
    }

@@ -1744,7 +1804,7 @@
                .eq(Member::getStatus,Constants.ZERO)
                .eq(Member::getWorkStatus,Constants.ZERO)
                .eq(Member::getCanVisit,Constants.ONE)
                .eq(Member::getType,Constants.memberType.internal) 
                .eq(Company::getType,Constants.ONE)
        );
        List<MemberVO> memberVOList = new ArrayList<>();
        if (com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(memberList)) {
@@ -1853,7 +1913,7 @@
            ExcelImporter ie = null;
            List<MemberImport> dataList =null;
            try {
                ie = new ExcelImporter(file,1,0);
                ie = new ExcelImporter(file,2,0);
                dataList = ie.getDataList(MemberImport.class,null);
            }  catch (Exception e) {
                e.printStackTrace();
@@ -1938,6 +1998,11 @@
        if (!PhoneUtil.isPhone(model.getPhone())){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+(index+3)+"行手机号【"+model.getPhone()+"】格式不正确，请检查表格内容！");
        }
        if(model.getPhone().indexOf(".")>=Constants.ZERO){
            model.setPhone(
                    String.valueOf(new BigDecimal(model.getPhone()).intValue())
            );
        }
        if(StringUtils.isNotBlank(model.getIdcardNo())){
            if ( !isDebug && !IdcardUtil.isValidCard(model.getIdcardNo())){
                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+(index+3)+"行身份证号【"+model.getIdcardNo()+"】格式不正确，请检查表格内容！");