最新版本

nidapeng

2024-04-10 6c5d0a4a9264b7508c7ffe81b45ba239cabf2244

 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java

@@ -305,14 +305,15 @@
                    String doorids =deviceRole.getDoorIds();
                    if(StringUtils.isNotBlank(doorids)){
                        String[] ss = doorids.split(",");
                        try {
                            for(String s :ss){
                        for(String s :ss){
                            try {
                                Integer ts =Integer.parseInt(s);
                                 r.add(ts);
                            }catch (Exception e){
                                //脏数据不处理
                            }
                        }catch (Exception e){
                            //脏数据不处理
                        }

                    }
                }
                return  r;
@@ -382,10 +383,10 @@
            return;
        }

        List<Integer> deviceIds =new ArrayList<>();//新设备编码集合
        List<Empower> list = new ArrayList<>();//新授权记录集合
        if(Constants.equalsInteger(member.getIsdeleted(),Constants.ZERO)
                && Constants.equalsObject(member.getHkStatus(),Constants.ONE)){
        if(Constants.equalsInteger(member.getIsdeleted(),Constants.ZERO)){
//                && Constants.equalsObject(member.getHkStatus(),Constants.ONE)){
            List<Integer> deviceIds =new ArrayList<>();//新设备编码集合
            List<Empower> list = new ArrayList<>();//新授权记录集合
            //如果用户是同步海康成功，添加带下发权限（只管理新增或者编辑的）
            List<Device> deviceList = deviceMapper.selectList(new QueryWrapper<Device>().lambda().in(Device::getId,doorIds));
            if(deviceList == null || deviceList.size() == 0){
@@ -401,6 +402,7 @@
                model.setSendInfo("待同步安防平台");
                model.setRemark("待同步安防平台");
                model.setStartTime(member.getStartTime());
                model.setFailFlag(Constants.ZERO);
                model.setEndTime(member.getEndTime());
                //默认给于虚拟卡
                model.setCardNos(Constants.VIRTUAL_CARD_INDEX+member.getId());
@@ -409,22 +411,22 @@
                deviceIds.add(deviceRole.getId());
                list.add(model);
            }
        }
        //待移除权限的设备数据授权记录（针对删除和更新丢失的权限，需要同步下发删除权限）
        empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
                .eq(Empower::getMemberId,member.getId())
                .set(Empower::getIsdeleted,Constants.ONE)
                .eq(Empower::getIsdeleted,Constants.ZERO)
                .notIn(deviceIds.size()>0,Empower::getDeviceId,deviceIds)
                .set(Empower::getSendStatus,Constants.ZERO));
        //导入新增的授权信息
        if(list.size()>0){
            //直接覆盖重复的设备权限，直接删除即可
            empowerMapper.delete(new UpdateWrapper<Empower>().lambda()
            //待移除权限的设备数据授权记录（针对删除和更新丢失的权限，需要同步下发删除权限）
            empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
                    .eq(Empower::getMemberId,member.getId())
                    .set(Empower::getIsdeleted,Constants.ONE)
                    .eq(Empower::getIsdeleted,Constants.ZERO)
                    .in(Empower::getDeviceId,deviceIds) );
            empowerMapper.insertBatchSomeColumn(list);
                    .notIn(deviceIds.size()>0,Empower::getDeviceId,deviceIds)
                    .set(Empower::getSendStatus,Constants.ZERO));
            //导入新增的授权信息
            if(list.size()>0){
                //直接覆盖重复的设备权限，直接删除即可
                empowerMapper.delete(new UpdateWrapper<Empower>().lambda()
                        .eq(Empower::getMemberId,member.getId())
                        .eq(Empower::getIsdeleted,Constants.ZERO)
                        .in(Empower::getDeviceId,deviceIds) );
                empowerMapper.insertBatchSomeColumn(list);
            }
        }
    }
    public static void dealChangeDeviceRoleEmpower( Member member ,List<Integer> addDoorIds,List<Integer> delDoorIds, DeviceRoleMapper deviceRoleMapper, EmpowerMapper empowerMapper, DeviceMapper deviceMapper) {
@@ -460,6 +462,7 @@
                model.setCreateDate(new Date());
                model.setMemberId(member.getId());
                model.setIsdeleted(Constants.ZERO);
                model.setFailFlag(Constants.ZERO);
                model.setDeviceId(deviceRole.getId());
                model.setSendStatus(Constants.ZERO);
                model.setSendInfo("待同步安防平台");
@@ -587,7 +590,6 @@
                //删除所有绑定的卡片信息
                memberCardMapper.delete(new QueryWrapper<MemberCard>().lambda().eq(MemberCard::getMemberId,c.getId()));
            }

        }else{
            //处理修改数据，并且更新人脸
            UserAddRequest  addHkModel = getUserAddModel(c,path,1);//修改
@@ -606,7 +608,8 @@
                        c.setFaceId(faceid);
                        c.setFaceStatus(Constants.ONE);
                        //如果人脸跟你，重新下发权限数据
                         dealMemberRoleEmpower(c);
                        c.setRemark("人员和人脸信息同步成功"+result.getMsg());
                        dealMemberRoleEmpower(c);
                    }
                }
            }else{
@@ -642,6 +645,7 @@
            //如果人脸数据不正确，下载失败等原因
            noticeErpFail(c,Constants.ZERO,"人脸照片不存在，获取失败！");
            c.setHkStatus(Constants.TWO);
            c.setFaceStatus(Constants.TWO);
            c.setRemark("人脸照片不存在，获取失败！");
            c.setHkDate(new Date());
            memberMapper.updateById(c);
@@ -651,6 +655,11 @@
        BaseResponse<UserAddResponse> result =  HKService.addUser(addHkModel);
        if(result!=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE) && result.getData()!=null){
            c.setFaceId(result.getData().getFaceId());
            if(StringUtils.isNotBlank(c.getFaceId())){
                c.setFaceStatus(Constants.ONE);
            }else{
                c.setFaceStatus(Constants.ZERO);
            }
            c.setHkStatus(Constants.ONE);
            c.setHkId(addHkModel.getPersonId());
            c.setHkDate(new Date());