From 9dcbaae2b5b84a9f35a8b35f3d1975309af69b71 Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Mon, 13 Nov 2023 15:06:25 +0800
Subject: [PATCH] =?UTF-8?q?feat(ui):=20=E6=96=B0=E5=A2=9E=E6=9C=AC?=
 =?UTF-8?q?=E5=9C=B0=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--story=1013573 --user=郭雨琦
https://www.tapd.cn/55049933/prong/stories/view/1155049933001013573
---
 .../frontend/src/api/file-metadata.js         |  5 +++
 .../base/mapper/ext/BaseFileModuleMapper.java |  2 ++
 .../base/mapper/ext/BaseFileModuleMapper.xml  | 10 ++++++
 .../controller/FileModuleController.java      |  6 ++++
 .../metadata/service/FileModuleService.java   | 36 +++++++++++++++++--
 5 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/framework/sdk-parent/frontend/src/api/file-metadata.js b/framework/sdk-parent/frontend/src/api/file-metadata.js
index b6e9881fff..dee75364e7 100644
--- a/framework/sdk-parent/frontend/src/api/file-metadata.js
+++ b/framework/sdk-parent/frontend/src/api/file-metadata.js
@@ -11,6 +11,11 @@ export function getFileModules(projectId) {
   return get(url);
 }
 
