集成相关更改

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java

@@ -736,14 +736,14 @@
    public ResultOrgData syncDataForOrg(OrgData orgData) {
        boolean isUsedFlag= personAndDeptConfig.isUsedFlag();
        ResultOrgData resultOrgData=new ResultOrgData();
        boolean isPersonApplyGroupCode= personAndDeptConfig.isPersonApplyGroupCode();
        boolean isPersonApplyGroupCode= personAndDeptConfig.isDeptApplyGroupCode();
        List<ResultMdMapping> resultMdMappingList=new ArrayList<>();
        AtomicBoolean success= new AtomicBoolean(true);
        String message="";
        String systemCode="";
        if(isUsedFlag){
            List<OrgMasterData> orgMasterDataList=new ArrayList<>();
            List<String> fields= VciBaseUtil.str2List(personAndDeptConfig.getPersonFields());
            List<String> fields= VciBaseUtil.str2List(personAndDeptConfig.getDeptFields());
            try {
                if(orgData==null){
                    throw new Throwable("传入参数为null");
@@ -755,17 +755,17 @@
                    throw new Throwable("用户鉴权失败");
                }
                orgMasterDataList = orgData.getMasterData();
                String personLibrary = personAndDeptConfig.getPersonLibrary();
                if (StringUtils.isBlank(personLibrary)) {
                String deptLibrary = personAndDeptConfig.getDeptLibrary();
                if (StringUtils.isBlank(deptLibrary)) {
                    success.set(false);
                    log.info("集成配置缺少人员库节点信息,personLibrary->" + personLibrary);
                    throw  new Throwable("集成配置缺少人员库节点信息,personLibrary->" + personLibrary);
                    log.info("集成配置缺少部门库节点信息,deptLibrary->" + deptLibrary);
                    throw  new Throwable("集成配置缺少部门库节点信息,deptLibrary->" + deptLibrary);
                }
                String personClassCode = personAndDeptConfig.getPersonClassCode();
                String deptClassCode = personAndDeptConfig.getDeptClassCode();
                ClassfyVO classfyVO = new ClassfyVO();
                classfyVO.setLibrary(personLibrary);
                classfyVO.setClassCode(personClassCode);
                CodeClassifyVO  codeClassifyVO=this.getClassfy(classfyVO,personLibrary);
                classfyVO.setLibrary(deptLibrary);
                classfyVO.setClassCode(deptClassCode);
                CodeClassifyVO  codeClassifyVO=this.getClassfy(classfyVO,deptLibrary);
                log.info("end：分类查询完毕");
                //获取分类模板信息
                if(codeClassifyVO==null || StringUtils.isBlank(codeClassifyVO.getOid())){
@@ -775,7 +775,7 @@
                CodeClassifyTemplateVO templateVO = engineService.getUsedTemplateByClassifyOid(codeClassifyVO.getOid());
                if(templateVO==null||StringUtils.isBlank(templateVO.getOid())){
                    success.set(false);
                    throw  new  Throwable ("根据传输的分类，未获取MDM系统中对应模板");
                    throw new Throwable ("根据传输的分类，未获取MDM系统中对应模板");
                }

                List<CodeClassifyTemplateAttrVO> attrVOS = templateVO.getAttributes().stream().filter(s -> !DEFAULT_SYNC_ATTR_LIST.contains(s.getId()) &&
@@ -878,7 +878,7 @@
                LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs=new LinkedList<>();
                if(editDatasVO.getObject()!=null&&editDatasVO.getObject().size()>0){
                    DataObjectVO dataObjectVO = new DataObjectVO();
                    this.getConfigDatas(systemCode, personLibrary, editDatasVO, attrVOS, dataObjectVO);
                    this.getConfigDatas(systemCode, deptLibrary, editDatasVO, attrVOS, dataObjectVO);
                    log.info("start：修改数据执行完毕");
                    boolean  personApplyGroupCode =personAndDeptConfig.isPersonApplyGroupCode();
                    mdmIOService.batchSyncEditDatas(codeClassifyVO,dataObjectVO, resultDataObjectDetailDOs,personApplyGroupCode);
@@ -886,7 +886,7 @@
                }
                if(applyDatasVO.getObject()!=null&&applyDatasVO.getObject().size()>0) {
                    DataObjectVO dataObjectVO = new DataObjectVO();
                    this.getConfigDatas(systemCode, personLibrary, applyDatasVO, attrVOS, dataObjectVO);
                    this.getConfigDatas(systemCode, deptLibrary, applyDatasVO, attrVOS, dataObjectVO);

                    CodeClassifyFullInfoBO classifyFullInfo = classifyService.getClassifyFullInfo(codeClassifyVO.getOid());
                    CodeRuleVO ruleVO = engineService.getCodeRuleByClassifyFullInfo(classifyFullInfo);
@@ -2247,6 +2247,7 @@
        //调用集团申请接口申请集团码
        return resultStr;
    }

    private void setPropertyValue(String key,String value,List<ProppertyVO> proppertyVOList){
        ProppertyVO proppertyVO=new ProppertyVO();
        proppertyVO.setKey(key);
@@ -2254,6 +2255,7 @@
        proppertyVOList.add(proppertyVO);

    }

    /***
     * 查询校验分类信息
     * @param classfyVO
@@ -2296,6 +2298,7 @@
        }
        return classifyVO;
    }

    /***
     * 查询校验分类信息
     * @param classfyVO
@@ -2688,6 +2691,7 @@
            throw new   Throwable("组织数据映射值失败");
        }
    }

    /***
     * 记录日志信息
     * @param systemId