From c3f7a0f86009efe7fd2a568b743232499f95132d Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 19 十月 2023 15:20:15 +0800
Subject: [PATCH] 人员、组织机构，查询接口调试
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java | 345 ++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 240 insertions(+), 105 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 6b63a24..5bfd13b 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
@@ -54,6 +54,7 @@
import com.vci.ubcs.system.vo.DeptVO;
import com.vci.ubcs.system.vo.RoleVO;
import lombok.extern.slf4j.Slf4j;
+import org.apache.http.auth.AuthenticationException;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
@@ -235,7 +236,9 @@
systemId = interParameterVO.getData().getSystemId();
UserVO userVo = interParameterVO.getData().getUser();
//鍏嶅瘑鐧诲綍鐢宠token锛宺equest涓坊鍔犵敤鎴蜂俊鎭�
- passwordFreeLoginService.pwdFreeLoginByBoolean(userVo.getUserName(),this.getRequest());
+
+ //passwordFreeLoginService.pwdFreeLoginByBoolean(userVo.getUserName(),this.getRequest());
+ passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(Locale.ROOT),this.getRequest());
AuthUtil.getUser();
List<ClassfyVO> classVOList = classfysVO.getClassify();
InterParameterVO finalInterParameterVO = interParameterVO;
@@ -412,6 +415,7 @@
if(personData==null){
throw new Throwable("浼犲叆鍙傛暟涓簄ull");
}
+ passwordFreeLoginService.pwdFreeLoginByBoolean(systemCode.toLowerCase(Locale.ROOT),this.getRequest());
masterDataList = personData.getMasterData();
String personLibrary = personAndDeptConfig.getPersonLibrary();
if (StringUtils.isBlank(personLibrary)) {
@@ -563,6 +567,9 @@
List<CodeOrderSecDTO> codeOrderSecDTOList=new ArrayList<>();
orderDTO.setCodeClassifyOid(codeClassifyVO.getOid());//鍒嗙被涓婚敭
orderDTO.setTemplateOid(templateVO.getOid());
+ orderDTO.setCreator(rowData.getCreator());
+ orderDTO.setLastModifier(rowData.getEditor());
+ orderDTO.setLcStatus(rowData.getStatus());
if(!CollectionUtils.isEmpty(ruleVO.getSecVOList())) {
ruleVO.getSecVOList().stream().forEach(codeBasicSecVO -> {
if (codeBasicSecVO.getSecType().equals("codevariablesec")) {//瑙勫垯涔嬪畾涔変负鍙彉鐮佹瀛樺偍涓绘暟鎹紶閫掕繃鏉ョ殑鏁版嵁
@@ -577,7 +584,7 @@
orderDTO.setCodeRuleOid(ruleVO.getOid());
orderDTO.setSecDTOList(codeOrderSecDTOList);//瀛樺偍缂栫爜
orderDTO.setData(rowData.getFiledValue());
- String code=engineService.addSaveCode(orderDTO);
+ String code=engineService.addSaveCodeNotauthUser(orderDTO,false);
if(StringUtils.isNotBlank(code)) {
StringBuffer sqlsb = new StringBuffer();
sqlsb.append(" select * from ");
@@ -684,6 +691,8 @@
throw new Throwable("浼犲叆鍙傛暟涓簄ull");
}
systemCode=orgData.getSystemCode();
+ passwordFreeLoginService.pwdFreeLoginByBoolean(systemCode.toLowerCase(),this.getRequest());
+
orgMasterDataList = orgData.getMasterData();
String personLibrary = personAndDeptConfig.getPersonLibrary();
if (StringUtils.isBlank(personLibrary)) {
@@ -830,6 +839,9 @@
List<CodeOrderSecDTO> codeOrderSecDTOList=new ArrayList<>();
orderDTO.setCodeClassifyOid(codeClassifyVO.getOid());//鍒嗙被涓婚敭
orderDTO.setTemplateOid(templateVO.getOid());
+ orderDTO.setCreator(rowData.getCreator());
+ orderDTO.setLastModifier(rowData.getEditor());
+ orderDTO.setLcStatus(rowData.getStatus());
if(!CollectionUtils.isEmpty(ruleVO.getSecVOList())) {
ruleVO.getSecVOList().stream().forEach(codeBasicSecVO -> {
if (codeBasicSecVO.getSecType().equals("codevariablesec")) {//瑙勫垯涔嬪畾涔変负鍙彉鐮佹瀛樺偍涓绘暟鎹紶閫掕繃鏉ョ殑鏁版嵁
@@ -844,7 +856,7 @@
orderDTO.setCodeRuleOid(ruleVO.getOid());
orderDTO.setSecDTOList(codeOrderSecDTOList);//瀛樺偍缂栫爜
orderDTO.setData(rowData.getFiledValue());
- String code=engineService.addSaveCode(orderDTO);
+ String code=engineService.addSaveCodeNotauthUser(orderDTO,false);
if(StringUtils.isNotBlank(code)) {
StringBuffer sqlsb = new StringBuffer();
sqlsb.append(" select * from ");
@@ -973,7 +985,8 @@
systemId = interParameterVO.getData().getSystemId();
UserVO userVo = interParameterVO.getData().getUser();
//鍏嶅瘑鐧诲綍鐢宠token锛宺equest涓坊鍔犵敤鎴蜂俊鎭�
- passwordFreeLoginService.pwdFreeLoginByBoolean(userVo.getUserName(),this.getRequest());
+ //passwordFreeLoginService.pwdFreeLoginByBoolean(userVo.getUserName(),this.getRequest());
+ passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(Locale.ROOT),this.getRequest());
List<ClassfyVO> classVOList = classfysVO.getClassify();
InterParameterVO finalInterParameterVO = interParameterVO;
//杩欐槸璐﹀彿淇℃伅
@@ -1145,9 +1158,11 @@
}
QueryData queryData=queryClassifyVO.getData();
UserVO userVo=queryData.getUser();
- //鍏嶅瘑鐧诲綍鐢宠token锛宺equest涓坊鍔犵敤鎴蜂俊鎭�
- passwordFreeLoginService.pwdFreeLoginByBoolean(userVo.getUserName(),this.getRequest());
systemId=queryData.getSystemId();
+ //鍏嶅瘑鐧诲綍鐢宠token锛宺equest涓坊鍔犵敤鎴蜂俊鎭�
+ //passwordFreeLoginService.pwdFreeLoginByBoolean(userVo.getUserName(),this.getRequest());
+ passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(),this.getRequest());
+
QueryLibraryVO libraryVO= queryData.getLibrary();
String libId= libraryVO.getId();
List<String> classifyIdList= libraryVO.getClassifyid();
@@ -1172,7 +1187,7 @@
throw new Throwable("鎺ュ彛鍙傛暟锛氳处鍙蜂俊鎭幏鍙栧け璐�");
}
List<CodeClassify> libIdDos =classifyService.selectByWrapper(Wrappers.<CodeClassify>query().lambda().in(CodeClassify::getId, libId));
- if(CollectionUtils.isEmpty(libIdDos)) {
+ if(!CollectionUtils.isEmpty(libIdDos)) {
CodeClassify libCodeClassify =libIdDos.get(0);
String oid=libCodeClassify.getOid();
if (!CollectionUtils.isEmpty(classifyIdList)) {
@@ -1279,7 +1294,7 @@
boolean issucess=false;
String resultStr = "";
String errorid="0";
- msg="鎴愬姛";
+ msg = "鏁版嵁鏌ヨ鎴愬姛";
String systemId="";
log.info("鏌ヨ鍒嗙被鐨勬暟鎹弬鏁�:->"+data);
log.info("鏌ヨ鍒嗙被鐨勬暟鎹被鍨�:->"+dataType);
@@ -1306,7 +1321,8 @@
systemId=condtionsVO.getSystemId();
UserVO userVo=condtionsVO.getUser();
//鍏嶅瘑鐧诲綍鐢宠token锛宺equest涓坊鍔犵敤鎴蜂俊鎭�
- passwordFreeLoginService.pwdFreeLoginByBoolean(userVo.getUserName(),this.getRequest());
+ //passwordFreeLoginService.pwdFreeLoginByBoolean(userVo.getUserName(),this.getRequest());
+ passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(),this.getRequest());
CondtionVO condtionVO= condtionsVO.getCondtion();
SessionInfo sessionInfo = new SessionInfo();
sessionInfo.setUserId(userVo.getUserName());
@@ -1365,8 +1381,8 @@
TreeQueryObject treeQueryObject=new TreeQueryObject();
treeQueryObject.setParentOid(oid);
treeQueryObject.setQueryAllLevel(true);
- dataCodeClassifyVOList=classifyService.selectCodeClassifyDOByTree(treeQueryObject);
- dataCodeClassifyVOList.add(CodeClassifyWrapper.build().entityVO(currentCodeClassify[0]));
+ dataCodeClassifyVOList=classifyService.selectAllClassifyByOid(oid);//.selectCodeClassifyDOByTree(treeQueryObject);
+ //dataCodeClassifyVOList.add(CodeClassifyWrapper.build().entityVO(currentCodeClassify[0]));
Map<String, CodeClassifyVO> oidCodeclassifyDOMap = dataCodeClassifyVOList.stream().filter(systeDataObject -> systeDataObject != null && StringUtils.isNotBlank(systeDataObject.getOid())).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getOid(), t -> t));
List<PropertyVO> propertyVOS=condtionVO.getPro();
@@ -1443,6 +1459,9 @@
dataObjectVOS.add(dataObjectVO);
});
resultDataVO.setObject(dataObjectVOS);
+ }else{
+ errorid = "0";
+ msg = "鎺ュ彛鍙傛暟锛歝lassCode 鏈煡璇㈠埌瀵瑰簲鐨勬暟鎹�";
}
}else{
errorid = "101";
@@ -1453,8 +1472,6 @@
errorid = "101";
msg = "鎺ュ彛鍙傛暟锛歭ibrary 鏈煡璇㈠埌瀵瑰簲鐨勫簱鑺傜偣淇℃伅";
}
- errorid = "0";
- msg = "鏁版嵁鏌ヨ鎴愬姛";
}catch (Throwable e){
e.printStackTrace();;
msg="鏌ヨ鏁版嵁澶辫触:"+e.getMessage();
@@ -1520,9 +1537,11 @@
}
QueryData queryData=queryClassifyVO.getData();
UserVO userVo=queryData.getUser();
- //鍏嶅瘑鐧诲綍鐢宠token锛宺equest涓坊鍔犵敤鎴蜂俊鎭�
- passwordFreeLoginService.pwdFreeLoginByBoolean(userVo.getUserName(),this.getRequest());
systemId=queryData.getSystemId();
+ //鍏嶅瘑鐧诲綍鐢宠token锛宺equest涓坊鍔犵敤鎴蜂俊鎭�
+ //passwordFreeLoginService.pwdFreeLoginByBoolean(userVo.getUserName(),this.getRequest());
+ passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(),this.getRequest());
+
QueryLibraryVO libraryVO= queryData.getLibrary();
String libId= libraryVO.getId();
List<String> classifyIdList= libraryVO.getClassifyid();
@@ -1588,7 +1607,7 @@
String num=StringUtils.isBlank(codeFixedValueVO.getOrderNum()+"")?"":codeFixedValueVO.getOrderNum()+"";
String name=StringUtils.isBlank(codeFixedValueVO.getName())?"":codeFixedValueVO.getName();
String description=StringUtils.isBlank(codeFixedValueVO.getDescription())?"":codeFixedValueVO.getDescription();
- CodeSectionValueVO sectionValueVO=new CodeSectionValueVO(id,num,value,name,"",description);
+ CodeSectionValueVO sectionValueVO=new CodeSectionValueVO(id,num,value,id,"",description);
codeSectionValueVOList.add(sectionValueVO);
});
}else if(secType.equals("codeclassifysec")){//鍒嗙被鐮佹
@@ -1661,11 +1680,11 @@
if (!CollectionUtils.isEmpty(ListMap)) {
ListMap.stream().forEach(map -> {
num[0]++;
- String id = map.getOrDefault("OID".toUpperCase(Locale.ROOT), "").toString();
- String value = map.getOrDefault(valueField.toUpperCase(Locale.ROOT), "").toString();
- String text = map.getOrDefault(textField.toUpperCase(Locale.ROOT), "").toString();
- String description = map.getOrDefault("description".toUpperCase(Locale.ROOT), "").toString();
- CodeSectionValueVO sectionValueVO = new CodeSectionValueVO(id, num[0] + "", value, text, "", description);
+ String id =Func.isNull(map.getOrDefault("OID".toUpperCase(Locale.ROOT), ""))?"":map.getOrDefault("OID".toUpperCase(Locale.ROOT), "").toString();
+ String value = Func.isNull(map.getOrDefault(valueField.toUpperCase(Locale.ROOT), ""))?"":map.getOrDefault(valueField.toUpperCase(Locale.ROOT), "").toString();
+ String text =Func.isNull(map.getOrDefault(textField.toUpperCase(Locale.ROOT), ""))?"":map.getOrDefault(textField.toUpperCase(Locale.ROOT), "").toString();
+ String description =Func.isNull(map.getOrDefault("description".toUpperCase(Locale.ROOT), ""))?"":map.getOrDefault("description".toUpperCase(Locale.ROOT), "").toString();
+ CodeSectionValueVO sectionValueVO = new CodeSectionValueVO(id, num[0] + "", value, id, "", description);
codeSectionValueVOList.add(sectionValueVO);
});
}
@@ -1750,11 +1769,11 @@
if (!CollectionUtils.isEmpty(ListMap)) {
ListMap.stream().forEach(map -> {
num[0]++;
- String id = map.getOrDefault("OID".toUpperCase(Locale.ROOT), "").toString();
- String value = map.getOrDefault(valueField.toUpperCase(Locale.ROOT), "").toString();
- String text = map.getOrDefault(textField.toUpperCase(Locale.ROOT), "").toString();
- String description = map.getOrDefault("description".toUpperCase(Locale.ROOT), "").toString();
- String pid = map.getOrDefault(parentFieldName.toUpperCase(Locale.ROOT), "").toString();
+ String id =Func.isNull(map.getOrDefault("OID".toUpperCase(Locale.ROOT), ""))?"":map.getOrDefault("OID".toUpperCase(Locale.ROOT), "").toString();
+ String value =Func.isNull(map.getOrDefault(valueField.toUpperCase(Locale.ROOT), ""))?"":map.getOrDefault(valueField.toUpperCase(Locale.ROOT), "").toString();
+ String text =Func.isNull(map.getOrDefault(textField.toUpperCase(Locale.ROOT), ""))?"":map.getOrDefault(textField.toUpperCase(Locale.ROOT), "").toString();
+ String description =Func.isNull(map.getOrDefault("description".toUpperCase(Locale.ROOT), ""))?"":map.getOrDefault("description".toUpperCase(Locale.ROOT), "").toString();
+ String pid =Func.isNull(map.getOrDefault(parentFieldName.toUpperCase(Locale.ROOT), ""))?"":map.getOrDefault(parentFieldName.toUpperCase(Locale.ROOT), "").toString();
CodeSectionValueVO sectionValueVO = new CodeSectionValueVO(id, num[0] + "", value, text, pid, description);
codeSectionValueVOList.add(sectionValueVO);
});
@@ -1978,7 +1997,8 @@
systemId = applyBZParamVO.getData().getSystemId();
UserVO userVo = applyBZParamVO.getData().getUser();
//鍏嶅瘑鐧诲綍鐢宠token锛宺equest涓坊鍔犵敤鎴蜂俊鎭�
- passwordFreeLoginService.pwdFreeLoginByBoolean(userVo.getUserName(), this.getRequest());
+ //passwordFreeLoginService.pwdFreeLoginByBoolean(userVo.getUserName(), this.getRequest());
+ passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(),this.getRequest());
AuthUtil.getUser();
//杩欐槸璐﹀彿淇℃伅
SessionInfo sessionInfo = new SessionInfo();
@@ -1990,88 +2010,93 @@
String finalSystemId = systemId;
String libray="";
boolean isCodeOrGroupCode=false;
- try {
- libray = classfyBZVO.getLibrary();
- CodeClassifyVO codeClassifyVO = getClassfy(classfyBZVO,libray);
- log.info("end锛氬垎绫绘煡璇㈠畬姣�");
- //鑾峰彇鍒嗙被妯℃澘淇℃伅
- if(codeClassifyVO==null || StringUtils.isBlank(codeClassifyVO.getOid())){
- objerrorCode="100";
- throw new Throwable ("鏍规嵁浼犺緭鐨勫垎绫伙紝鏈幏鍙栧埌鍒嗙被淇℃伅");
+
+ libray = classfyBZVO.getLibrary();
+ CodeClassifyVO codeClassifyVO = getClassfy(classfyBZVO,libray);
+ log.info("end锛氬垎绫绘煡璇㈠畬姣�");
+ //鑾峰彇鍒嗙被妯℃澘淇℃伅
+ if(codeClassifyVO==null || StringUtils.isBlank(codeClassifyVO.getOid())){
+ objerrorCode="100";
+ throw new Throwable ("鏍规嵁浼犺緭鐨勫垎绫伙紝鏈幏鍙栧埌鍒嗙被淇℃伅");
+ }
+ String operation="";
+ if(CODE_CHECKCONFIG) {
+ //鏍￠獙鏄惁閰嶇疆
+ DockingSystemConfig dockingSystemConfig=null;
+ dockingSystemConfig=checkIspass(finalSystemId, SysIntegrationDataFlowTypeEnum.ACCEPT.getValue(), sysIntegrationPushTypeEnum.ACCPET_APPCODE.getValue(),codeClassifyVO.getOid());
+ if(dockingSystemConfig==null){
+ errorid[0] ="101";
+ throw new Throwable("绯荤粺鏍囪瘑涓恒��"+ finalSystemId +"銆戯紝闆嗘垚鍒嗙被涓恒��"+codeClassifyVO.getName()+"銆戜互涓婂垎绫伙紝"+sysIntegrationPushTypeEnum.ACCPET_APPCODE.getText()+"鎺ュ彛閰嶇疆宸插仠鐢ㄦ垨鑰呮湭閰嶇疆锛岃鑱旂郴缂栫爜绠＄悊鍛橈紒");
}
- String operation="";
- if(CODE_CHECKCONFIG) {
- //鏍￠獙鏄惁閰嶇疆
- DockingSystemConfig dockingSystemConfig=null;
- dockingSystemConfig=checkIspass(finalSystemId, SysIntegrationDataFlowTypeEnum.ACCEPT.getValue(), sysIntegrationPushTypeEnum.ACCPET_APPCODE.getValue(),codeClassifyVO.getOid());
- if(dockingSystemConfig==null){
- errorid[0] ="101";
- throw new Throwable("绯荤粺鏍囪瘑涓恒��"+ finalSystemId +"銆戯紝闆嗘垚鍒嗙被涓恒��"+codeClassifyVO.getName()+"銆戜互涓婂垎绫伙紝"+sysIntegrationPushTypeEnum.ACCPET_APPCODE.getText()+"鎺ュ彛閰嶇疆宸插仠鐢ㄦ垨鑰呮湭閰嶇疆锛岃鑱旂郴缂栫爜绠＄悊鍛橈紒");
- }
- isCodeOrGroupCode="true".equals(dockingSystemConfig.getIsGroupCodeFlag())?true:false;
- }
- CodeClassifyTemplateVO templateVO = engineService.getUsedTemplateByClassifyOid(codeClassifyVO.getOid());
- if(templateVO==null||StringUtils.isBlank(templateVO.getOid())){
- objerrorCode="1";
- throw new Throwable ("鏍规嵁浼犺緭鐨勫垎绫伙紝鏈幏鍙朚DM绯荤粺涓搴旀ā鏉�");
- }
- log.info("end锛氭ā鏉挎煡璇㈠畬姣�");
- ApplyBZDatasVO applyDatasVO = classfyBZVO.getObjects();
+ isCodeOrGroupCode="true".equals(dockingSystemConfig.getIsGroupCodeFlag())?true:false;
+ }
+ CodeClassifyTemplateVO templateVO = engineService.getUsedTemplateByClassifyOid(codeClassifyVO.getOid());
+ if(templateVO==null||StringUtils.isBlank(templateVO.getOid())){
+ objerrorCode="1";
+ throw new Throwable ("鏍规嵁浼犺緭鐨勫垎绫伙紝鏈幏鍙朚DM绯荤粺涓搴旀ā鏉�");
+ }
+ log.info("end锛氭ā鏉挎煡璇㈠畬姣�");
+ ApplyBZDatasVO applyBZDatasVO = classfyBZVO.getObjects();
DataObjectVO dataObjectVO = new DataObjectVO();
- List<CodeClassifyTemplateAttrVO> attrVOS = templateVO.getAttributes().stream().filter(s -> !DEFAULT_SYNC_ATTR_LIST.contains(s.getId()) && VciBaseUtil.getBoolean(s.getFormDisplayFlag())
- ).collect(Collectors.toList());
- //this.getConfigDatas(finalSystemId, libray, applyDatasVO, attrVOS, dataObjectVO);
- log.info("end锛氭暟鎹粍缁囧畬姣�");
- //瑙勫垯鐨勪富閿渶瑕佸幓鑾峰彇
- CodeClassifyFullInfoBO classifyFullInfo = classifyService.getClassifyFullInfo(codeClassifyVO.getOid());
- if(classifyFullInfo==null ||classifyFullInfo.getCurrentClassifyVO()==null || StringUtils.isBlank(classifyFullInfo.getCurrentClassifyVO().getOid())){
- objerrorCode="1";
- log.info("classifyFullInfo:"+"鏍规嵁浼犺緭鐨勫垎绫伙紝鏈幏鍙栧垎绫荤浉鍏充俊鎭�");
- throw new Throwable ("鏍规嵁浼犺緭鐨勫垎绫伙紝鏈幏鍙栧垎绫荤浉鍏充俊鎭�");
- }
- CodeRuleVO ruleVO = engineService.getCodeRuleByClassifyFullInfo(classifyFullInfo);
- if(ruleVO==null||StringUtils.isBlank(ruleVO.getOid())){
- objerrorCode="102";
- throw new Throwable ("鏍规嵁浼犺緭鐨勫垎绫伙紝鏈幏鍙朚DM绯荤粺涓搴旇鍒�");
- }
- log.info("end锛氳鍒欒幏鍙栧畬姣�");
- //List<CodeOrderSecDTO> codeOrderSecDTOList = getRuleCodeOrderSecDTOs(ruleVO,classifyFullInfo);
- log.info("end锛氱爜娈佃幏鍙栧畬姣�");
- CodeOrderDTO orderDTO = new CodeOrderDTO();
- orderDTO.setCodeClassifyOid(codeClassifyVO.getOid());//鍒嗙被涓婚敭
- //orderDTO.setSecDTOList(codeOrderSecDTOList);//鍒嗙被鐮佹
- mdmIOService.batchSyncApplyCode(orderDTO, dataObjectVO, resultDataObjectDetailDOs,isCodeOrGroupCode);
- //allResultDataObjectDetailDOS.add(resultDataObjectDetailDOs);
- log.info("end锛氱敵璇疯幏鍙栧畬姣�");
- } catch (Throwable e) {
- List<ApplyBZDataVO> applyDataVOList = classfyBZVO.getObjects().getObject();
- objerrorCode = "1";
- if (!CollectionUtils.isEmpty(applyDataVOList)) {
- applyDataVOList.stream().forEach(applyDataVO -> {
+ List<CodeClassifyTemplateAttrVO> attrVOS = templateVO.getAttributes().stream().filter(s -> !DEFAULT_SYNC_ATTR_LIST.contains(s.getId()) && VciBaseUtil.getBoolean(s.getFormDisplayFlag())
+ ).collect(Collectors.toList());
+ List<ApplyBZDataVO> applyBZDataVOList= applyBZDatasVO.getObject();
+ String finalLibray = libray;
+ ClassfyBZVO finalClassfyBZVO = classfyBZVO;
+ applyBZDataVOList.stream().forEach(applyBZDataVO -> {
+ try {
+ this.getConfigDatas(finalSystemId, finalLibray, applyBZDatasVO, attrVOS, dataObjectVO);
+ log.info("end锛氭暟鎹粍缁囧畬姣�");
+ //瑙勫垯鐨勪富閿渶瑕佸幓鑾峰彇
+ CodeClassifyFullInfoBO classifyFullInfo = classifyService.getClassifyFullInfo(codeClassifyVO.getOid());
+ if(classifyFullInfo==null ||classifyFullInfo.getCurrentClassifyVO()==null || StringUtils.isBlank(classifyFullInfo.getCurrentClassifyVO().getOid())){
+ objerrorCode="1";
+ log.info("classifyFullInfo:"+"鏍规嵁浼犺緭鐨勫垎绫伙紝鏈幏鍙栧垎绫荤浉鍏充俊鎭�");
+ throw new Throwable ("鏍规嵁浼犺緭鐨勫垎绫伙紝鏈幏鍙栧垎绫荤浉鍏充俊鎭�");
+ }
+ CodeRuleVO ruleVO = engineService.getCodeRuleByClassifyFullInfo(classifyFullInfo);
+ if(ruleVO==null||StringUtils.isBlank(ruleVO.getOid())){
+ objerrorCode="102";
+ throw new Throwable ("鏍规嵁浼犺緭鐨勫垎绫伙紝鏈幏鍙朚DM绯荤粺涓搴旇鍒�");
+ }
+ log.info("end锛氳鍒欒幏鍙栧畬姣�");
+ //List<CodeOrderSecDTO> codeOrderSecDTOList = getRuleCodeOrderSecDTOs(ruleVO,classifyFullInfo);
+ log.info("end锛氱爜娈佃幏鍙栧畬姣�");
+ CodeOrderDTO orderDTO = new CodeOrderDTO();
+ orderDTO.setCodeClassifyOid(codeClassifyVO.getOid());//鍒嗙被涓婚敭
+ //orderDTO.setSecDTOList(codeOrderSecDTOList);//鍒嗙被鐮佹
+ //mdmIOService.batchSyncApplyCode(orderDTO, dataObjectVO, resultDataObjectDetailDOs,isCodeOrGroupCode);
+ //allResultDataObjectDetailDOS.add(resultDataObjectDetailDOs);
+ log.info("end锛氱敵璇疯幏鍙栧畬姣�");
+ } catch (Throwable e) {
+ List<ApplyBZDataVO> applyDataVOList = finalClassfyBZVO.getObjects().getObject();
+ objerrorCode = "1";
+ if (!CollectionUtils.isEmpty(applyDataVOList)) {
+ applyDataVOList.stream().forEach(applyDataVO -> {
+ XMLResultDataObjectDetailDO xmlResultDataObjectDetailDO = new XMLResultDataObjectDetailDO();
+ xmlResultDataObjectDetailDO.setCode("");
+ xmlResultDataObjectDetailDO.setId(applyDataVO.getId());
+ xmlResultDataObjectDetailDO.setErrorid(objerrorCode);
+ xmlResultDataObjectDetailDO.setMsg("缂栫爜鐢宠澶辫触:" + e.getMessage());
+ resultDataObjectDetailDOs.add(xmlResultDataObjectDetailDO);
+ });
+ } else {
XMLResultDataObjectDetailDO xmlResultDataObjectDetailDO = new XMLResultDataObjectDetailDO();
xmlResultDataObjectDetailDO.setCode("");
- xmlResultDataObjectDetailDO.setId(applyDataVO.getId());
+ xmlResultDataObjectDetailDO.setId("");
xmlResultDataObjectDetailDO.setErrorid(objerrorCode);
xmlResultDataObjectDetailDO.setMsg("缂栫爜鐢宠澶辫触:" + e.getMessage());
resultDataObjectDetailDOs.add(xmlResultDataObjectDetailDO);
- });
- } else {
- XMLResultDataObjectDetailDO xmlResultDataObjectDetailDO = new XMLResultDataObjectDetailDO();
- xmlResultDataObjectDetailDO.setCode("");
- xmlResultDataObjectDetailDO.setId("");
- xmlResultDataObjectDetailDO.setErrorid(objerrorCode);
- xmlResultDataObjectDetailDO.setMsg("缂栫爜鐢宠澶辫触:" + e.getMessage());
- resultDataObjectDetailDOs.add(xmlResultDataObjectDetailDO);
+ }
+ e.printStackTrace();
}
- e.printStackTrace();
- } finally {
- XMLResultClassfyVO resultClassfyVO = new XMLResultClassfyVO();
- resultClassfyVO.setClassCode(classfyBZVO.getClassCode());
- resultClassfyVO.setLibrary(classfyBZVO.getLibrary());
- resultClassfyVO.setFullclsfNamePath(classfyBZVO.getFullclsfNamePath());
- resultClassfyVO.setObjects(resultDataObjectDetailDOs);
- resultClassfyVOList.add(resultClassfyVO);
- }
+ });
+ XMLResultClassfyVO resultClassfyVO = new XMLResultClassfyVO();
+ resultClassfyVO.setClassCode(finalClassfyBZVO.getClassCode());
+ resultClassfyVO.setLibrary(finalClassfyBZVO.getLibrary());
+ resultClassfyVO.setFullclsfNamePath(finalClassfyBZVO.getFullclsfNamePath());
+ resultClassfyVO.setObjects(resultDataObjectDetailDOs);
+ resultClassfyVOList.add(resultClassfyVO);
XMLResultSystemVO xmlResultSystemVO = new XMLResultSystemVO();
xmlResultSystemVO.setClassifys(resultClassfyVOList);
xmlResultSystemVO.setMsg(msg);
@@ -2081,6 +2106,7 @@
e.printStackTrace();
msg="鐢宠缂栫爜澶辫触:"+e.getMessage();
}finally {
+
XMLResultSystemVO xmlResultSystemVO=new XMLResultSystemVO();
xmlResultSystemVO.setClassifys(resultClassfyVOList);
xmlResultSystemVO.setMsg(msg);
@@ -2129,7 +2155,7 @@
if (!CollectionUtils.isEmpty(codeClassifyList)) {
codeClassifyList.stream().forEach(codeClassify -> {
CodeClassifyVO codeClassifyVO= classifyService.getTopClassifyVO(codeClassify.getOid());
- if(codeClassifyVO.getId().equals(libray)){
+ if(codeClassifyVO.getId().toUpperCase(Locale.ROOT).equals(libray.toUpperCase(Locale.ROOT))){
newCodeClassify[0] =codeClassify;
}
});
@@ -2171,7 +2197,7 @@
if (!CollectionUtils.isEmpty(codeClassifyList)) {
codeClassifyList.stream().forEach(codeClassify -> {
CodeClassifyVO codeClassifyVO= classifyService.getTopClassifyVO(codeClassify.getOid());
- if(codeClassifyVO.getId().equals(libray)){
+ if(codeClassifyVO.getId().toUpperCase(Locale.ROOT).equals(libray.toUpperCase(Locale.ROOT))){
newCodeClassify[0] =codeClassify;
}
});
@@ -2286,6 +2312,115 @@
}
return codeOrderSecDTOList;
}
+
+ public void getConfigDatas(String systemId,String libray, ApplyBZDatasVO applyDatasVO,List<CodeClassifyTemplateAttrVO> codeClassifyTemplateAttrVOList,DataObjectVO dataObjectVO) throws Throwable {
+
+ LinkedHashMap<String,LinkedHashMap<String,String>> dataKeyValueMap=new LinkedHashMap<>();
+ //濡傛灉灏嗘暟鎹浆鎹㈡垚鎵�闇�瑕佺殑鏁版嵁瀵硅薄
+ Map<String, String> attrMapConfigMap=new HashMap<>();
+ Map<String, String> propMaps=new HashMap<>();
+ try {
+ log.info("寮�濮嬭鍙栫郴缁熼厤缃枃浠� start");
+ Map<String, String> stringStringMap=attributeMapConfig.getSystem_attrmap();
+ log.info("闆嗘垚绯荤粺灞炴�ф槧灏勯厤缃枃浠舵潯鐩暟-銆�"+stringStringMap.size());
+ //stringStringMap.put("RLM","D:\\RLM.xml");
+ if(!CollectionUtils.isEmpty(stringStringMap)) {
+ log.info("info锛氶渶瑕佽鍙栭厤缃枃浠�");
+ LibraryDO libraryDO = gennerAttrMapUtil.getNewInstance().gennerAttrMapBySystem(systemId, stringStringMap);
+ List<LibraryClsfDO> libraryClsfDOList = libraryDO.getClsf();
+ if(!CollectionUtils.isEmpty(libraryClsfDOList)) {
+ Map<String, List<ClsfAttrMappingDO>> libPropMaps = libraryClsfDOList.stream().collect(Collectors.toMap(LibraryClsfDO::getLibrary, LibraryClsfDO::getProp, (key1, key2) -> key2));
+ log.info("鏍规嵁鍙傛暟锛歭ibray锛�-銆�" + libray + "浠庨厤缃枃浠朵腑鎵惧搴斿睘鎬ф槧灏勯厤缃�");
+ String path=stringStringMap.get(systemId);
+ if (libPropMaps.containsKey(libray.toUpperCase(Locale.ROOT))) {
+ log.info("鏍规嵁鍙傛暟锛歭ibray锛�-銆�" + libray + "鍖归厤鍒扮浉搴旂殑灞炴�ф槧灏勪俊鎭�");
+ List<ClsfAttrMappingDO> clsfAttrMappingDOList = libPropMaps.get(libray.toUpperCase(Locale.ROOT));
+ propMaps = clsfAttrMappingDOList.stream().collect(Collectors.toMap(ClsfAttrMappingDO::getSourceKey, ClsfAttrMappingDO::getTargetKey, (key1, key2) -> key2));
+ log.info("鏍规嵁鍙傛暟锛歭ibray锛�-銆�" + libray + "鍖归厤鍒扮浉搴旂殑灞炴�ф槧灏勪俊鎭�,灞炴�ф槧灏勬潯鐩暟+" + clsfAttrMappingDOList.size());
+ }else{
+ throw new Throwable("鏍规嵁绯荤粺鏍囪瘑銆�"+systemId+"銆戞壘鍒板搴旂殑閰嶇疆鏂囦欢:銆�"+path+"銆戯紝浣嗘湭鑾峰彇鍒板搴旂殑搴撱��"+libray+"銆戝睘鎬ф槧灏勪俊鎭厤缃�");
+ }
+ }
+ }
+ log.info("鏍规嵁鍙傛暟锛歭ibray锛�-銆�"+libray+"浠庨厤缃枃浠朵腑鎵惧搴斿睘鎬ф槧灏勯厤缃� end ");
+ }catch (Throwable e){
+ objerrorCode="1";
+ e.printStackTrace();
+ throw new Throwable("MDM闆嗘垚灞炴�ч厤缃枃浠惰鍙栧け璐�");
+ }
+ LinkedList<String> rowNameList=new LinkedList<>();
+ LinkedHashMap<String,Integer> filedIndexMap=new LinkedHashMap<>();
+ //鏍规嵁鍒嗙被妯℃澘缁勭粐鏁版嵁
+ final int[] index = {0};
+ try {
+ codeClassifyTemplateAttrVOList.stream().forEach(codeClassifyTemplateAttrVO -> {
+ String attrName = codeClassifyTemplateAttrVO.getName();
+ String field = codeClassifyTemplateAttrVO.getId();
+ rowNameList.add(attrName);
+ filedIndexMap.put(field, index[0]++);
+ });
+ dataObjectVO.setColName(rowNameList);//鏀惧叆灞炴��
+ attrMapConfigMap.putAll(propMaps);
+ LinkedList<RowDatas> rowDataList = new LinkedList<>();
+ List<ApplyBZDataVO> applyBZDataVOList=new ArrayList<>();
+
+ if(!CollectionUtils.isEmpty(applyDatasVO.getObject())){
+ applyBZDataVOList=applyDatasVO.getObject();
+ }
+ //Map<String, List<ProppertyVO>> dataPropMap = applyDataVOList.stream().collect(Collectors.toMap(ApplyDataVO::getId, ApplyDataVO::getProp, (key1, key2) -> key2));
+ final int[] rowIndex = {0};
+ applyBZDataVOList.stream().forEach(applyDataVO -> {
+ rowIndex[0]++;
+ RowDatas rowDatas = new RowDatas();
+ rowDatas.setOid(applyDataVO.getId());
+ rowDatas.setCreator(applyDataVO.getCreator());
+ rowDatas.setEditor(applyDataVO.getEditor());
+ rowDatas.setCode(applyDataVO.getCode());
+ rowDatas.setOperation("create");
+ rowDatas.setStatus(applyDataVO.getStatus());
+ rowDatas.setRowIndex(rowIndex[0] + "");
+ List<ProppertyVO> proppertyVOList = applyDataVO.getProp();
+
+ LinkedHashMap<Integer, String> integerValueMap = new LinkedHashMap<>();
+ Map<String, String> filedValueMap = new HashMap<>();
+ if (!CollectionUtils.isEmpty(proppertyVOList)) {
+ Map<String, String> sourceKeyValueMap = proppertyVOList.stream().collect(Collectors.toMap(ProppertyVO::getKey, ProppertyVO::getValue, (key1, key2) -> key2));
+ Map<String, String> keyValueMap = new HashMap<>();
+ //鍒ゆ柇attrMapConfigMap鏄惁鏈夊�硷紝濡傛灉娌℃湁鍒欒鏄庡熀纭�榛樿鐨勬槸缂栫爜绯荤粺瀛楁
+ if (!CollectionUtils.isEmpty(attrMapConfigMap)) {
+ sourceKeyValueMap.keySet().forEach(sourceKey -> {
+ String dataValue = sourceKeyValueMap.get(sourceKey);
+ if (attrMapConfigMap.containsKey(sourceKey)) {
+ String targetKey = attrMapConfigMap.get(sourceKey);
+ keyValueMap.put(targetKey, StringUtils.isBlank(dataValue)?"":dataValue);
+ }
+ });
+ } else {
+ sourceKeyValueMap.forEach((filed,value)->{
+ keyValueMap.put(filed,StringUtils.isBlank(value)?"":value) ;
+ });
+ }
+
+ filedIndexMap.forEach((attrKey, column) -> {
+ String keyValue = "";
+ if (keyValueMap.containsKey(attrKey)) {
+ keyValue =StringUtils.isBlank(keyValueMap.get(attrKey))?"":keyValueMap.get(attrKey);
+ }
+ integerValueMap.put(column, keyValue);
+ filedValueMap.put(attrKey, keyValue);
+ });
+ }
+ rowDatas.setData(integerValueMap);
+ rowDatas.setFiledValue(filedValueMap);
+ rowDataList.add(rowDatas);
+ });
+ dataObjectVO.setRowData(rowDataList);
+ }catch (Throwable e){
+ objerrorCode="1";
+ throw new Throwable("缁勭粐鏁版嵁鏄犲皠鍊煎け璐�");
+ }
+ }
+
/***
* 鏍规嵁灞炴�ф槧灏勮浆鎹㈢紪鐮佹墍闇�瀛楁
*/
@@ -2308,9 +2443,9 @@
Map<String, List<ClsfAttrMappingDO>> libPropMaps = libraryClsfDOList.stream().collect(Collectors.toMap(LibraryClsfDO::getLibrary, LibraryClsfDO::getProp, (key1, key2) -> key2));
log.info("鏍规嵁鍙傛暟锛歭ibray锛�-銆�" + libray + "浠庨厤缃枃浠朵腑鎵惧搴斿睘鎬ф槧灏勯厤缃�");
String path=stringStringMap.get(systemId);
- if (libPropMaps.containsKey(libray)) {
+ if (libPropMaps.containsKey(libray.toUpperCase(Locale.ROOT))) {
log.info("鏍规嵁鍙傛暟锛歭ibray锛�-銆�" + libray + "鍖归厤鍒扮浉搴旂殑灞炴�ф槧灏勪俊鎭�");
- List<ClsfAttrMappingDO> clsfAttrMappingDOList = libPropMaps.get(libray);
+ List<ClsfAttrMappingDO> clsfAttrMappingDOList = libPropMaps.get(libray.toUpperCase(Locale.ROOT));
propMaps = clsfAttrMappingDOList.stream().collect(Collectors.toMap(ClsfAttrMappingDO::getSourceKey, ClsfAttrMappingDO::getTargetKey, (key1, key2) -> key2));
log.info("鏍规嵁鍙傛暟锛歭ibray锛�-銆�" + libray + "鍖归厤鍒扮浉搴旂殑灞炴�ф槧灏勪俊鎭�,灞炴�ф槧灏勬潯鐩暟+" + clsfAttrMappingDOList.size());
}else{
--
Gitblit v1.9.3