k94314517
2024-03-04 aed1ef97d6ae1d3961b9a57c767758c9d34e1b93
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
@@ -340,11 +340,11 @@
        Date date = new Date();
        int num =0;
        for(ErpUserListResponse response : list){
            if(isDebug){
                response.setPhone("1534569100"+num);
                response.setFaceImg("20223402/DM1005.png");
                response.setIdNo("34112219880427200"+num);
            }
//            if(isDebug){
//                response.setPhone("1534569100"+num);
//                response.setFaceImg("20223402/DM1005.png");
//                response.setIdNo("34112219880427200"+num);
//            }
            num++;
            Company company =  new Company();
            if(StringUtils.isNotBlank(response.getOrgId())){
@@ -387,12 +387,14 @@
        Member member = new Member();
        BeanUtils.copyProperties(param,member);
        member.setCreateDate(date);
        if(StringUtils.isBlank(param.getFaceImg())){
        /*if(StringUtils.isBlank(param.getFaceImg())){
            member.setHkStatus(Constants.THREE);
        }else{
            member.setHkStatus(Constants.ZERO);
            member.setRemark("待同步安防平台");
        }
        }*/
        member.setHkStatus(Constants.ZERO);
        member.setRemark("待同步安防平台");
        member.setErpStatus(Constants.ONE);
        member.setErpDate(date);
        member.setErpId(param.getId());
@@ -406,6 +408,7 @@
        member.setRoleIds(param.getRoleIds());
        member.setCompanyId(Objects.isNull(company)?null:company.getId());
        member.setErpOrgId(param.getOrgId());
        member.setCanVisit(Constants.ONE);
//        member.setStartTime(request.getStartTime());
//        member.setEndTime(request.getEndTime());
        return  member;
@@ -521,6 +524,11 @@
                   for (DeviceRole deviceRole:deviceRoleList) {
                       RoleListResponse roleListResponse = new RoleListResponse();
                       BeanUtils.copyProperties(deviceRole,roleListResponse);
                       if(deviceRole.getType().equals(Constants.TWO)){
                           roleListResponse.setType(Constants.ONE);
                       }else{
                           roleListResponse.setType(Constants.ZERO);
                       }
                       if(StringUtils.isNotBlank(deviceRole.getDoorIds())){
                           List<DeviceListResponse> DeviceListResponseList = new ArrayList<>();
                           List<String>  doorList = Arrays.asList(deviceRole.getDoorIds().split(","));
@@ -1009,12 +1017,16 @@
            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);
@@ -1027,8 +1039,10 @@
                ||StringUtils.isBlank(param.getCarCode())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        if(param.getValidStartTime()!=null && param.getValidEndTime()!=null&&param.getValidStartTime().getTime()> param.getValidEndTime().getTime()){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起,有效期时间不合法!");
        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)){
@@ -1041,7 +1055,14 @@
                .set(ParkBook::getHkStatus,Constants.ZERO)
        );
        //查询车库信息
        List<Parks> parksList = parksMapper.selectList(new QueryWrapper<Parks>().lambda().in(Parks::getId,param.getParkIdList()));
        List<Parks> parksList = new ArrayList<>();
        if(CollectionUtils.isNotEmpty(param.getParkIdList())){
             parksList  = parksMapper.selectList(new QueryWrapper<Parks>().lambda()
                    .in(Parks::getId,param.getParkIdList())
            );
        }else{
            throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起,停车库信息不存在,授权失败");
        }
        if(CollectionUtils.isNotEmpty(parksList)){
            List<ParkBook> parkBookList = new ArrayList<>();
            for (Parks parks:parksList) {
@@ -1052,7 +1073,7 @@
                parkBook.setParkId(parks.getId());
                parkBook.setOrigin(Constants.ZERO);
                parkBook.setStartTime(Objects.isNull(param.getValidStartTime())?new Date():param.getValidStartTime());
                parkBook.setEndTime(param.getValidEndTime());
                parkBook.setEndTime(Objects.isNull(param.getValidEndTime())?null:param.getValidEndTime());
                parkBook.setTimeType(Objects.isNull(param.getValidEndTime())?Constants.ZERO:Constants.ONE);
                parkBook.setMemberId(member.getId());
                parkBook.setHkStatus(Constants.ZERO);
@@ -1070,6 +1091,10 @@
    @Override
    public void approveApply(ApproveNoticeRequest param){
        try{
            if(!Objects.isNull(param)
                ){
            }
            if(Objects.isNull(param)
                    ||Objects.isNull(param.getId())
                    ||Objects.isNull(param.getStatus())){