现场型号代号/人员/组织接口调试

 Source/UBCS/data.json

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,113 @@
[
  {
    "tenantId": "986926",
    "createTime": "2023-12-07 19:01:55",
    "ts": "2023-12-07 19:01:55.674",
    "revisionValue": "1",
    "nameOid": "1732717066655502337",
    "data": {},
    "firstV": "1",
    "codeClassifySecOid": "1732710379856990208",
    "lastV": "1",
    "firstR": "1",
    "revisionOid": "1732717066655502339",
    "creator": "admin",
    "id": "测试22",
    "versionValue": "1",
    "revisionSeq": 1,
    "revisionRule": "1",
    "description": "",
    "oid": "1732717066655502336",
    "versionSeq": 1,
    "name": "测试22",
    "secretGrade": 0,
    "lastModifier": "admin",
    "lctid": "",
    "secretGradeText": "",
    "copyFromVersion": "",
    "orderNum": 1,
    "lcStatusText": "",
    "versionRule": "0",
    "parentClassifyValueOid": "1732711444266487808",
    "lcStatus": "",
    "owner": "1707221494012690433",
    "codeClassifySecOidName": "",
    "btmname": "codeclassifyvalue",
    "lastR": "1",
    "lastModifyTime": "2023-12-07 19:01:55"
  },
  {
    "tenantId": "986926",
    "createTime": "2023-12-07 19:02:00",
    "ts": "2023-12-07 19:02:00.592",
    "revisionValue": "1",
    "nameOid": "1732717087283089409",
    "data": {},
    "firstV": "1",
    "codeClassifySecOid": "1732710379856990208",
    "lastV": "1",
    "firstR": "1",
    "revisionOid": "1732717087283089411",
    "creator": "admin",
    "id": "测试33",
    "versionValue": "1",
    "revisionSeq": 1,
    "revisionRule": "1",
    "description": "",
    "oid": "1732717087283089408",
    "versionSeq": 1,
    "name": "测试33",
    "secretGrade": 0,
    "lastModifier": "admin",
    "lctid": "",
    "secretGradeText": "",
    "copyFromVersion": "",
    "orderNum": 1,
    "lcStatusText": "",
    "versionRule": "0",
    "parentClassifyValueOid": "1732711473274294272",
    "lcStatus": "",
    "owner": "1707221494012690433",
    "codeClassifySecOidName": "",
    "btmname": "codeclassifyvalue",
    "lastR": "1",
    "lastModifyTime": "2023-12-07 19:02:00"
  },
  {
    "tenantId": "986926",
    "createTime": "2023-12-07 19:01:49",
    "ts": "2023-12-07 19:01:49.984",
    "revisionValue": "1",
    "nameOid": "1732717042789912577",
    "data": {},
    "firstV": "1",
    "codeClassifySecOid": "1732710379856990208",
    "lastV": "1",
    "firstR": "1",
    "revisionOid": "1732717042789912579",
    "creator": "admin",
    "id": "测试11",
    "versionValue": "1",
    "revisionSeq": 1,
    "revisionRule": "1",
    "description": "",
    "oid": "1732717042789912576",
    "versionSeq": 1,
    "name": "测试111",
    "secretGrade": 0,
    "lastModifier": "admin",
    "lctid": "",
    "secretGradeText": "",
    "copyFromVersion": "",
    "orderNum": 1,
    "lcStatusText": "",
    "versionRule": "0",
    "parentClassifyValueOid": "1732711414591787008",
    "lcStatus": "",
    "owner": "1707221494012690433",
    "codeClassifySecOidName": "",
    "btmname": "codeclassifyvalue",
    "lastR": "1",
    "lastModifyTime": "2023-12-07 19:01:49"
  }
]

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

