整理

nidapeng

2024-03-11 81b2bbdbb92dd70ca28c9d556cd8dc4e9329584f

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

@@ -209,7 +209,6 @@
        model.setOrgIndexCode(c.getHkId());
        model.setOrgName(c.getName());
        return  model;

    }

    /**
@@ -228,7 +227,7 @@
            List<String> fIds = new ArrayList<>();
            if(result.getData()!=null){
                for(OrgUpdateFailureResponse r : result.getData()){
                    if(!r.getCode().equals("0x00052102")){
                    if(r.getCode().equals("0x00052102")){
                        //不存在的也算删除成功
                        fIds.add(r.getOrgIndexCode());//删除失败的数据集合
                    }
@@ -269,6 +268,7 @@
                    .eq(Member::getHkStatus,Constants.ZERO)
                    .eq(Member::getStatus,Constants.ZERO)
                    .eq(Member::getType,Constants.memberType.internal)
                    .notExists("select d.id from empower d where d.member_id=t.id and d.send_status in (1,5)")//排除有正在同步下发任务的数据
                    .orderByAsc(Member::getErpDate));
            if(list ==null || list.size()==0){
                return;
@@ -330,13 +330,13 @@
        }
        return  false;
    }
    private void dealDelMemberRoleEmpower(Member member ) {
    private int dealDelMemberRoleEmpower(Member member ) {
        //待移除权限的设备数据授权记录（针对删除和更新丢失的权限，需要同步下发删除权限）
        empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
                .eq(Empower::getMemberId,member.getId())
                .set(Empower::getIsdeleted,Constants.ONE)
                .eq(Empower::getIsdeleted,Constants.ZERO)
                .set(Empower::getSendStatus,Constants.ZERO));
            return  empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
                        .eq(Empower::getMemberId,member.getId())
                        .set(Empower::getIsdeleted,Constants.ONE)
                        .eq(Empower::getIsdeleted,Constants.ZERO)
                        .set(Empower::getSendStatus,Constants.ZERO));
    }
    private void dealMemberRoleEmpower(Member member ) {
        //处理新增的人员卡片数据（与海康同步）
@@ -350,6 +350,12 @@
        }
        List<Integer> doorIds = getRoleIdByParam(member,deviceRoleMapper);
        if(doorIds==null || doorIds.size() == 0){
            //如果权限清空，则清空人员授权的权限数据
            empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
                    .eq(Empower::getMemberId,member.getId())
                    .set(Empower::getIsdeleted,Constants.ONE)
                    .eq(Empower::getIsdeleted,Constants.ZERO)
                    .set(Empower::getSendStatus,Constants.ZERO));
            return;
        }
        if(StringUtils.isBlank(member.getFaceImg())){
@@ -488,15 +494,21 @@
        c.setHkStatus(Constants.ONE);
        if(Constants.equalsInteger(Constants.ONE,c.getIsdeleted())){
            //处理删除数据（删除之前下发的海康人员权限信息）
            dealDelMemberRoleEmpower(c);
            c.setHkStatus(Constants.FOUR );
            c.setRemark( "等待删除授权！");
            /*boolean r = doHkDeleteUser(c.getId(),c.getHkId(),date);
            c.setHkStatus(r?Constants.ONE:Constants.TWO);
            c.setRemark(r?null:"删除海康人员信息失败！");
            c.setIsdeleted(r? Constants.ONE: Constants.ZERO);//删除失败，恢复数据
            //删除所有绑定的卡片信息
            memberCardMapper.delete(new QueryWrapper<MemberCard>().lambda().eq(MemberCard::getMemberId,c.getId()));*/
            int rr = dealDelMemberRoleEmpower(c);
            if(rr >0){
                //如果有權限待刪除，等待删除完成再删除人员
                c.setHkStatus(Constants.FOUR );
                c.setRemark( "等待删除授权！");
            }else{
                //没有权限直接删除人员
                boolean r = doHkDeleteUser(c.getId(),c.getHkId(),date);
                c.setHkStatus(r?Constants.ONE:Constants.TWO);
                c.setRemark(r?null:"删除海康人员信息失败！");
                c.setIsdeleted(r? Constants.ONE: Constants.ZERO);//删除失败，恢复数据
                //删除所有绑定的卡片信息
                memberCardMapper.delete(new QueryWrapper<MemberCard>().lambda().eq(MemberCard::getMemberId,c.getId()));
            }

        }else{
            //处理修改数据，并且更新人脸
            UserAddRequest  addHkModel = getUserAddModel(c,path,1);//修改