k94314517
2024-01-09 b89c0df6f99cff6a852306da467b053aa4f90df8
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
@@ -291,7 +291,7 @@
            }
            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);
                }
@@ -363,7 +363,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());
@@ -374,7 +378,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());
@@ -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)){
@@ -786,8 +789,6 @@
        }
    }
    @Override
    public void userUpdate(UserUpdateRequest param){
        try{
@@ -798,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())//手机号
             ){
@@ -823,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);
@@ -840,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());
@@ -877,7 +880,6 @@
            }
        }
    }
    /**
     * //如果有授权门禁数据,进行用户授权数据下发任务创建
     * @param member
@@ -897,25 +899,33 @@
        if(doorIds==null || doorIds.size() == 0){
          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(StringUtils.isBlank(member.getFaceImg())){
          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.setSendType(Constants.ZERO);
            list.add(model);
        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);
        }
        //导入新增的授权信息
        empowerMapper.insertBatchSomeColumn(list);
    }
    private   List<Integer>  getRoleIdByParam(Integer[] param, Member member) {
@@ -959,7 +969,6 @@
                }
                memberRoleMapper.insertBatchSomeColumn(memberRoleList);
                member.setRoleId(ids);
                return  r;
            }
        }
@@ -977,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());