ERP接口

k94314517

2024-03-07 b613b1c082f646e5de9a88ea3f072ad9c5cf898e

ERP接口

 server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java

@@ -112,6 +112,8 @@
    @TableField(exist = false)
    public String visitCompanyName;

    @ApiModelProperty(value = "查询类型 0劳务访客 1普通访客 2内部员工 3车辆信息 多个以,分割")
    private String queryType;

    @ApiModelProperty(value = "姓名/手机号")
    @TableField(exist = false)

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

@@ -184,7 +184,13 @@
    public void roleAuthById(Integer id) {
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        Member member = memberMapper.selectById(id);

        if(member.getIsdeleted().equals(Constants.ONE)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"员工信息已删除");
        }
        if(!member.getType().equals(Constants.memberType.internal)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非内部人员无法进行该操作");
        }
        memberRoleMapper.selectList(new QueryWrapper<MemberRole>().lambda().eq(MemberRole::getMemberId,member.getId()));




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

@@ -270,6 +270,8 @@
                .eq(Objects.nonNull(pageWrap.getModel().getType()),
                        Retention::getType,
                        pageWrap.getModel().getType())
                //过滤车辆数据
                .ne(Retention::getType,3)
                .and(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),
                        p-> p.like(Company::getName, pageWrap.getModel().getCompanyName())
                                .or()

 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java

@@ -332,7 +332,7 @@
    }

   public void dealRoleEmpower(Member member ){
        List<Integer> doorIds = getRoleIdByParam(member.getRoleIds(),member);
//        List<Integer> doorIds = getRoleIdByParam(member.getRoleIds(),member);
        //添加人员卡片数据
        dealMemberCard(member,new UserUpdateRequest());
    }
@@ -904,8 +904,9 @@
                    member.setEndTime(param.getValidEndTime());
                    memberMapper.updateById(member);
                }
                //2024年3月7日17:49:33 取消此业务处理人员门禁权限
//                getRoleIdByParam(param.getRoleIds(),member);
                //添加人员卡片数据
                getRoleIdByParam(param.getRoleIds(),member);
                dealMemberCard(member,param);
            }
        }catch (BusinessException e){
@@ -1011,54 +1012,31 @@
    @Override
    public void roleUserAuthor(UserAuthorRequest param){
        try{
//            if(Objects.isNull(param)
//                    ||StringUtils.isBlank(param.getUserId())){
//                throw new BusinessException(ResponseStatus.BAD_REQUEST);
//            }
//            Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getErpId,param.getUserId()).last("limit 1"));
//            if(Objects.isNull(member)){
//                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，用户信息不存在！");
//            }
//            List<Integer> doorIds = getRoleIdByParam(param.getRoleIds(),member);
//            if(StringUtils.isBlank(member.getRoleId())){
//                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"未查询到门禁组数据");
//            }
//            //更新授权有效期
//            Member update = new Member();
//            update.setId(member.getId());
//            update.setEditDate(new Date());
//            update.setStartTime(param.getValidStartTime());
//            update.setEndTime(param.getValidEndTime());
//            update.setRoleId(StringUtils.isNotBlank(member.getRoleId())?member.getRoleId():null);
//            update.setHkStatus(Constants.ZERO);//做一遍更新逻辑
//            update.setRemark("待同步安防平台");
//            memberMapper.updateById(update);

        if(Objects.isNull(param)
                ||StringUtils.isBlank(param.getUserId())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        if(Objects.nonNull(param.getValidStartTime())&&Objects.nonNull(param.getValidEndTime())){
            if(param.getValidStartTime().getTime()> param.getValidEndTime().getTime()){
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，有效期时间不合法！");
            if(Objects.isNull(param)
                    ||StringUtils.isBlank(param.getUserId())){
                throw new BusinessException(ResponseStatus.BAD_REQUEST);
            }
        }
        Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getErpId,param.getUserId()).last("limit 1"));
        if(Objects.isNull(member)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，用户信息不存在！");
        }
        List<Integer> doorIds = getRoleIdByParam(param.getRoleIds(),member);
        if(param.getRoleIds()!=null && param.getRoleIds().length>0 && StringUtils.isBlank(member.getRoleId())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，未查询到有效门禁组数据");
        }
        memberMapper.update(null,new UpdateWrapper<Member>().lambda()
                .eq(Member::getId,member.getId())
                .set(Member::getRoleId,member.getRoleId())
                .set(Member::getRemark,"待同步安防平台")
                .set(Member::getStartTime,param.getValidStartTime())
                .set(Member::getEndTime,param.getValidEndTime())
                .set(Member::getEditDate,new Date())
                .set(Member::getHkStatus,Constants.ZERO ));
            if(Objects.nonNull(param.getValidStartTime())&&Objects.nonNull(param.getValidEndTime())){
                if(param.getValidStartTime().getTime()> param.getValidEndTime().getTime()){
                    throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，有效期时间不合法！");
                }
            }
            Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getErpId,param.getUserId()).last("limit 1"));
            if(Objects.isNull(member)){
                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，用户信息不存在！");
            }
            List<Integer> doorIds = getRoleIdByParam(param.getRoleIds(),member);
            if(param.getRoleIds()!=null && param.getRoleIds().length>0 && StringUtils.isBlank(member.getRoleId())){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，未查询到有效门禁组数据");
            }
            memberMapper.update(null,new UpdateWrapper<Member>().lambda()
                    .eq(Member::getId,member.getId())
                    .set(Member::getRoleId,member.getRoleId())
                    .set(Member::getRemark,"待同步安防平台")
                    .set(Member::getStartTime,param.getValidStartTime())
                    .set(Member::getEndTime,param.getValidEndTime())
                    .set(Member::getEditDate,new Date())
                    .set(Member::getHkStatus,Constants.ZERO ));
        }catch (BusinessException e){
            throw e;
        }finally {