From b9367591279f75feba17a1301d7aa9ce8a6325f5 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 19 三月 2024 21:05:55 +0800
Subject: [PATCH] 集成相关更改
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
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 0fc616d..e7e6129 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
@@ -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("浼犲叆鍙傛暟涓簄ull");
@@ -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 ("鏍规嵁浼犺緭鐨勫垎绫伙紝鏈幏鍙朚DM绯荤粺涓搴旀ā鏉�");
+ throw new Throwable ("鏍规嵁浼犺緭鐨勫垎绫伙紝鏈幏鍙朚DM绯荤粺涓搴旀ā鏉�");
}
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
--
Gitblit v1.9.3