最新版本

jiangping

2024-05-27 32d0e82e741bfee3a0a83a712bc0992dedad7b9b

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

@@ -202,6 +202,7 @@
        insert.setCanVisit(Constants.ZERO);//默认不可访问
        insert.setAuthStatus(Constants.ZERO);
        insert.setName(member.getName());
        insert.setHkId(UUID.randomUUID().toString().replace("-",""));
        insert.setHkStatus(Constants.ONE);
        insert.setSex(Constants.getSexByCardNo( member.getIdcardNo()));//根据身份证号获取性别
        insert.setBirthday( DateUtil.fromStringToDate("yyyyMMdd",IdcardUtil.getBirthByIdCard(member.getIdcardNo())));
@@ -472,6 +473,10 @@
        }
        member.setHkId(model.getHkId());
        member.setFaceId(model.getFaceId());//人脸编码
        if(StringUtils.equals(model.getFaceImg(),member.getFaceImg())){
            //如果人脸没变化
            member.setFaceImg(null);
        }
        return model;
    }

@@ -529,9 +534,7 @@
    }

    @Override
    public void deleteById(Integer id,LoginUserInfo user) {
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();

    public void deleteById(Integer id,LoginUserInfo loginUserInfo) {
        Member member=new Member();
        member.setId(id);
        member.setIsdeleted(Constants.ZERO);
@@ -565,7 +568,7 @@
        }else{
            if( ! (Constants.equalsInteger(memberRole.getTimeType(),Constants.ZERO)
                    ||Constants.equalsInteger(memberRole.getTimeType(),Constants.TWO)
                    || (Constants.equalsObject(memberRole.getTimeType(),Constants.ONE)
                    || (Constants.equalsInteger(memberRole.getTimeType(),Constants.ONE)
                    && memberRole.getStartTime() !=null && memberRole.getEndTime() != null ))){
                throw  new BusinessException(ResponseStatus.BAD_REQUEST);
            }
@@ -576,7 +579,7 @@
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"有效期截止日期不能小于开始时间！");
            }
        }
        if(Constants.equalsObject(memberRole.getTimeType(),Constants.ZERO) ){
        if(Constants.equalsInteger(memberRole.getTimeType(),Constants.ZERO) ){
           memberRole.setStartTime(null);
           memberRole.setEndTime(null);
        }
@@ -586,12 +589,12 @@
                //如果员工信息不合法直接跳过
               continue;
            }
            if(StringUtils.isNotBlank(member.getFaceId()) || !Constants.equalsInteger(member.getFaceStatus(),Constants.ONE)){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，用户【"+member.getName()+"】的人脸信息不满足授权条件，请返回完善后再进行该操作！");
            }
            member.setStartTime(memberRole.getStartTime());
            member.setEndTime(memberRole.getEndTime());
            Integer ischange = getRoleIdByParam(memberRole.getRoleIds(),member,memberRoleMapper,deviceRoleMapper);
            if(ischange == 0){
                return;//未发现权限变化，直接返回
            }
            if(memberRole.getRoleIds()!=null && memberRole.getRoleIds().length>0 && StringUtils.isBlank(member.getRoleId())){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，未查询到有效门禁组数据");
            }
@@ -944,10 +947,10 @@
       if(model ==null) {
            throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，人员信息不存在！");
       }
        if(!Constants.equalsObject(model.getIsdeleted(),Constants.ONE)){
        if(!Constants.equalsInteger(model.getIsdeleted(),Constants.ONE)){
            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，只有针对离职人员可进行该操作！");
       }
        if(Constants.equalsObject(model.getHkStatus(),Constants.ONE)){
        if(Constants.equalsInteger(model.getHkStatus(),Constants.ONE)){
            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，该人员已被删除！");
       }
        if(StringUtils.isBlank(model.getHkId())){
@@ -962,7 +965,7 @@
            throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，人员信息不存在！");
        }
       if(model.getCompanyId()!=null) {
           if(Constants.equalsObject(member.getHeadStatus(),Constants.ONE)){
           if(Constants.equalsInteger(member.getHeadStatus(),Constants.ONE)){
               //如果是取消主管
               companyMapper.update(null,new UpdateWrapper<Company>().lambda()
                       .eq(Company::getId,model.getCompanyId())
@@ -1311,7 +1314,7 @@
//                .eq(Member::getStatus,Constants.Status.ENABLE.getValue())
//                .eq(Member::getType,Constants.memberType.internal)
                .eq(pageWrap.getModel().getHkStatus()!=null,Member::getHkStatus,pageWrap.getModel().getHkStatus())
                .orderByDesc(!Constants.equalsObject(pageWrap.getModel().getIsdeleted(),Constants.ONE),Member::getCreateDate)
                .orderByDesc(!Constants.equalsInteger(pageWrap.getModel().getIsdeleted(),Constants.ONE),Member::getCreateDate)
                .orderByDesc(Constants.equalsInteger(pageWrap.getModel().getIsdeleted(),Constants.ONE),Member::getEditDate);
        if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin())==DataSyncConfig.origin.erp){
            queryWrapper.eq( StringUtils.isNotBlank(pageWrap.getModel().getErpOrgId()),Member::getErpOrgId,pageWrap.getModel().getErpOrgId());
@@ -1830,17 +1833,20 @@
    private void dealHkUserBizBatch(List<Member> newList) {
        List<String> hkIds = new ArrayList<>();
        try {
            memberMapper.insertBatchSomeColumn(newList);
            List<SystemUser> userList = new ArrayList<>();
            for(Member insert: newList){
                if(dealHkUserBiz(insert)){
                    //创建系统登陆账号（默认无任何角色）
                    if(Constants.equalsInteger(insert.getCompanyType(),Constants.ONE)){
                        //如果是内部组织人员，新增系统登陆账号
                        userList.add(createSystemUser(insert));
                    }
                }else{
                    throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，员工信息【"+insert.getName()+"】同步安防平台失败，请稍后重试！");
                }
            }
            memberMapper.insertBatchSomeColumn(newList);
            List<SystemUser> userList = new ArrayList<>();
            for(Member insert: newList){
                //创建系统登陆账号（默认无任何角色）
                if(Constants.equalsInteger(insert.getCompanyType(),Constants.ONE)){
                    //如果是内部组织人员，新增系统登陆账号
                    userList.add(createSystemUser(insert));
                }
            }
            if(userList.size()>0){
@@ -1852,7 +1858,6 @@
            throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，员工信息导入失败，请稍后重试！");
        }
    }

    private Member checkModelParam(MemberImport model, List<Member> newList
            ,int index
            ,LoginUserInfo loginUserInfo
@@ -1883,7 +1888,7 @@
        if(company == null){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+(index+3)+"行组织名称【"+model.getCompanyName()+"】不存在，请检查表格内容！");
        }
        if(companyType != null && !Constants.equalsObject(companyType,company.getType())){
        if(companyType != null && !Constants.equalsInteger(companyType,company.getType())){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+(index+3)+"行组织名称【"+model.getCompanyName()+"】类型不正确，请检查表格内容！");
        }
        String candNo = DESUtil.encrypt(Constants.EDS_PWD, model.getIdcardNo());