整理

jiangping

2024-01-08 a38fdd9386498594b7b5c226f3ddb985079b050b

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

@@ -222,13 +222,16 @@
     */
    private Company getAddCompanyModel(ErpOrgListResponse respone, Date date) {
        Company    company = new Company();
        company.setStatus(respone.getStatus());
        company.setIsdeleted(Constants.ZERO);
        company.setName(respone.getName());
        company.setErpId(respone.getId());
        company.setCreateDate(date);
        company.setType(Constants.ONE);
        company.setCode(respone.getCode());
        company.setErpParentId(respone.getParentOrgId());
        if(StringUtils.isNotBlank(respone.getParentOrgId())&&!respone.getParentOrgId().equals("orgRoot")){
            company.setErpParentId(respone.getParentOrgId());
        }
        company.setErpDate(date);
        company.setHkStatus(Constants.ZERO);
        return  company;
@@ -304,7 +307,6 @@
        }else{
            throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "同步ERP数据为空！");
        }

    }

    public void dealRoleEmpower(Member member,Date startTime , Date endTime){
@@ -359,7 +361,11 @@
        Member member = new Member();
        BeanUtils.copyProperties(param,member);
        member.setCreateDate(new Date());
        member.setHkStatus(Constants.ZERO);
        if(StringUtils.isBlank(param.getFaceImg())){
            member.setHkStatus(Constants.THREE);
        }else{
            member.setHkStatus(Constants.ZERO);
        }
        member.setErpStatus(Constants.ONE);
        member.setErpDate(new Date());
        member.setErpId(param.getId());
@@ -369,7 +375,6 @@
        String encryptIdNo = DESUtil.encrypt(Constants.EDS_PWD,param.getIdNo());
        member.setIdcardNo(encryptIdNo);
        member.setIdcardDecode(Constants.getTuominStr(param.getIdNo()));
        member.setHkStatus(Constants.ZERO);
        member.setRoleIds(param.getRoleIds());
        member.setCompanyId(Objects.isNull(company)?null:company.getId());
        member.setErpOrgId(param.getOrgId());
@@ -781,8 +786,6 @@
        }
    }



    @Override
    public void userUpdate(UserUpdateRequest param){
        try{
@@ -872,7 +875,6 @@
            }
        }
    }

    /**
     * //如果有授权门禁数据，进行用户授权数据下发任务创建
     * @param member
@@ -889,6 +891,9 @@
        if(doorIds==null || doorIds.size() == 0){
          return;
        }
        if(StringUtils.isBlank(member.getFaceImg())){
          return;
        }
        List<Empower> list = new ArrayList<>();
        List<Device> deviceList = deviceMapper.selectList(new QueryWrapper<Device>().lambda().in(Device::getId,doorIds));
        if(deviceList == null || deviceList.size() == 0){
@@ -903,6 +908,8 @@
            model.setSendStatus(Constants.ZERO);
            model.setStartTime(startTime);
            model.setEndTime(endTime);
            //默认给于虚拟卡
            model.setCardNos(Constants.VIRTUAL_CARD_INDEX+member.getId());
            model.setSendType(Constants.ZERO);
            list.add(model);
        }
@@ -988,7 +995,7 @@
                .set(ParkBook::getHkStatus,Constants.ZERO)
        );
        //查询车库信息
        List<Parks> parksList = parksMapper.selectList(new QueryWrapper<Parks>().lambda().in(Parks::getId,param.getPartIdList()));
        List<Parks> parksList = parksMapper.selectList(new QueryWrapper<Parks>().lambda().in(Parks::getId,param.getParkIdList()));
        if(CollectionUtils.isNotEmpty(parksList)){
            List<ParkBook> parkBookList = new ArrayList<>();
            for (Parks parks:parksList) {