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

fix(场景自动化) 修复生成依赖关系问题

This commit is contained in:
fit2-zhao 2021-10-29 18:53:17 +08:00 committed by fit2-zhao
parent 987d8f919c
commit f96e30d341
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
backend/src/main/java/io/metersphere/api/dto/definition/request/ElementUtil.java
View File

@ -281,6 +281,12 @@ public class ElementUtil {
} }
} }
/**
* 只找出场景直接依赖
*
* @param hashTree
* @param referenceRelationships
*/
public static void relationships(JSONArray hashTree, List<String> referenceRelationships) { public static void relationships(JSONArray hashTree, List<String> referenceRelationships) {
for (int i = 0; i < hashTree.size(); i++) { for (int i = 0; i < hashTree.size(); i++) {
JSONObject element = hashTree.getJSONObject(i); JSONObject element = hashTree.getJSONObject(i);
@ -288,10 +294,11 @@ public class ElementUtil {
if (!referenceRelationships.contains(element.get("id").toString())) { if (!referenceRelationships.contains(element.get("id").toString())) {
referenceRelationships.add(element.get("id").toString()); referenceRelationships.add(element.get("id").toString());
} }
} } else {
if (element.containsKey("hashTree")) { if (element.containsKey("hashTree")) {
JSONArray elementJSONArray = element.getJSONArray("hashTree"); JSONArray elementJSONArray = element.getJSONArray("hashTree");
relationships(elementJSONArray, referenceRelationships); relationships(elementJSONArray, referenceRelationships);
}
} }
} }
} }

3
backend/src/main/java/io/metersphere/service/RelationshipEdgeService.java
View File

@ -232,6 +232,9 @@ public class RelationshipEdgeService {
if (addEdgesIds.contains(item.getSourceId() + item.getTargetId())) { if (addEdgesIds.contains(item.getSourceId() + item.getTargetId())) {
if(batchMapper.selectByPrimaryKey(item) == null ) { if(batchMapper.selectByPrimaryKey(item) == null ) {
batchMapper.insert(item); batchMapper.insert(item);
}else{
item.setGraphId(graphId); // 把原来图的id设置成合并后新的图的id
batchMapper.updateByPrimaryKey(item);
} }
} else { } else {
item.setGraphId(graphId); // 把原来图的id设置成合并后新的图的id item.setGraphId(graphId); // 把原来图的id设置成合并后新的图的id