k94314517
2024-01-09 b89c0df6f99cff6a852306da467b053aa4f90df8
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
@@ -209,7 +209,9 @@
        company.setEditDate(date);
        company.setStatus(respone.getStatus());
        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;
@@ -282,14 +284,14 @@
                    .eq(Member::getType, Constants.memberType.internal));
            dealUserChangeList(list,addList,updateList,delList,allList);
            if(addList.size()>0){
                memberMapper.insertBatchSomeColumn(addList);
                for (Member member:addList) {
                    dealRoleEmpower(member,param.getStartTime(), param.getEndTime());
                }
                memberMapper.insertBatchSomeColumn(addList);
            }
            if(updateList.size()>0){
                for(Member c : updateList){
                    dealRoleEmpower(c,param.getStartTime(), param.getEndTime());
                     dealRoleEmpower(c,param.getStartTime(), param.getEndTime());
                    c.setHkStatus(Constants.ZERO);
                    memberMapper.updateById(c);
                }
@@ -325,7 +327,7 @@
                company = companyMapper.selectOne(new QueryWrapper<Company>().lambda().eq(Company::getErpId,response.getOrgId()).last("limit 1"));
                if(Objects.isNull(company)){
                    continue;
                }
                }
            }
            //根据 erpId 查询用户信息,判断是新增还是更新
            Member member = findUserByERPId(allList,response.getId());
@@ -369,6 +371,7 @@
        member.setErpStatus(Constants.ONE);
        member.setErpDate(new Date());
        member.setErpId(param.getId());
        member.setIdcardType(param.getIdType());
        member.setFsStatus(Constants.ZERO);
        member.setStatus(param.getStatus());
        member.setType(Constants.memberType.internal);
@@ -617,10 +620,10 @@
            queryWrapper.selectAs(DeviceEvent::getUserType,DoorEventListResponse::getType);
            queryWrapper.selectAs(DeviceEvent::getExtEventInOut,DoorEventListResponse::getEventInOut);
            queryWrapper.selectAs(DeviceEvent::getExtAccessChannel,DoorEventListResponse::getExtAccessChannel);
            queryWrapper.selectAs(DeviceEvent::getCreateDate,DoorEventListResponse::getCreateTime);
            queryWrapper.selectAs(DeviceEvent::getHappenTime,DoorEventListResponse::getCreateTime);
            queryWrapper.selectAs(Member::getPhone,DoorEventListResponse::getPhone);
            queryWrapper.selectAs(Member::getErpId,DoorEventListResponse::getUserId);
            queryWrapper.selectAs(Member::getCompanyId,DoorEventListResponse::getOrgId);
            queryWrapper.selectAs(Member::getErpOrgId,DoorEventListResponse::getOrgId);
            queryWrapper.leftJoin(Member.class,Member::getHkId,DeviceEvent::getExtEventPersonNo);
            if(!Objects.isNull(doorEventListRequest)){
@@ -796,7 +799,7 @@
                    ||Objects.isNull(param.getIdType())//证件类型
                    ||Objects.isNull(param.getSex())//性别
                    ||Objects.isNull(param.getOrgId())//所属组织编码
                    ||StringUtils.isBlank(param.getFaceImg())//人脸照片
//                    ||StringUtils.isBlank(param.getFaceImg())//人脸照片
                    ||StringUtils.isBlank(param.getCode())//工号
                    ||StringUtils.isBlank(param.getPhone())//手机号
             ){
@@ -821,11 +824,12 @@
                member.setType(Constants.memberType.internal);
                String encryptIdNo = DESUtil.encrypt(Constants.EDS_PWD,param.getIdNo());
                member.setIdcardNo(encryptIdNo);
                member.setStartTime(param.getValidStartTime());
                member.setEndTime(param.getValidEndTime());
                member.setIdcardDecode(Constants.getTuominStr(param.getIdNo()));
                member.setErpOrgId(param.getOrgId());
                doorIds = getRoleIdByParam(param.getRoleIds(),member);
                memberMapper.insert(member);
                //TODO 海康数据创建-------------修改-------------------
            }else{
                Integer id = member.getId();
                BeanUtils.copyProperties(param,member);
@@ -838,10 +842,11 @@
                doorIds = getRoleIdByParam(param.getRoleIds(),member);
                member.setErpDate(new Date());
                member.setHkStatus(Constants.ZERO);
                member.setStartTime(param.getValidStartTime());
                member.setEndTime(param.getValidEndTime());
                memberMapper.updateById(member);
                //删除用户卡片数据  人员角色关联
                memberCardMapper.delete(new QueryWrapper<MemberCard>().lambda().eq(MemberCard::getMemberId,member.getId()));
                //TODO 海康数据更新
            }
            //如果有授权门禁数据,进行用户授权数据下发任务创建
            dealMemberRoleEmpower(member,doorIds,param.getValidStartTime(),param.getValidEndTime());
