From 3c26e9e4326f333b324839634cb88bfc7b23f45d Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Mon, 20 Nov 2023 17:29:47 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):?=
 =?UTF-8?q?=20=E4=BC=98=E5=8C=96svg=E5=9B=BE=E7=89=87=E9=A2=84=E8=A7=88?=
 =?UTF-8?q?=E5=9B=BE=E7=9A=84=E4=BC=A0=E8=BE=93=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sdk/constants/ModuleConstants.java        |  4 +--
 .../api/mapper/ExtApiDebugModuleMapper.xml    |  6 ++--
 .../mapper/ExtApiDefinitionModuleMapper.xml   |  6 ++--
 .../ApiDefinitionModuleService.java           |  2 --
 .../definition/ApiTestCaseService.java        |  3 --
 .../project/mapper/ExtFileModuleMapper.java   |  2 +-
 .../project/mapper/ExtFileModuleMapper.xml    |  9 ++++-
 .../project/service/FileMetadataService.java  | 33 ++++++++++---------
 .../project/service/FileModuleService.java    |  8 ++---
 .../project/service/ModuleTreeService.java    |  6 +---
 .../FileManagementControllerTests.java        | 22 +++++++++++--
 11 files changed, 59 insertions(+), 42 deletions(-)

diff --git a/backend/framework/sdk/src/main/java/io/metersphere/sdk/constants/ModuleConstants.java b/backend/framework/sdk/src/main/java/io/metersphere/sdk/constants/ModuleConstants.java
index 7f7b31e57d..da1563bc5e 100644
--- a/backend/framework/sdk/src/main/java/io/metersphere/sdk/constants/ModuleConstants.java
+++ b/backend/framework/sdk/src/main/java/io/metersphere/sdk/constants/ModuleConstants.java
@@ -6,9 +6,9 @@ public class ModuleConstants {
     //没有父类的节点，parent_id为NONE
     public static final String ROOT_NODE_PARENT_ID = "NONE";
     //默认节点类型
-    public static final String NODE_TYPE_DEFAULT = "module";
+    public static final String NODE_TYPE_DEFAULT = "MODULE";
     //Git节点类型
-    public static final String NODE_TYPE_GIT = "git";
+    public static final String NODE_TYPE_GIT = "GIT";
     //GitHub节点类型
     public static final String NODE_TYPE_GITHUB = "Github";
     //Gitee节点类型
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDebugModuleMapper.xml b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDebugModuleMapper.xml
index a286c20b59..9f47cb49d1 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDebugModuleMapper.xml
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDebugModuleMapper.xml
@@ -5,7 +5,7 @@
         SELECT id,
                NAME,
                parent_id AS parentId,
-               'module'  AS type
+               'MODULE' AS type
         FROM api_debug_module
         WHERE protocol = #{protocol}
           AND create_user = #{userId}
@@ -64,7 +64,7 @@
         SELECT id,
                NAME,
                module_id AS parentId,
-               'api'     AS type,
+               'API' AS type,
                method
         FROM api_debug
         WHERE protocol = #{protocol}
@@ -107,7 +107,7 @@
         SELECT id,
         NAME,
         parent_id AS parentId,
-        'module' AS type
+        'MODULE' AS type
         FROM api_debug_module
         WHERE id IN
         <foreach collection="ids" item="id" open="(" separator="," close=")">
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionModuleMapper.xml b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionModuleMapper.xml
index 1d913f0807..df86f1bea1 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionModuleMapper.xml
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionModuleMapper.xml
@@ -53,7 +53,7 @@
         SELECT id,
         NAME,
         module_id AS parentId,
-        'api' AS type,
+        'API' AS type,
         method
         FROM api_definition
         <include refid="api_request"/>
@@ -95,7 +95,7 @@
         m.name,
         m.pos,
         m.project_id,
-        'module' AS type
+        'MODULE' AS type
         FROM api_definition_module m
         <include refid="module_request"/>
         ORDER BY pos
@@ -106,7 +106,7 @@
         m.name,
         m.pos,
         m.project_id,
-        'module' AS type
+        'MODULE' AS type
         FROM api_definition_module m
         WHERE m.id IN
         <foreach collection="ids" item="id" open="(" separator="," close=")">
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/service/definition/ApiDefinitionModuleService.java b/backend/services/api-test/src/main/java/io/metersphere/api/service/definition/ApiDefinitionModuleService.java
index e207291925..36aebd6157 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/service/definition/ApiDefinitionModuleService.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/service/definition/ApiDefinitionModuleService.java
@@ -54,8 +54,6 @@ public class ApiDefinitionModuleService extends ModuleTreeService {
     private ExtApiTestCaseMapper extApiTestCaseMapper;
     @Resource
     private ApiTestCaseService apiTestCaseService;
-    @Resource
-    private ApiTestCaseLogService apiTestCaseLogService;
 
     public List<BaseTreeNode> getTree(ApiModuleRequest request) {
         //接口的树结构是  模块：子模块+接口 接口为非delete状态的
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/service/definition/ApiTestCaseService.java b/backend/services/api-test/src/main/java/io/metersphere/api/service/definition/ApiTestCaseService.java
index 77e9585b8f..23920041ef 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/service/definition/ApiTestCaseService.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/service/definition/ApiTestCaseService.java
@@ -47,9 +47,6 @@ public class ApiTestCaseService {
 
     public static final Long ORDER_STEP = 5000L;
 
-
-    private static final String MAIN_FOLDER_PROJECT = "project";
-    private static final String APP_NAME_API_CASE = "apiCase";
     public static final String PRIORITY = "Priority";
     public static final String STATUS = "Status";
     public static final String TAGS = "Tags";
diff --git a/backend/services/project-management/src/main/java/io/metersphere/project/mapper/ExtFileModuleMapper.java b/backend/services/project-management/src/main/java/io/metersphere/project/mapper/ExtFileModuleMapper.java
index 9e38d20dff..63db98d032 100644
--- a/backend/services/project-management/src/main/java/io/metersphere/project/mapper/ExtFileModuleMapper.java
+++ b/backend/services/project-management/src/main/java/io/metersphere/project/mapper/ExtFileModuleMapper.java
@@ -10,7 +10,7 @@ import java.util.List;
 public interface ExtFileModuleMapper {
     List<BaseTreeNode> selectBaseByProjectId(@Param("projectId") String projectId, @Param("moduleType") String moduleType);
 
-    List<BaseTreeNode> selectIdAndParentIdByProjectId(String projectId);
+    List<BaseTreeNode> selectIdAndParentIdByProjectId(@Param("projectId") String projectId, @Param("storage") String storage);
 
     List<String> selectChildrenIdsByParentIds(@Param("ids") List<String> deleteIds);
 
diff --git a/backend/services/project-management/src/main/java/io/metersphere/project/mapper/ExtFileModuleMapper.xml b/backend/services/project-management/src/main/java/io/metersphere/project/mapper/ExtFileModuleMapper.xml
index 303aa7aadf..845992529f 100644
--- a/backend/services/project-management/src/main/java/io/metersphere/project/mapper/ExtFileModuleMapper.xml
+++ b/backend/services/project-management/src/main/java/io/metersphere/project/mapper/ExtFileModuleMapper.xml
@@ -11,7 +11,14 @@
     <select id="selectIdAndParentIdByProjectId" resultType="io.metersphere.system.dto.sdk.BaseTreeNode">
         SELECT id, parent_id AS parentId
         FROM file_module
-        WHERE project_id = #{0}
+        WHERE project_id = #{projectId}
+        <if test="storage == 'MINIO'">
+            AND module_type = 'MODULE'
+        </if>
+        <if test="storage == 'GIT'">
+            AND module_type = 'GIT'
+        </if>
+
     </select>
     <select id="selectIdsByProjectId" resultType="java.lang.String">
         SELECT id
diff --git a/backend/services/project-management/src/main/java/io/metersphere/project/service/FileMetadataService.java b/backend/services/project-management/src/main/java/io/metersphere/project/service/FileMetadataService.java
index 4a22d74471..40419bc53b 100644
--- a/backend/services/project-management/src/main/java/io/metersphere/project/service/FileMetadataService.java
+++ b/backend/services/project-management/src/main/java/io/metersphere/project/service/FileMetadataService.java
@@ -465,7 +465,7 @@ public class FileMetadataService {
         FileManagementQuery pageDTO = new FileManagementQuery(request);
         pageDTO.setModuleIds(null);
         List<ModuleCountDTO> moduleCountDTOList = extFileMetadataMapper.countModuleIdByKeywordAndFileType(pageDTO);
-        Map<String, Long> moduleCountMap = fileModuleService.getModuleCountMap(request.getProjectId(), moduleCountDTOList);
+        Map<String, Long> moduleCountMap = fileModuleService.getModuleCountMap(request.getProjectId(), pageDTO.getStorage(), moduleCountDTOList);
 
         //查出全部文件和我的文件的数量
         FileManagementQuery myFileCountDTO = new FileManagementQuery();
@@ -480,26 +480,27 @@ public class FileMetadataService {
 
     public ResponseEntity<byte[]> downloadPreviewImgById(String id) throws Exception {
         FileMetadata fileMetadata = fileMetadataMapper.selectByPrimaryKey(id);
-        String previewImgPath = null;
-        if (StringUtils.equalsIgnoreCase(fileMetadata.getType(), "svg")) {
-            return this.downloadById(id);
-        } else if (TempFileUtils.isImage(fileMetadata.getType())) {
-            if (TempFileUtils.isImgPreviewFileExists(fileMetadata.getId())) {
-                previewImgPath = TempFileUtils.getPreviewImgFilePath(fileMetadata.getId());
+        byte[] bytes = new byte[]{};
+
+        MediaType contentType = MediaType.parseMediaType("application/octet-stream");
+        if (TempFileUtils.isImage(fileMetadata.getType())) {
+            if (StringUtils.equalsIgnoreCase(fileMetadata.getType(), "svg")) {
+                //svg图片不压缩
+                contentType = MediaType.parseMediaType("image/svg+xml");
+                bytes = this.getFileByte(fileMetadata);
+            } else if (TempFileUtils.isImgPreviewFileExists(fileMetadata.getId())) {
+                //获取压缩过的图片
+                bytes = TempFileUtils.getFile(TempFileUtils.getPreviewImgFilePath(fileMetadata.getId()));
             } else {
-                previewImgPath = TempFileUtils.catchCompressImgIfNotExists(fileMetadata.getId(), this.getFile(fileMetadata));
+                //压缩图片并保存在临时文件夹中
+                bytes = TempFileUtils.getFile(
+                        TempFileUtils.catchCompressImgIfNotExists(fileMetadata.getId(), this.getFile(fileMetadata))
+                );
             }
         }
 
-        byte[] bytes;
-        if (StringUtils.isNotBlank(previewImgPath)) {
-            bytes = TempFileUtils.getFile(previewImgPath);
-        } else {
-            bytes = new byte[]{};
-        }
-
         return ResponseEntity.ok()
-                .contentType(MediaType.parseMediaType("application/octet-stream"))
+                .contentType(contentType)
                 .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + this.getFileName(fileMetadata.getId(), fileMetadata.getType()) + "\"")
                 .body(bytes);
     }
diff --git a/backend/services/project-management/src/main/java/io/metersphere/project/service/FileModuleService.java b/backend/services/project-management/src/main/java/io/metersphere/project/service/FileModuleService.java
index 011236d403..72824d08af 100644
--- a/backend/services/project-management/src/main/java/io/metersphere/project/service/FileModuleService.java
+++ b/backend/services/project-management/src/main/java/io/metersphere/project/service/FileModuleService.java
@@ -54,9 +54,9 @@ public class FileModuleService extends ModuleTreeService implements CleanupProje
         return super.buildTreeAndCountResource(fileModuleList, true, Translator.get("default.module"));
     }
 
-    public List<BaseTreeNode> getTreeOnlyIdsAndResourceCount(String projectId, List<ModuleCountDTO> moduleCountDTOList) {
+    public List<BaseTreeNode> getTreeOnlyIdsAndResourceCount(String projectId, String storage, List<ModuleCountDTO> moduleCountDTOList) {
         //节点内容只有Id和parentId
-        List<BaseTreeNode> fileModuleList = extFileModuleMapper.selectIdAndParentIdByProjectId(projectId);
+        List<BaseTreeNode> fileModuleList = extFileModuleMapper.selectIdAndParentIdByProjectId(projectId, storage);
         return super.buildTreeAndCountResource(fileModuleList, moduleCountDTOList, true, Translator.get("default.module"));
     }
 
@@ -192,10 +192,10 @@ public class FileModuleService extends ModuleTreeService implements CleanupProje
      * 查找当前项目下模块每个节点对应的资源统计
      *
      */
-    public Map<String, Long> getModuleCountMap(String projectId, List<ModuleCountDTO> moduleCountDTOList) {
+    public Map<String, Long> getModuleCountMap(String projectId, String storage, List<ModuleCountDTO> moduleCountDTOList) {
 
         //构建模块树，并计算每个节点下的所有数量（包含子节点）
-        List<BaseTreeNode> treeNodeList = this.getTreeOnlyIdsAndResourceCount(projectId, moduleCountDTOList);
+        List<BaseTreeNode> treeNodeList = this.getTreeOnlyIdsAndResourceCount(projectId, storage, moduleCountDTOList);
         //通过广度遍历的方式构建返回值
         return super.getIdCountMapByBreadth(treeNodeList);
     }
diff --git a/backend/services/project-management/src/main/java/io/metersphere/project/service/ModuleTreeService.java b/backend/services/project-management/src/main/java/io/metersphere/project/service/ModuleTreeService.java
index d6018522ce..c46d417517 100644
--- a/backend/services/project-management/src/main/java/io/metersphere/project/service/ModuleTreeService.java
+++ b/backend/services/project-management/src/main/java/io/metersphere/project/service/ModuleTreeService.java
@@ -57,6 +57,7 @@ public abstract class ModuleTreeService {
         int lastSize = 0;
         Map<String, BaseTreeNode> baseTreeNodeMap = new HashMap<>();
         while (CollectionUtils.isNotEmpty(traverseList) && traverseList.size() != lastSize) {
+            lastSize = traverseList.size();
             List<BaseTreeNode> notMatchedList = new ArrayList<>();
             for (BaseTreeNode treeNode : traverseList) {
                 if (StringUtils.equalsIgnoreCase(treeNode.getParentId(), ModuleConstants.ROOT_NODE_PARENT_ID)) {
@@ -75,11 +76,6 @@ public abstract class ModuleTreeService {
             }
             traverseList = notMatchedList;
         }
-        //剩余的节点没有匹配上，直接放到根节点下
-        traverseList.forEach(treeNode -> {
-            BaseTreeNode node = new BaseTreeNode(treeNode.getId(), treeNode.getName(), ModuleConstants.NODE_TYPE_DEFAULT, treeNode.getParentId());
-            baseTreeNodeMap.get(treeNode.getParentId()).addChild(node);
-        });
         return baseTreeNodeList;
     }
 
diff --git a/backend/services/project-management/src/test/java/io/metersphere/project/controller/filemanagement/FileManagementControllerTests.java b/backend/services/project-management/src/test/java/io/metersphere/project/controller/filemanagement/FileManagementControllerTests.java
index 2f6a8a20fa..66f6a8bd22 100644
--- a/backend/services/project-management/src/test/java/io/metersphere/project/controller/filemanagement/FileManagementControllerTests.java
+++ b/backend/services/project-management/src/test/java/io/metersphere/project/controller/filemanagement/FileManagementControllerTests.java
@@ -919,7 +919,13 @@ public class FileManagementControllerTests extends BaseTest {
         for (FileInformationResponse fileDTO : fileList) {
             MvcResult originalResult = this.downloadFile(String.format(FileManagementRequestUtils.URL_FILE_PREVIEW_ORIGINAL, "admin", fileDTO.getId()));
             Assertions.assertTrue(originalResult.getResponse().getContentAsByteArray().length > 0);
-            MvcResult compressedResult = this.downloadFile(String.format(FileManagementRequestUtils.URL_FILE_PREVIEW_COMPRESSED, "admin", fileDTO.getId()));
+            MvcResult compressedResult;
+            if (StringUtils.equalsIgnoreCase(fileDTO.getFileType(), "svg")) {
+                compressedResult = this.downloadSvgFile(String.format(FileManagementRequestUtils.URL_FILE_PREVIEW_COMPRESSED, "admin", fileDTO.getId()));
+            } else {
+                compressedResult = this.downloadFile(String.format(FileManagementRequestUtils.URL_FILE_PREVIEW_COMPRESSED, "admin", fileDTO.getId()));
+            }
+
             byte[] fileBytes = compressedResult.getResponse().getContentAsByteArray();
             if (TempFileUtils.isImage(fileDTO.getFileType())) {
                 if (StringUtils.equals(reUploadFileId, fileDTO.getId())) {
@@ -936,7 +942,13 @@ public class FileManagementControllerTests extends BaseTest {
         for (FileInformationResponse fileDTO : fileList) {
             MvcResult originalResult = this.downloadFile(String.format(FileManagementRequestUtils.URL_FILE_PREVIEW_ORIGINAL, "admin", fileDTO.getId()));
             Assertions.assertTrue(originalResult.getResponse().getContentAsByteArray().length > 0);
-            MvcResult compressedResult = this.downloadFile(String.format(FileManagementRequestUtils.URL_FILE_PREVIEW_COMPRESSED, "admin", fileDTO.getId()));
+
+            MvcResult compressedResult;
+            if (StringUtils.equalsIgnoreCase(fileDTO.getFileType(), "svg")) {
+                compressedResult = this.downloadSvgFile(String.format(FileManagementRequestUtils.URL_FILE_PREVIEW_COMPRESSED, "admin", fileDTO.getId()));
+            } else {
+                compressedResult = this.downloadFile(String.format(FileManagementRequestUtils.URL_FILE_PREVIEW_COMPRESSED, "admin", fileDTO.getId()));
+            }
             byte[] fileBytes = compressedResult.getResponse().getContentAsByteArray();
             if (TempFileUtils.isImage(fileDTO.getFileType())) {
                 if (StringUtils.equals(reUploadFileId, fileDTO.getId())) {
@@ -2068,6 +2080,12 @@ public class FileManagementControllerTests extends BaseTest {
                 .andReturn();
     }
 
+    protected MvcResult downloadSvgFile(String url, Object... uriVariables) throws Exception {
+        return mockMvc.perform(getRequestBuilder(url, uriVariables))
+                .andExpect(content().contentType(MediaType.valueOf("image/svg+xml")))
+                .andExpect(status().isOk()).andReturn();
+    }
+
     protected MvcResult downloadFile(String url, Object... uriVariables) throws Exception {
         return mockMvc.perform(getRequestBuilder(url, uriVariables))
                 .andExpect(content().contentType(MediaType.APPLICATION_OCTET_STREAM_VALUE))