From e2e754588cd9a3a15222fcb059d42aa10d763d90 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 15 十二月 2023 11:23:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java | 100 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 74 insertions(+), 26 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 755fdba..8cb5f04 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
@@ -283,8 +283,12 @@
systemId = interParameterVO.getData().getSystemId();
UserVO userVo = interParameterVO.getData().getUser();
//鍏嶅瘑鐧诲綍鐢宠token锛宺equest涓坊鍔犵敤鎴蜂俊鎭�
-
- passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(Locale.ROOT),this.getRequest());
+ try {
+ passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(Locale.ROOT), this.getRequest());
+ }catch (Throwable e){
+ errorid[0] ="1";
+ throw new Throwable("鐢ㄦ埛閴存潈澶辫触.");
+ }
List<ClassfyVO> classVOList = classfysVO.getClassify();
InterParameterVO finalInterParameterVO = interParameterVO;
//杩欐槸璐﹀彿淇℃伅
@@ -315,7 +319,7 @@
//鏍￠獙鏄惁閰嶇疆
DockingSystemConfig dockingSystemConfig=null;
dockingSystemConfig=checkIspass(finalSystemId, SysIntegrationDataFlowTypeEnum.ACCEPT.getValue(), sysIntegrationPushTypeEnum.ACCPET_APPCODE.getValue(),codeClassifyVO.getOid());
- if(dockingSystemConfig==null){
+ if(dockingSystemConfig==null||StringUtils.isBlank(dockingSystemConfig.getOid())){
errorid[0] ="101";
throw new Throwable("绯荤粺鏍囪瘑涓恒��"+ finalSystemId +"銆戯紝闆嗘垚鍒嗙被涓恒��"+codeClassifyVO.getName()+"銆戜互涓婂垎绫伙紝"+sysIntegrationPushTypeEnum.ACCPET_APPCODE.getText()+"鎺ュ彛閰嶇疆宸插仠鐢ㄦ垨鑰呮湭閰嶇疆锛岃鑱旂郴缂栫爜绠＄悊鍛橈紒");
}
@@ -416,10 +420,10 @@
if(!CollectionUtils.isEmpty(resultClassfyVOList)) {
resultClassfyVOList.stream().forEach(xMLResultClassfyVO -> {
xMLResultClassfyVO.getObjects().stream().forEach(objec -> {
- if (!(objec.getErrorid().equals("0") || objec.getErrorid().equals("204"))) {
+ if (!(objec.getErrorid().equals("0")||objec.getErrorid().equals("201") ||objec.getErrorid().equals("205")|| objec.getErrorid().equals("204"))) {
issucess[0] = false;
- msg=objec.getMsg();
}
+ msg=objec.getMsg();
});
});
}
@@ -461,7 +465,11 @@
if(personData==null){
throw new Throwable("浼犲叆鍙傛暟涓簄ull");
}
- passwordFreeLoginService.pwdFreeLoginByBoolean(systemCode.toLowerCase(Locale.ROOT),this.getRequest());
+ try {
+ passwordFreeLoginService.pwdFreeLoginByBoolean(systemCode.toLowerCase(),this.getRequest());
+ }catch (Throwable e){
+ throw new Throwable("鐢ㄦ埛閴存潈澶辫触");
+ }
masterDataList = personData.getMasterData();
String personLibrary = personAndDeptConfig.getPersonLibrary();
if (StringUtils.isBlank(personLibrary)) {
@@ -739,8 +747,11 @@
throw new Throwable("浼犲叆鍙傛暟涓簄ull");
}
systemCode=orgData.getSystemCode();
- passwordFreeLoginService.pwdFreeLoginByBoolean(systemCode.toLowerCase(),this.getRequest());
-
+ try {
+ passwordFreeLoginService.pwdFreeLoginByBoolean(systemCode.toLowerCase(),this.getRequest());
+ }catch (Throwable e){
+ throw new Throwable("鐢ㄦ埛閴存潈澶辫触");
+ }
orgMasterDataList = orgData.getMasterData();
String personLibrary = personAndDeptConfig.getPersonLibrary();
if (StringUtils.isBlank(personLibrary)) {
@@ -1036,7 +1047,12 @@
UserVO userVo = interParameterVO.getData().getUser();
//鍏嶅瘑鐧诲綍鐢宠token锛宺equest涓坊鍔犵敤鎴蜂俊鎭�
//passwordFreeLoginService.pwdFreeLoginByBoolean(userVo.getUserName(),this.getRequest());
- passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(Locale.ROOT),this.getRequest());
+ try {
+ passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(),this.getRequest());
+ }catch (Throwable e){
+ errorid = "1";
+ throw new Throwable("鐢ㄦ埛閴存潈澶辫触");
+ }
List<ClassfyVO> classVOList = classfysVO.getClassify();
InterParameterVO finalInterParameterVO = interParameterVO;
//杩欐槸璐﹀彿淇℃伅
@@ -1064,7 +1080,7 @@
if(CODE_CHECKCONFIG) {
//鏍￠獙鏄惁閰嶇疆
DockingSystemConfig dockingSystemConfig= checkIspass(finalSystemId, SysIntegrationDataFlowTypeEnum.ACCEPT.getValue(), sysIntegrationPushTypeEnum.ACCPET_EDITCODE.getValue(),codeClassifyVO.getOid());
- if(dockingSystemConfig==null){
+ if(dockingSystemConfig==null||StringUtils.isBlank(dockingSystemConfig.getOid())){
objerrorCode ="101";
throw new Throwable("绯荤粺鏍囪瘑涓恒��"+ finalSystemId +"銆戯紝闆嗘垚鍒嗙被涓恒��"+codeClassifyVO.getName()+"銆戜互涓婂垎绫伙紝"+sysIntegrationPushTypeEnum.ACCPET_EDITCODE.getText()+"鎺ュ彛閰嶇疆宸插仠鐢ㄦ垨鑰呮湭閰嶇疆锛岃鑱旂郴缂栫爜绠＄悊鍛橈紒");
}
@@ -1144,10 +1160,10 @@
if(!CollectionUtils.isEmpty(resultClassfyVOList)) {
resultClassfyVOList.stream().forEach(xMLResultClassfyVO -> {
xMLResultClassfyVO.getObjects().stream().forEach(objec -> {
- if (!(objec.getErrorid().equals("0") || objec.getErrorid().equals("204"))) {
+ if (!(objec.getErrorid().equals("0")||objec.getErrorid().equals("201") ||objec.getErrorid().equals("205")|| objec.getErrorid().equals("204"))) {
issucess[0] = false;
- msg=objec.getMsg();
}
+ msg=objec.getMsg();
});
});
}
@@ -1212,7 +1228,12 @@
systemId=queryData.getSystemId();
//鍏嶅瘑鐧诲綍鐢宠token锛宺equest涓坊鍔犵敤鎴蜂俊鎭�
//passwordFreeLoginService.pwdFreeLoginByBoolean(userVo.getUserName(),this.getRequest());
- passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(),this.getRequest());
+ try {
+ passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(),this.getRequest());
+ }catch (Throwable e){
+ errorid = "1";
+ throw new Throwable("鐢ㄦ埛閴存潈澶辫触");
+ }
QueryLibraryVO libraryVO= queryData.getLibrary();
String libId= libraryVO.getId();
@@ -1373,7 +1394,12 @@
UserVO userVo=condtionsVO.getUser();
//鍏嶅瘑鐧诲綍鐢宠token锛宺equest涓坊鍔犵敤鎴蜂俊鎭�
//passwordFreeLoginService.pwdFreeLoginByBoolean(userVo.getUserName(),this.getRequest());
- passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(),this.getRequest());
+ try {
+ passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(),this.getRequest());
+ }catch (Throwable e){
+ errorid = "1";
+ throw new Throwable("鐢ㄦ埛閴存潈澶辫触");
+ }
CondtionVO condtionVO= condtionsVO.getCondtion();
SessionInfo sessionInfo = new SessionInfo();
sessionInfo.setUserId(userVo.getUserName());
@@ -1421,7 +1447,7 @@
if(CODE_CHECKCONFIG) {
//鏍￠獙鏄惁閰嶇疆
DockingSystemConfig dockingSystemConfig= checkIspass(systemId, SysIntegrationDataFlowTypeEnum.ACCEPT.getValue(), sysIntegrationPushTypeEnum.ACCPET_QUERYDATA.getValue(),currentCodeClassify[0].getOid());
- if(dockingSystemConfig==null){
+ if(dockingSystemConfig==null||StringUtils.isBlank(dockingSystemConfig.getOid())){
errorid ="101";
throw new Throwable("绯荤粺鏍囪瘑涓恒��"+ systemId +"銆戯紝闆嗘垚鍒嗙被涓恒��"+currentCodeClassify[0].getName()+"銆戜互涓婂垎绫伙紝"+sysIntegrationPushTypeEnum.ACCPET_QUERYDATA.getText()+"鎺ュ彛閰嶇疆宸插仠鐢ㄦ垨鑰呮湭閰嶇疆锛岃鑱旂郴缂栫爜绠＄悊鍛橈紒");
}
@@ -1591,7 +1617,12 @@
systemId=queryData.getSystemId();
//鍏嶅瘑鐧诲綍鐢宠token锛宺equest涓坊鍔犵敤鎴蜂俊鎭�
//passwordFreeLoginService.pwdFreeLoginByBoolean(userVo.getUserName(),this.getRequest());
- passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(),this.getRequest());
+ try {
+ passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(),this.getRequest());
+ }catch (Throwable e){
+ errorid = "1";
+ throw new Throwable("鐢ㄦ埛閴存潈澶辫触");
+ }
QueryLibraryVO libraryVO= queryData.getLibrary();
String libId= libraryVO.getId();
@@ -2049,7 +2080,12 @@
UserVO userVo = applyBZParamVO.getData().getUser();
//鍏嶅瘑鐧诲綍鐢宠token锛宺equest涓坊鍔犵敤鎴蜂俊鎭�
//passwordFreeLoginService.pwdFreeLoginByBoolean(userVo.getUserName(), this.getRequest());
- passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(),this.getRequest());
+ try {
+ passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(),this.getRequest());
+ }catch (Throwable e){
+ errorid[0] = "1";
+ throw new Throwable("鐢ㄦ埛閴存潈澶辫触");
+ }
//杩欐槸璐﹀彿淇℃伅
SessionInfo sessionInfo = new SessionInfo();
sessionInfo.setUserId(userVo.getUserName());
@@ -2072,7 +2108,7 @@
//鏍￠獙鏄惁閰嶇疆
DockingSystemConfig dockingSystemConfig=null;
dockingSystemConfig=checkIspass(finalSystemId, SysIntegrationDataFlowTypeEnum.ACCEPT.getValue(), sysIntegrationPushTypeEnum.ACCPET_APPCODE.getValue(),codeClassifyVO.getOid());
- if(dockingSystemConfig==null){
+ if(dockingSystemConfig==null||StringUtils.isBlank(dockingSystemConfig.getOid())){
errorid[0] ="101";
throw new Throwable("绯荤粺鏍囪瘑涓恒��"+ finalSystemId +"銆戯紝闆嗘垚鍒嗙被涓恒��"+codeClassifyVO.getName()+"銆戜互涓婂垎绫伙紝"+sysIntegrationPushTypeEnum.ACCPET_APPCODE.getText()+"鎺ュ彛閰嶇疆宸插仠鐢ㄦ垨鑰呮湭閰嶇疆锛岃鑱旂郴缂栫爜绠＄悊鍛橈紒");
}
@@ -2189,10 +2225,10 @@
if(!CollectionUtils.isEmpty(resultClassfyVOList)) {
resultClassfyVOList.stream().forEach(xMLResultClassfyVO -> {
xMLResultClassfyVO.getObjects().stream().forEach(objec -> {
- if (!(objec.getErrorid().equals("0") || objec.getErrorid().equals("204"))) {
+ if (!(objec.getErrorid().equals("0")||objec.getErrorid().equals("201")||objec.getErrorid().equals("205") || objec.getErrorid().equals("204"))) {
issucess[0] = false;
- msg=objec.getMsg();
}
+ msg=objec.getMsg();
});
});
}
@@ -2426,7 +2462,7 @@
}catch (Throwable e){
objerrorCode="1";
e.printStackTrace();
- throw new Throwable("MDM闆嗘垚灞炴�ч厤缃枃浠惰鍙栧け璐�");
+ throw new Throwable("闆嗘垚绯荤粺鏍囪瘑涓猴細銆�"+systemId+"銆戯紝鍒嗙被搴撲负:銆�"+libray+"銆戠殑闆嗘垚灞炴�ч厤缃枃浠惰鍙栧け璐�");
}
LinkedList<String> rowNameList=new LinkedList<>();
LinkedHashMap<String,Integer> filedIndexMap=new LinkedHashMap<>();
@@ -2537,7 +2573,7 @@
}catch (Throwable e){
objerrorCode="1";
e.printStackTrace();
- throw new Throwable("MDM闆嗘垚灞炴�ч厤缃枃浠惰鍙栧け璐�");
+ throw new Throwable("闆嗘垚绯荤粺鏍囪瘑涓猴細銆�"+systemId+"銆戯紝鍒嗙被搴撲负:銆�"+libray+"銆戠殑闆嗘垚灞炴�ч厤缃枃浠惰鍙栧け璐�");
}
LinkedList<String> rowNameList=new LinkedList<>();
LinkedHashMap<String,Integer> filedIndexMap=new LinkedHashMap<>();
@@ -2729,8 +2765,15 @@
*/
private DockingSystemConfig checkIspass(String systemId,String type,String operationType,String classOid){
log.info("systemId锛�"+systemId+",type:"+SysIntegrationDataFlowTypeEnum.getTextByValue(type)+",operationType:"+sysIntegrationPushTypeEnum.getTextByValue(operationType)+",classOid:"+classOid);
- CodeClassifyVO codeClassifyVO= classifyService.getObjectByOid(classOid);
- classOid=codeClassifyVO.getOid();
+ //CodeClassifyVO codeClassifyVO= classifyService.getObjectByOid(classOid);
+ List<CodeClassify> codeClassifyList= classifyService.selectAllLevelParentByOid(classOid);
+ List<String> classifyOids=new ArrayList<>();
+ if(!CollectionUtils.isEmpty(codeClassifyList)) {
+ classifyOids = codeClassifyList.stream().map(CodeClassify::getOid).collect(Collectors.toList());
+ }else{
+ return null;
+ }
+ //classOid=codeClassifyVO.getOid();
//鏍规嵁绫诲瀷鍘绘煡璇㈤渶瑕侀泦鎴愮殑鍒嗙被鎴栬�呮暟鎹�
LambdaQueryWrapper<DockingSystemConfig> queryWrapper = Wrappers.<DockingSystemConfig>lambdaQuery();
queryWrapper.eq(DockingSystemConfig::getUsedFlag, MdmDuckingConstant.SEND_FLAG_TRUE);
@@ -2738,11 +2781,16 @@
queryWrapper.eq(DockingSystemConfig::getDataFlowType,type);
queryWrapper.eq(DockingSystemConfig::getPushType,operationType);
if(StringUtils.isNotBlank(classOid)){
- queryWrapper.in(DockingSystemConfig::getClassifyOid,classOid);
+ queryWrapper.in(DockingSystemConfig::getClassifyOid,classifyOids);
}
List<DockingSystemConfig> dockingSystemConfigList=new ArrayList<>();
dockingSystemConfigList= dockingSystemConfigList=dockingSystemConfigService.list(queryWrapper);
if(!CollectionUtils.isEmpty(dockingSystemConfigList)){
+ return dockingSystemConfigList.get(0);
+ }else{
+ return null;
+ }
+ /*if(!CollectionUtils.isEmpty(dockingSystemConfigList)){
return dockingSystemConfigList.get(0);
}else{
if(StringUtils.isNotBlank(codeClassifyVO.getParentCodeClassifyOid())) {
@@ -2753,6 +2801,6 @@
return dockingSystemConfigList.get(0);
}else{
return new DockingSystemConfig();
- }
+ }*/
}
}
--
Gitblit v1.9.3