fix(测试跟踪): 修复未能导入没有用例的空模块问题

backend/src/main/java/io/metersphere/track/service/TestCaseNodeService.java

@@ -355,50 +355,45 @@ public class TestCaseNodeService {
     }
 
     public Map<String, String> createNodeByTestCases(List<TestCaseWithBLOBs> testCases, String projectId) {
-
-        List<TestCaseNodeDTO> nodeTrees = getNodeTreeByProjectId(projectId);
-
-        Map<String, String> pathMap = new HashMap<>();
-
         List<String> nodePaths = testCases.stream()
                 .map(TestCase::getNodePath)
                 .collect(Collectors.toList());
 
-        nodePaths.forEach(path -> {
+        return this.createNodes(nodePaths, projectId);
+    }
 
-            if (path == null) {
+    public Map<String, String> createNodes(List<String> nodePaths, String projectId) {
+        List<TestCaseNodeDTO> nodeTrees = getNodeTreeByProjectId(projectId);
+        Map<String, String> pathMap = new HashMap<>();
+        for(String item : nodePaths){
+            if (item == null) {
                 throw new ExcelException(Translator.get("test_case_module_not_null"));
             }
-            List<String> nodeNameList = new ArrayList<>(Arrays.asList(path.split("/")));
+            List<String> nodeNameList = new ArrayList<>(Arrays.asList(item.split("/")));
-            Iterator<String> pathIterator = nodeNameList.iterator();
+            Iterator<String> itemIterator = nodeNameList.iterator();
-
             Boolean hasNode = false;
             String rootNodeName = null;
 
             if (nodeNameList.size() <= 1) {
-                throw new ExcelException(Translator.get("test_case_create_module_fail") + ":" + path);
+                throw new ExcelException(Translator.get("test_case_create_module_fail") + ":" + item);
             } else {
-                pathIterator.next();
+                itemIterator.next();
-                pathIterator.remove();
+                itemIterator.remove();
-
+                rootNodeName = itemIterator.next().trim();
-                rootNodeName = pathIterator.next().trim();
                 //原来没有，新建的树nodeTrees也不包含
                 for (TestCaseNodeDTO nodeTree : nodeTrees) {
                     if (StringUtils.equals(rootNodeName, nodeTree.getName())) {
                         hasNode = true;
-                        createNodeByPathIterator(pathIterator, "/" + rootNodeName, nodeTree,
+                        createNodeByPathIterator(itemIterator, "/" + rootNodeName, nodeTree,
                                 pathMap, projectId, 2);
                     }
                     ;
                 }
             }
-
-
             if (!hasNode) {
-                createNodeByPath(pathIterator, rootNodeName, null, projectId, 1, "", pathMap);
+                createNodeByPath(itemIterator, rootNodeName, null, projectId, 1, "", pathMap);
+            }
         }
-        });
-
         return pathMap;
 
     }

backend/src/main/java/io/metersphere/track/service/TestCaseService.java

@@ -284,6 +284,9 @@ public class TestCaseService {
                     errList.add(excelErrData);
                     excelResponse.setErrList(errList);
                 } else {
+                    if (!xmindParser.getNodePaths().isEmpty()) {
+                        testCaseNodeService.createNodes(xmindParser.getNodePaths(), projectId);
+                    }
                     if (!xmindParser.getTestCase().isEmpty()) {
                         this.saveImportData(xmindParser.getTestCase(), projectId);
                         xmindParser.clear();

backend/src/main/java/io/metersphere/xmind/XmindCaseParser.java

@@ -40,6 +40,9 @@ public class XmindCaseParser {
     // 案例详情重写了hashCode方法去重用
     private List<TestCaseExcelData> compartDatas;
 
+    // 记录没有用例的目录
+    private List<String> nodePaths;
+
     public XmindCaseParser(TestCaseService testCaseService, String userId, String projectId, Set<String> testCaseNames) {
         this.testCaseService = testCaseService;
         this.maintainer = userId;
@@ -48,6 +51,7 @@ public class XmindCaseParser {
         testCases = new LinkedList<>();
         compartDatas = new ArrayList<>();
         process = new StringBuffer();
+        nodePaths = new ArrayList<>();
     }
 
     // 这里清理是为了 加快jvm 回收
@@ -55,26 +59,55 @@ public class XmindCaseParser {
         compartDatas.clear();
         testCases.clear();
         testCaseNames.clear();
+        nodePaths.clear();
     }
 
     public List<TestCaseWithBLOBs> getTestCase() {
         return this.testCases;
     }
 
+    public List<String> getNodePaths() {
+        return this.nodePaths;
+    }
+
     private final Map<String, String> caseTypeMap = ImmutableMap.of("功能测试", "functional", "性能测试", "performance", "接口测试", "api");
 
+    public void validate() {
+        nodePaths.forEach(nodePath -> {
+            String[] nodes = nodePath.split("/");
+            if (nodes.length > TestCaseConstants.MAX_NODE_DEPTH + 1) {
+                process.append(Translator.get("test_case_node_level_tip") +
+                        TestCaseConstants.MAX_NODE_DEPTH + Translator.get("test_case_node_level") + "; ");
+            }
+            for (int i = 0; i < nodes.length; i++) {
+                if (i != 0 && StringUtils.equals(nodes[i].trim(), "")) {
+                    process.append(Translator.get("module_not_null") + "; ");
+                    break;
+                }
+            }
+        });
+    }
+
     // 递归处理案例数据
-    private void recursion(StringBuffer processBuffer, Attached parent, int level, String nodePath, List<Attached> attacheds) {
+    private void recursion(StringBuffer processBuffer, Attached parent, int level, List<Attached> attacheds) {
         for (Attached item : attacheds) {
             if (isAvailable(item.getTitle(), "(?:tc：|tc:|tc)")) { // 用例
                 item.setParent(parent);
                 this.newTestCase(item.getTitle(), parent.getPath(), item.getChildren() != null ? item.getChildren().getAttached() : null);
             } else {
-                nodePath = parent.getPath() + "/" + item.getTitle();
+                String nodePath = parent.getPath() + "/" + item.getTitle();
                 item.setPath(nodePath);
-                if (item.getChildren() != null && !item.getChildren().getAttached().isEmpty()) {
                 item.setParent(parent);
-                    recursion(processBuffer, item, level + 1, nodePath, item.getChildren().getAttached());
+                if (item.getChildren() != null && !item.getChildren().getAttached().isEmpty()) {
+                    recursion(processBuffer, item, level + 1, item.getChildren().getAttached());
+                } else {
+                    if (!nodePath.startsWith("/")) {
+                        nodePath = "/" + nodePath;
+                    }
+                    if (nodePath.endsWith("/")) {
+                        nodePath = nodePath.substring(0, nodePath.length() - 1);
+                    }
+                    nodePaths.add(nodePath); // 没有用例的路径
                 }
             }
         }
@@ -243,11 +276,12 @@ public class XmindCaseParser {
                         item.setPath(item.getTitle());
                         if (item.getChildren() != null && !item.getChildren().getAttached().isEmpty()) {
                             item.setPath(item.getTitle());
-                            recursion(processBuffer, item, 1, item.getPath(), item.getChildren().getAttached());
+                            recursion(processBuffer, item, 1, item.getChildren().getAttached());
                         }
                     }
                 }
             }
+            this.validate();
         } catch (Exception ex) {
             processBuffer.append(Translator.get("incorrect_format"));
             LogUtil.error(ex.getMessage());