test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(接口测试): 解决选择模块导入问题 

--user=郭雨琦
--bug=1014674
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001014674
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001014679
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001014677
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001014689
This commit is contained in:
guoyuqi 2022-07-06 17:05:48 +08:00 committed by xiaomeinvG
parent 56f9247739
commit 73c3f07165
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
backend/src/main/java/io/metersphere/api/service/ApiModuleService.java
View File

@ -1081,14 +1081,12 @@ public class ApiModuleService extends NodeTreeService<ApiModuleDTO> {
private void dealChooseModuleData(Map<String, ApiModule> moduleMap, Map<String, List<ApiModule>> pidChildrenMap, Map<String, String> idPathMap, Map<String, ApiModuleDTO> idModuleMap, ApiModuleDTO chooseModule, ApiDefinitionWithBLOBs datum, String modulePath) { private void dealChooseModuleData(Map<String, ApiModule> moduleMap, Map<String, List<ApiModule>> pidChildrenMap, Map<String, String> idPathMap, Map<String, ApiModuleDTO> idModuleMap, ApiModuleDTO chooseModule, ApiDefinitionWithBLOBs datum, String modulePath) {
String[] pathTree; String[] pathTree;
String chooseModuleParentId = getChooseModuleParentId(chooseModule); String chooseModuleParentId = getChooseModuleParentId(chooseModule);
String chooseModulePath = getChooseModulePath(idPathMap, chooseModule, chooseModuleParentId);
//导入时选了模块，且接口有模块的 //导入时选了模块，且接口有模块的
if (StringUtils.isNotBlank(modulePath)) { if (StringUtils.isNotBlank(modulePath)) {
List<ApiModule> moduleList = pidChildrenMap.get(chooseModuleParentId); List<ApiModule> moduleList = pidChildrenMap.get(chooseModuleParentId);
pathTree = getPathTree(chooseModulePath + modulePath); pathTree = getPathTree(modulePath);
ApiModule chooseModuleOne = JSON.parseObject(JSON.toJSONString(chooseModule), ApiModule.class); ApiModule chooseModuleOne = JSON.parseObject(JSON.toJSONString(chooseModule), ApiModule.class);
ApiModule minModule = getMinModule(pathTree, moduleList, chooseModuleOne, pidChildrenMap, moduleMap, idPathMap, idModuleMap); ApiModule minModule = getChooseMinModule(pathTree, chooseModuleOne, pidChildrenMap, moduleMap, idPathMap);
String id = minModule.getId(); String id = minModule.getId();
datum.setModuleId(id); datum.setModuleId(id);
datum.setModulePath(idPathMap.get(id)); datum.setModulePath(idPathMap.get(id));
@ -1104,7 +1102,7 @@ public class ApiModuleService extends NodeTreeService<ApiModuleDTO> {
if (chooseModuleParentId.equals("root")) { if (chooseModuleParentId.equals("root")) {
s = "/" + chooseModule.getName(); s = "/" + chooseModule.getName();
} else { } else {
s = idPathMap.get(chooseModuleParentId); s = idPathMap.get(chooseModule.getId());
} }
return s; return s;
} }
@ -1162,6 +1160,25 @@ public class ApiModuleService extends NodeTreeService<ApiModuleDTO> {
return returnModule; return returnModule;
} }
private ApiModule getChooseMinModule(String[] tagTree, ApiModule parentModule, Map<String, List<ApiModule>> pidChildrenMap, Map<String, ApiModule> moduleMap
, Map<String, String> idPathMap) {
//如果parentModule==null 则证明需要创建根目录同级的模块
ApiModule returnModule = null;
for (int i = 0; i < tagTree.length; i++) {
int finalI = i;
//在选择的模块下建模块，查看选择的模块下有没有同名的模块
List<ApiModule> moduleList = pidChildrenMap.get(parentModule.getId());
List<ApiModule> collect1 = moduleList.stream().filter(t -> t.getName().equals(tagTree[finalI])).collect(Collectors.toList());
if (collect1.isEmpty()) {
return createModule(tagTree, i, parentModule, moduleMap, pidChildrenMap, idPathMap);
} else {
returnModule = collect1.get(0);
parentModule = collect1.get(0);
}
}
return returnModule;
}
private ApiModule createModule(String[] tagTree, int i, ApiModule parentModule, Map<String, ApiModule> moduleMap, Map<String, List<ApiModule>> pidChildrenMap, Map<String, String> idPathMap) { private ApiModule createModule(String[] tagTree, int i, ApiModule parentModule, Map<String, ApiModule> moduleMap, Map<String, List<ApiModule>> pidChildrenMap, Map<String, String> idPathMap) {
ApiModule returnModule = null; ApiModule returnModule = null;
for (int i1 = i; i1 < tagTree.length; i1++) { for (int i1 = i; i1 < tagTree.length; i1++) {