refactor: 导出带模块，导入自动生成模块

backend/src/main/java/io/metersphere/api/controller/ApiDefinitionController.java

@@ -41,6 +41,11 @@ public class ApiDefinitionController {
         return PageUtils.setPageInfo(page, apiDefinitionService.list(request));
     }
 
+    @PostMapping("/list/all")
+    public List<ApiDefinitionResult> list(@RequestBody ApiDefinitionRequest request) {
+        return apiDefinitionService.list(request);
+    }
+
     @PostMapping(value = "/create", consumes = {"multipart/form-data"})
     @RequiresRoles(value = {RoleConstants.TEST_MANAGER, RoleConstants.TEST_USER}, logical = Logical.OR)
     public void create(@RequestPart("request") SaveApiDefinitionRequest request, @RequestPart(value = "files") List<MultipartFile> bodyFiles) {

backend/src/main/java/io/metersphere/api/parse/MsParser.java

@@ -15,11 +15,10 @@ import io.metersphere.api.service.ApiModuleService;
 import io.metersphere.base.domain.ApiModule;
 import io.metersphere.commons.utils.CommonBeanFactory;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 
 public class MsParser extends ApiImportAbstractParser {
 
@@ -42,7 +41,8 @@ public class MsParser extends ApiImportAbstractParser {
         List<ApiDefinitionResult> data = apiDefinitionImport.getData();
         data.forEach(apiDefinition -> {
             String id = UUID.randomUUID().toString();
-            apiDefinition.setModuleId(null);
+//            apiDefinition.setModuleId(null);
+            parseModule(apiDefinition, importRequest.isSaved());
             apiDefinition.setId(id);
             apiDefinition.setProjectId(this.projectId);
             String request = apiDefinition.getRequest();
@@ -121,4 +121,43 @@ public class MsParser extends ApiImportAbstractParser {
             }
         }
     }
+
+
+    private void parseModule(ApiDefinitionResult apiDefinition, Boolean isSaved) {
+        String modulePath = apiDefinition.getModulePath();
+        if (StringUtils.isBlank(modulePath)) {
+            return;
+        }
+        if (modulePath.startsWith("/")) {
+            modulePath = modulePath.substring(1, modulePath.length());
+        }
+        if (modulePath.endsWith("/")) {
+            modulePath = modulePath.substring(0, modulePath.length() - 1);
+        }
+        List<String> modules = Arrays.asList(modulePath.split("/"));
+        ApiModule parent = null;
+        Iterator<String> iterator = modules.iterator();
+        while (iterator.hasNext()) {
+            String item = iterator.next();
+            parent = buildModule(item, parent, isSaved);
+            if (!iterator.hasNext()) {
+                apiDefinition.setModuleId(parent.getId());
+            }
+        }
+    }
+
+    private ApiModule buildModule(String name, ApiModule parentModule, boolean isSaved) {
+        apiModuleService = CommonBeanFactory.getBean(ApiModuleService.class);
+        ApiModule module;
+        if (parentModule != null) {
+            module = apiModuleService.getNewModule(name, this.projectId, parentModule.getLevel() + 1);
+            module.setParentId(parentModule.getId());
+        } else {
+            module = apiModuleService.getNewModule(name, this.projectId, 1);
+        }
+        if (isSaved) {
+            createModule(module);
+        }
+        return module;
+    }
 }

frontend/src/business/components/api/definition/ApiDefinition.vue

@@ -106,6 +106,7 @@
   import {downloadFile, getCurrentUser, getUUID, getCurrentProjectID} from "@/common/js/utils";
   import MsApiModule from "./components/module/ApiModule";
   import ApiCaseSimpleList from "./components/list/ApiCaseSimpleList";
+  import {PROJECT_NAME} from "../../../../common/js/constants";
 
   export default {
     name: "ApiDefinition",
@@ -258,18 +259,29 @@
         if (this.$refs.apiList[0].selectRows && this.$refs.apiList[0].selectRows.size > 0) {
           let arr = Array.from(this.$refs.apiList[0].selectRows);
           obj.data = arr;
-          downloadFile("导出API.json", JSON.stringify(obj));
+          this.buildApiPath(obj.data);
+          downloadFile("Metersphere_Api_" + localStorage.getItem(PROJECT_NAME) + ".json", JSON.stringify(obj));
         } else {
           let condition = {};
-          let url = "/api/definition/list/1/100000";
+          let url = "/api/definition/list/all";
           condition.filters = ["Prepare", "Underway", "Completed"];
           condition.projectId = getCurrentProjectID();
           this.$post(url, condition, response => {
-            obj.data = response.data.listObject;
-            downloadFile("导出API.json", JSON.stringify(obj));
+            obj.data = response.data;
+            this.buildApiPath(obj.data);
+            downloadFile("Metersphere_Api_" + localStorage.getItem(PROJECT_NAME) + ".json", JSON.stringify(obj));
           });
         }
       },
+      buildApiPath(apis) {
+        apis.forEach((api) => {
+          this.moduleOptions.forEach(item => {
+            if (api.moduleId === item.id) {
+              api.modulePath = item.path;
+            }
+          });
+        });
+      },
       refresh(data) {
         this.$refs.apiList[0].initTable(data);
       },

frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue

@@ -34,7 +34,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column prop="name" :label="$t('api_test.definition.api_name')" show-overflow-tooltip/>
+        <el-table-column prop="name" :label="$t('test_track.case.name')" show-overflow-tooltip/>
 
         <el-table-column
           prop="priority"

frontend/src/business/components/api/definition/components/module/ApiModuleHeader.vue

@@ -33,7 +33,7 @@
       @saveAsEdit="saveAsEdit"
       @refresh="refresh"
       ref="basisApi"/>
-    <api-import ref="apiImport" @refresh="$emit('refreshTable')"/>
+    <api-import ref="apiImport" @refresh="$emit('refresh')"/>
   </div>
 </template>
 

frontend/src/business/components/common/head/ProjectSwitch.vue

@@ -24,6 +24,7 @@
 
 <script>
 import SearchList from "@/business/components/common/head/SearchList";
+import {PROJECT_NAME} from "../../../../common/js/constants";
 
 export default {
   name: "ProjectSwitch",
@@ -31,6 +32,11 @@ export default {
     projectName: String
   },
   components: {SearchList},
+  watch: {
+    currentProject() {
+      localStorage.setItem(PROJECT_NAME, this.currentProject);
+    }
+  },
   data() {
     return {
       currentProject: this.projectName

frontend/src/common/js/constants.js

@@ -11,6 +11,7 @@ export const ROLE_TEST_VIEWER = 'test_viewer';
 export const WORKSPACE_ID = 'workspace_id';
 export const CURRENT_PROJECT = 'current_project';
 export const PROJECT_ID = 'project_id';
+export const PROJECT_NAME = 'project_name';
 
 export const REFRESH_SESSION_USER_URL = 'user/refresh';
 export const WORKSPACE = 'workspace';