From 6732cd7a4e0fd7ea083d4ae11254bde35adb1ee4 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期五, 17 十一月 2023 01:39:20 +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 | 78 ++++++++++++++++++++++++--------------
1 files changed, 49 insertions(+), 29 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 6b9ab8e..e468dc1 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)) {
@@ -1205,10 +1220,10 @@
throw new Throwable(msg);
}
} else {
- TreeQueryObject treeQueryObject = new TreeQueryObject();
+ /*TreeQueryObject treeQueryObject = new TreeQueryObject();
treeQueryObject.setParentOid(oid);
- treeQueryObject.setQueryAllLevel(true);
- codeClassifyVOS = classifyService.selectCodeClassifyDOByTree(treeQueryObject);
+ treeQueryObject.setQueryAllLevel(true);*/
+ codeClassifyVOS = classifyService.getIdPathToNamePathByParentId(oid,false);
}
}else{
errorid = "101";
@@ -1228,7 +1243,7 @@
classifyVO.setDescription(codeClassifyDO.getDescription());
classifyVO.setName(codeClassifyDO.getName());
classifyVO.setPid(codeClassifyDO.getParentCodeClassifyOid());
- classifyVO.setFullPathName(codeClassifyDO.getPath());
+ classifyVO.setFullPathName(codeClassifyDO.getNamePath());
classifyVOList.add(classifyVO);
});
libraryVo.setClassify(classifyVOList);
@@ -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,"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")){//鍒嗙被鐮佹
@@ -1664,8 +1683,8 @@
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 = map.getOrDefault("description".toUpperCase(Locale.ROOT), "").toString();
- CodeSectionValueVO sectionValueVO = new CodeSectionValueVO(id, num[0] + "", value, text, "", description);
+ 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);
});
}
@@ -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();
@@ -2135,7 +2155,7 @@
if (!CollectionUtils.isEmpty(codeClassifyList)) {
codeClassifyList.stream().forEach(codeClassify -> {
CodeClassifyVO codeClassifyVO= classifyService.getTopClassifyVO(codeClassify.getOid());
- if(codeClassifyVO.getId().toLowerCase(Locale.ROOT).equals(libray.toLowerCase(Locale.ROOT))){
+ if(codeClassifyVO.getId().toUpperCase(Locale.ROOT).equals(libray.toUpperCase(Locale.ROOT))){
newCodeClassify[0] =codeClassify;
}
});
@@ -2177,7 +2197,7 @@
if (!CollectionUtils.isEmpty(codeClassifyList)) {
codeClassifyList.stream().forEach(codeClassify -> {
CodeClassifyVO codeClassifyVO= classifyService.getTopClassifyVO(codeClassify.getOid());
- if(codeClassifyVO.getId().toLowerCase(Locale.ROOT).equals(libray.toLowerCase(Locale.ROOT))){
+ if(codeClassifyVO.getId().toUpperCase(Locale.ROOT).equals(libray.toUpperCase(Locale.ROOT))){
newCodeClassify[0] =codeClassify;
}
});
@@ -2312,9 +2332,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{
@@ -2423,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