@@ -881,10 +886,13 @@
     */
    private void dealMemberRoleEmpower(Member member, List<Integer> doorIds,Date startTime,Date endTime ) {
        //删除所有老的授权信息
        empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
                .eq(Empower::getMemberId,member.getId())
                .set(Empower::getIsdeleted,Constants.ONE)
                .set(Empower::getSendStatus,Constants.ZERO));
        if(!Objects.isNull(member)&&!Objects.isNull(member.getId())){
            empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
                    .eq(Empower::getMemberId,member.getId())
                    .set(Empower::getIsdeleted,Constants.ONE)
                    .set(Empower::getSendStatus,Constants.ZERO));
        }
//        empowerMapper.delete(new UpdateWrapper<Empower>().lambda()
//                .eq(Empower::getMemberId,member.getId())
//                );
@@ -894,32 +902,37 @@
        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){
            return;
        if(Constants.equalsObject(member.getHkStatus(),Constants.ONE)){
            //如果用户是同步海康成功,添加带下发权限
            List<Empower> list = new ArrayList<>();
            List<Device> deviceList = deviceMapper.selectList(new QueryWrapper<Device>().lambda().in(Device::getId,doorIds));
            if(deviceList == null || deviceList.size() == 0){
                return;
            }
            for (Device deviceRole:deviceList) {
                Empower model = new Empower();
                model.setCreateDate(new Date());
                model.setMemberId(member.getId());
                model.setIsdeleted(Constants.ZERO);
                model.setDeviceId(deviceRole.getId());
                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);
            }
            //导入新增的授权信息
            empowerMapper.insertBatchSomeColumn(list);
        }
        for (Device deviceRole:deviceList) {
            Empower model = new Empower();
            model.setCreateDate(new Date());
            model.setMemberId(member.getId());
            model.setIsdeleted(Constants.ZERO);
            model.setDeviceId(deviceRole.getId());
            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);
        }
        //导入新增的授权信息
        empowerMapper.insertBatchSomeColumn(list);
    }
    private   List<Integer>  getRoleIdByParam(Integer[] param, Member member) {
        //添加人员角色关联数据
        memberRoleMapper.delete(new QueryWrapper<MemberRole>().lambda().eq(MemberRole::getMemberId,member.getId()));
        if(!Objects.isNull(member)&&!Objects.isNull(member.getId())){
            memberRoleMapper.delete(new QueryWrapper<MemberRole>().lambda().eq(MemberRole::getMemberId,member.getId()));
        }
        if(!Objects.isNull(param)&&param.length>Constants.ZERO){
            //查询数据库存在的权限
            List<DeviceRole> deviceRoleList= deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda()
@@ -956,7 +969,6 @@
                }
                memberRoleMapper.insertBatchSomeColumn(memberRoleList);
                member.setRoleId(ids);
                return  r;
            }
        }
@@ -974,6 +986,13 @@
            return;
        }
        List<Integer> doorIds = getRoleIdByParam(param.getRoleIds(),member);
        //更新授权有效期
        Member update = new Member();
        update.setId(member.getId());
        update.setEditDate(new Date());
        update.setStartTime(param.getValidStartTime());
        update.setEndTime(param.getValidEndTime());
        memberMapper.updateById(update);
        //如果有授权门禁数据,进行用户授权数据下发任务创建
        dealMemberRoleEmpower(member,doorIds,param.getValidStartTime(),param.getValidEndTime());