@@ -331,8 +331,8 @@
                //object.setCode(masterData.getOrDefault(currentClassifyConfig.get().getSourceCodeKey(),"").toString());//编码
                if(!CollectionUtils.isEmpty(sourceCodeKeyList)) {
                    sourceCodeKeyList.stream().forEach(codekey -> {
                        if (StringUtils.isNotBlank(masterData.getOrDefault(currentClassifyConfig.get().getSourceCodeKey(), "").toString())) {
                            object.setCode(masterData.getOrDefault(currentClassifyConfig.get().getSourceCodeKey(), "").toString());//编码
                        if (StringUtils.isNotBlank(masterData.getOrDefault(codekey, "").toString())) {
                            object.setCode(masterData.getOrDefault(codekey, "").toString());//编码
                        }
                    });
                }
@@ -369,7 +369,7 @@
            ApplyDatasVO editDatasVO = new ApplyDatasVO();
            if (!CollectionUtils.isEmpty(cboList)) {
                //根据MDM编码去判断数据是否重复.
                Map<String, ClientBusinessObject> oldpplyDataVOMap = cboList.stream().filter(data -> data != null && StringUtils.isNotBlank(data.getAttributeValue(targetCodeKey))).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getAttributeValue(targetCodeKey).toLowerCase(Locale.ROOT), t -> t));
                Map<String, ClientBusinessObject> oldpplyDataVOMap = cboList.stream().filter(data -> data != null && StringUtils.isNotBlank(data.getAttributeValue(targetCodeKey))).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getAttributeValue(targetCodeKey), t -> t));
                //数据库不存在的
                List<ApplyDataVO> applyApplyDataVOList = applyDataVOList.stream().filter(cbo -> {
                    String code = cbo.getCode();
@@ -380,6 +380,8 @@
                List<ApplyDataVO> editApplyDataVOList = applyDataVOList.stream().filter(cbo -> {
                    String code = cbo.getCode();
                    if (oldpplyDataVOMap.containsKey(code)) {
                        ClientBusinessObject object=    oldpplyDataVOMap.get(code);
                        cbo.setCode(object.getId());
                        cbo.setOperate("update");
                    }
                    return oldpplyDataVOMap.containsKey(code);
@@ -494,7 +496,7 @@
                        mesg="集成系统：【"+systemCode+"】申请编码失败:" + e.getMessage();
                        mesg = e.getMessage();
                        e.printStackTrace();
                        throw new ServiceException(e.getMessage());
                    //    throw new ServiceException(e.getMessage());
                    } finally {
                        XMLResultDataObjectDetailDO x = new XMLResultDataObjectDetailDO();
                        x.setId(rowData.getOid());
@@ -711,6 +713,7 @@
                            String dataValue = sourceKeyValueMap.get(sourceKey);
                            if (attrMapConfigMap.containsKey(sourceKey)) {
                                String targetKey = attrMapConfigMap.get(sourceKey);
                                log.info("xxxxx属性映射值:sourceKey【"+sourceKey+"】——》+targetKey---》"+targetKey+":"+dataValue);
                                keyValueMap.put(targetKey, StringUtils.isBlank(dataValue)?"":dataValue);
                            }
                        });

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

@@ -3376,11 +3376,17 @@
    private void getCodeOrderDTOs(CodeClassifyVO codeClassifyVO, CodeClassifyTemplateVO templateVO, Map<String, RowDatas> codeDataMap, Map<String, ClientBusinessObject> codeSystemObjectMap, List<CodeOrderDTO> codeOrderDTOList, Map<String, String> errorMap, boolean isCodeOrGroupCode) {
        codeSystemObjectMap.keySet().forEach(code -> {
            ClientBusinessObject sysDataObject = codeSystemObjectMap.get(code);
            if (isCodeOrGroupCode) {
            /*if (isCodeOrGroupCode) {
            //    code = sysDataObject.getAttributeValue("GROUPCODE");
                if (StringUtils.isBlank(code)) {
                    code = sysDataObject.getId();
                }
            }*/
            if(isCodeOrGroupCode){
                String groupCode=sysDataObject.getAttributeValue("GROUPCODE");
                if(codeDataMap.containsKey(groupCode)){
                    code=groupCode;
                }
            }
            CodeOrderDTO orderDTO = new CodeOrderDTO();
            if (codeDataMap.containsKey(code)) {

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

@@ -680,7 +680,7 @@
                            log.error("数据保存失败:",e);
                            mesg=e.getMessage();
                            e.printStackTrace();
                            throw new ServiceException(e.getMessage());
                        //    throw new ServiceException(e.getMessage());
                        }finally {
                            XMLResultDataObjectDetailDO x=new XMLResultDataObjectDetailDO();
                            x.setId(rowData.getOid());
@@ -914,8 +914,9 @@
                    }
                    List<XMLResultDataObjectDetailDO> xDOs=new CopyOnWriteArrayList<>();
                    //限制线程并行数量
                    customForkJoinPool.submit(()->{
                        dataObjectVO.getRowData().parallelStream().forEach(rowData->{
                    //customForkJoinPool.submit(()->{
                    //    dataObjectVO.getRowData().parallelStream().forEach(rowData->{
                    dataObjectVO.getRowData().forEach(rowData->{
                            String mesg="";
                            try {
                                CodeOrderDTO orderDTO = new CodeOrderDTO();
@@ -967,7 +968,7 @@
                                log.error( "部门数据接收失败:",e);
                                mesg=e.getMessage();
                                e.printStackTrace();
                                throw new ServiceException(e.getMessage());
                            //    throw new ServiceException(e.getMessage());
                            }finally {
                                XMLResultDataObjectDetailDO x=new XMLResultDataObjectDetailDO();
                                x.setId(rowData.getOid());
@@ -977,7 +978,7 @@
                                xDOs.add(x);
                            }
                        });
                    }).join();
                    //}).join();
                    resultDataObjectDetailDOs.addAll(xDOs);
                    boolean finalSuccess1 = success.get();
                    String finalMessage1 = message;
@@ -2731,7 +2732,7 @@
                            String dataValue = sourceKeyValueMap.get(sourceKey);
                            if (attrMapConfigMap.containsKey(sourceKey)) {
                                String targetKey = attrMapConfigMap.get(sourceKey);
                                log.info("xxxxx属性映射值:sourceKey【"+sourceKey+"】——》+targetKey"+targetKey+":"+dataValue);
                                log.info("xxxxx属性映射值:sourceKey【"+sourceKey+"】——》+targetKey---》"+targetKey+":"+dataValue);
                                keyValueMap.put(targetKey, StringUtils.isBlank(dataValue)?"":dataValue);
                            }
                        });
@@ -2865,6 +2866,7 @@
                            String dataValue = sourceKeyValueMap.get(sourceKey);
                            if (attrMapConfigMap.containsKey(sourceKey)) {
                                String targetKey = attrMapConfigMap.get(sourceKey);
                                log.info("xxxxx属性映射值:sourceKey【"+sourceKey+"】——》+targetKey---》"+targetKey+":"+dataValue);
                                keyValueMap.put(targetKey, StringUtils.isBlank(dataValue)?"":dataValue);
                            }
                        });