From d9183aa80ae17d36b79dda48c6b1d7fa22a80ee3 Mon Sep 17 00:00:00 2001
From: xiejun <xiejun@vci-tech.com>
Date: 星期三, 22 一月 2025 11:20:41 +0800
Subject: [PATCH] 现场型号代号/人员/组织接口调试
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java | 14 ++--
Source/UBCS/data.json | 113 +++++++++++++++++++++++++++++++++++++
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java | 8 ++
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeMdmInfaceImpl.java | 11 ++-
4 files changed, 135 insertions(+), 11 deletions(-)
diff --git a/Source/UBCS/data.json b/Source/UBCS/data.json
new file mode 100644
index 0000000..f113199
--- /dev/null
+++ b/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"
+ }
+]
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeMdmInfaceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeMdmInfaceImpl.java
index 07cee1e..fb2c8eb 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeMdmInfaceImpl.java
+++ b/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);
}
});
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
index e6798b6..364dedf 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
+++ b/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)) {
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
index e47f645..1921a91 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
+++ b/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);
}
});
--
Gitblit v1.9.3