+export function getTypeNodeByProjectId(projectId, moduleType) {
+  let url = '/file/module/type/list/' + projectId + "/" + moduleType;
+  return get(url);
+}
+
 export function getMetadataTypes() {
   let url = '/file/metadata/get/type/all';
   return get(url);
diff --git a/framework/sdk-parent/sdk/src/main/java/io/metersphere/base/mapper/ext/BaseFileModuleMapper.java b/framework/sdk-parent/sdk/src/main/java/io/metersphere/base/mapper/ext/BaseFileModuleMapper.java
index 4080c1e1d7..3383b6ebac 100644
--- a/framework/sdk-parent/sdk/src/main/java/io/metersphere/base/mapper/ext/BaseFileModuleMapper.java
+++ b/framework/sdk-parent/sdk/src/main/java/io/metersphere/base/mapper/ext/BaseFileModuleMapper.java
@@ -11,6 +11,8 @@ public interface BaseFileModuleMapper {
 
     List<FileModuleVo> getNodeTreeByProjectId(@Param("projectId") String projectId);
 
+    List<FileModuleVo> getTypeNodeTreeByProjectId(@Param("projectId") String projectId, @Param("moduleType") String moduleType);
+
     void updatePos(String id, Double pos);
 
     String getNameById(String moduleId);
diff --git a/framework/sdk-parent/sdk/src/main/java/io/metersphere/base/mapper/ext/BaseFileModuleMapper.xml b/framework/sdk-parent/sdk/src/main/java/io/metersphere/base/mapper/ext/BaseFileModuleMapper.xml
index d029d70989..a8a9c783f1 100644
--- a/framework/sdk-parent/sdk/src/main/java/io/metersphere/base/mapper/ext/BaseFileModuleMapper.xml
+++ b/framework/sdk-parent/sdk/src/main/java/io/metersphere/base/mapper/ext/BaseFileModuleMapper.xml
@@ -17,6 +17,16 @@
         where file_module.project_id = #{projectId}
         order by file_module.pos asc
     </select>
+
+
+    <select id="getTypeNodeTreeByProjectId" resultType="io.metersphere.metadata.vo.FileModuleVo">
+        select
+        <include refid="io.metersphere.base.mapper.FileModuleMapper.Base_Column_List"/>
+        from file_module
+        where file_module.project_id = #{projectId} and file_module.module_type = #{moduleType}
+        order by file_module.pos asc
+    </select>
+
     <select id="getNameById" resultType="java.lang.String">
         select name from file_module
         where id = #{0}
diff --git a/framework/sdk-parent/sdk/src/main/java/io/metersphere/metadata/controller/FileModuleController.java b/framework/sdk-parent/sdk/src/main/java/io/metersphere/metadata/controller/FileModuleController.java
index b1a7bccc28..01bf8b49a1 100644
--- a/framework/sdk-parent/sdk/src/main/java/io/metersphere/metadata/controller/FileModuleController.java
+++ b/framework/sdk-parent/sdk/src/main/java/io/metersphere/metadata/controller/FileModuleController.java
@@ -30,6 +30,12 @@ public class FileModuleController {
         return fileModuleService.getNodeTreeByProjectId(projectId);
     }
 
+    @GetMapping("/type/list/{projectId}/{moduleType}")
+    public List<FileModuleVo> getTypeNodeByProjectId(@PathVariable String projectId, @PathVariable String moduleType) {
+        baseCheckPermissionService.checkProjectOwner(projectId);
+        return fileModuleService.getTypeNodeByProjectId(projectId, moduleType);
+    }
+
     @PostMapping("/add")
     @RequiresPermissions("PROJECT_FILE:READ+UPLOAD+JAR")
     @MsAuditLog(module = OperLogModule.PROJECT_FILE_MANAGEMENT, type = OperLogConstants.CREATE, title = "#node.name", content = "#msClass.getLogDetails(#node)", msClass = FileModuleService.class)
diff --git a/framework/sdk-parent/sdk/src/main/java/io/metersphere/metadata/service/FileModuleService.java b/framework/sdk-parent/sdk/src/main/java/io/metersphere/metadata/service/FileModuleService.java
index f107540a1a..3d8d1eb11a 100644
--- a/framework/sdk-parent/sdk/src/main/java/io/metersphere/metadata/service/FileModuleService.java
+++ b/framework/sdk-parent/sdk/src/main/java/io/metersphere/metadata/service/FileModuleService.java
@@ -10,9 +10,7 @@ import io.metersphere.base.mapper.ext.BaseFileMetadataMapper;
 import io.metersphere.base.mapper.ext.BaseFileModuleMapper;
 import io.metersphere.commons.constants.ApiTestConstants;
 import io.metersphere.commons.exception.MSException;
-import io.metersphere.commons.utils.JSON;
-import io.metersphere.commons.utils.LogUtil;
-import io.metersphere.commons.utils.SessionUtils;
+import io.metersphere.commons.utils.*;
 import io.metersphere.i18n.Translator;
 import io.metersphere.log.utils.ReflexObjectUtil;
 import io.metersphere.log.vo.DetailColumn;
@@ -389,4 +387,36 @@ public class FileModuleService extends NodeTreeService<FileModuleVo> {
         return baseFileModuleMapper.getNameById(moduleId);
     }
 
+    public List<FileModuleVo> getTypeNodeByProjectId(String projectId, String moduleType) {
+        // 判断当前项目下是否有默认模块，没有添加默认模块
+        FileModule fileModule = this.initDefaultNode(projectId);
+        FileModuleVo fileModuleVo = new FileModuleVo();
+        BeanUtils.copyBean(fileModuleVo, fileModule);
+        List<FileModuleVo> modules = baseFileModuleMapper.getTypeNodeTreeByProjectId(projectId, moduleType);
+        if (StringUtils.equals(moduleType, "module")) {
+            modules.add(0, fileModuleVo);
+        }
+        List<String> ids = modules.stream().map(FileModuleVo::getId).collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(ids)) {
+            return getNodeTrees(modules);
+        }
+        List<Map<String, Object>> moduleCounts = baseFileMetadataMapper.moduleCountByMetadataIds(ids);
+        Map<String, Integer> moduleCountMap = this.nodeCalculate(moduleCounts);
+        // 逐层统计
+        if (MapUtils.isNotEmpty(moduleCountMap)) {
+            modules.forEach(node -> {
+                int countNum = 0;
+                List<String> moduleIds = new ArrayList<>();
+                moduleIds = this.nodeList(modules, node.getId(), moduleIds);
+                moduleIds.add(node.getId());
+                for (String moduleId : moduleIds) {
+                    if (moduleCountMap.containsKey(moduleId)) {
+                        countNum += moduleCountMap.get(moduleId).intValue();
+                    }
+                }
+                node.setCaseNum(countNum);
+            });
+        }
+        return getNodeTrees(modules);
+    }
 }