From c57caa56fcd01c0989f336aa76aad3d34d5bb07f Mon Sep 17 00:00:00 2001 From: xiejun <xj@2023> Date: 星期五, 15 十二月 2023 10:59:08 +0800 Subject: [PATCH] 集成接口日志信息完善 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java | 68 ++++++++++++++++++++++++++-------- 1 files changed, 52 insertions(+), 16 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 40aa35b..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; //杩欐槸璐﹀彿淇℃伅 @@ -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; //杩欐槸璐﹀彿淇℃伅 @@ -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()); @@ -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()); @@ -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(); }); }); } -- Gitblit v1.9.3