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

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

--user=郭雨琦
This commit is contained in:
guoyuqi 2022-07-06 19:38:54 +08:00 committed by xiaomeinvG
parent 25b00d7402
commit 0b5f22b4e4
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
backend/src/main/java/io/metersphere/api/service/ApiScenarioModuleService.java
View File

@ -693,7 +693,7 @@ public class ApiScenarioModuleService extends NodeTreeService<ApiScenarioModuleD
tagTree = getTagTree(chooseModulePath + modulePath); tagTree = getTagTree(chooseModulePath + modulePath);
ApiScenarioModule chooseModuleOne = JSON.parseObject(JSON.toJSONString(chooseModule), ApiScenarioModule.class); ApiScenarioModule chooseModuleOne = JSON.parseObject(JSON.toJSONString(chooseModule), ApiScenarioModule.class);
ApiScenarioModule minModule = getMinModule(tagTree, parentModuleList, chooseModuleOne, pidChildrenMap, map, idPathMap, idModuleMap); ApiScenarioModule minModule = getChooseMinModule(tagTree, chooseModuleOne, pidChildrenMap, map, idPathMap);
String id = minModule.getId(); String id = minModule.getId();
datum.setApiScenarioModuleId(id); datum.setApiScenarioModuleId(id);
datum.setModulePath(idPathMap.get(id)); datum.setModulePath(idPathMap.get(id));
@ -795,6 +795,25 @@ public class ApiScenarioModuleService extends NodeTreeService<ApiScenarioModuleD
} }
private ApiScenarioModule getChooseMinModule(String[] tagTree, ApiScenarioModule parentModule, Map<String, List<ApiScenarioModule>> pidChildrenMap, Map<String, ApiScenarioModule> moduleMap
, Map<String, String> idPathMap) {
//如果parentModule==null 则证明需要创建根目录同级的模块
ApiScenarioModule returnModule = null;
for (int i = 0; i < tagTree.length; i++) {
int finalI = i;
//在选择的模块下建模块，查看选择的模块下有没有同名的模块
List<ApiScenarioModule> moduleList = pidChildrenMap.get(parentModule.getId());
List<ApiScenarioModule> 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 ApiScenarioModule createModule(String[] tagTree, int i, ApiScenarioModule parentModule, Map<String, ApiScenarioModule> map, Map<String, List<ApiScenarioModule>> pidChildrenMap, Map<String, String> idPathMap) { private ApiScenarioModule createModule(String[] tagTree, int i, ApiScenarioModule parentModule, Map<String, ApiScenarioModule> map, Map<String, List<ApiScenarioModule>> pidChildrenMap, Map<String, String> idPathMap) {
ApiScenarioModule returnModule = null; ApiScenarioModule returnModule = null;