From 1831344840fcd28aaa492caebf1a1c8e2228ab29 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Wed, 12 Apr 2023 23:25:00 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95=E5=85=B3=E8=81=94=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E5=88=97=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=98=AFGit=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E8=BF=98=E4=BC=9A=E5=9C=A8=E6=96=87=E4=BB=B6=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E5=90=8E=E9=9D=A2=E5=B1=95=E7=A4=BA=E5=88=86=E6=94=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1025343 --user=宋天阳
[项目管理]
github#23586git文件上传不同分支，同一路径文件拉取失败报文件已存在
https://www.tapd.cn/55049933/s/1362041
---
 .../src/business/commons/QuoteFileList.vue    | 26 +++++++-
 .../mapper/ext/BaseFileMetadataMapper.java    |  3 +
 .../mapper/ext/BaseFileMetadataMapper.xml     | 65 +++++++++++++++++++
 .../io/metersphere/dto/FileMetadataDTO.java   |  9 +++
 .../controller/FileMetadataController.java    | 11 ++--
 .../metadata/service/FileMetadataService.java | 13 ++++
 6 files changed, 120 insertions(+), 7 deletions(-)
 create mode 100644 framework/sdk-parent/sdk/src/main/java/io/metersphere/dto/FileMetadataDTO.java

diff --git a/api-test/frontend/src/business/commons/QuoteFileList.vue b/api-test/frontend/src/business/commons/QuoteFileList.vue
index 52980c53d3..0a1b5319c6 100644
--- a/api-test/frontend/src/business/commons/QuoteFileList.vue
+++ b/api-test/frontend/src/business/commons/QuoteFileList.vue
@@ -28,6 +28,23 @@
         @refresh="getProjectFiles"
         ref="table">
         <ms-table-column prop="name" show-overflow-tooltip :min-width="150" :label="$t('load_test.file_name')">
+          <template v-slot="scope">
+            <span v-if="scope.row.storage !== 'GIT'">
+              {{ scope.row.name }}
+            </span>
+            <div v-else>
+              <span>
+                {{ scope.row.name }}
+              </span>
+              <ms-tag effect="plain" class="ms-tags" :content="parseGitBranch(scope.row.attachInfo)" />
+            </div>
+          </template>
+        </ms-table-column>
+        <ms-table-column
+          prop="moduleName"
+          show-overflow-tooltip
+          :min-width="150"
+          :label="$t('project.project_file.file_module_type.module')">
         </ms-table-column>
         <ms-table-column
           sortable
@@ -37,7 +54,7 @@
           :label="$t('load_test.file_type')">
         </ms-table-column>
 
-        <ms-table-column prop="description" :min-width="100" :label="$t('group.description')"> </ms-table-column>
+        <ms-table-column prop="description" :min-width="100" :label="$t('group.description')"></ms-table-column>
 
         <ms-table-column prop="tags" width="100px" :show-overflow-tooltip="false" :label="$t('commons.tag')">
           <template v-slot:default="scope">
@@ -60,7 +77,7 @@
 
         <ms-table-column sortable prop="createUser" :min-width="100" :label="$t('commons.create_user')">
         </ms-table-column>
-        <ms-table-column sortable prop="updateUser" :min-width="100" :label="$t('ui.update_user')"> </ms-table-column>
+        <ms-table-column sortable prop="updateUser" :min-width="100" :label="$t('ui.update_user')"></ms-table-column>
 
         <ms-table-column sortable :label="$t('commons.update_time')" :min-width="150" fixed="right" prop="updateTime">
           <template v-slot="scope">
@@ -136,6 +153,11 @@ export default {
   },
   created() {},
   methods: {
+    parseGitBranch(attachInfo) {
+      let branch = 'master';
+      branch = JSON.parse(attachInfo)['branch'];
+      return branch;
+    },
     submit() {
       if (this.$refs.table.selectRows && this.$refs.table.selectRows.size > 0) {
         this.$emit('checkRows', this.$refs.table.selectRows);
diff --git a/framework/sdk-parent/sdk/src/main/java/io/metersphere/base/mapper/ext/BaseFileMetadataMapper.java b/framework/sdk-parent/sdk/src/main/java/io/metersphere/base/mapper/ext/BaseFileMetadataMapper.java
index 5b29bf8fd9..d3a015e201 100644
--- a/framework/sdk-parent/sdk/src/main/java/io/metersphere/base/mapper/ext/BaseFileMetadataMapper.java
+++ b/framework/sdk-parent/sdk/src/main/java/io/metersphere/base/mapper/ext/BaseFileMetadataMapper.java
@@ -1,6 +1,7 @@
 package io.metersphere.base.mapper.ext;
 
 import io.metersphere.base.domain.FileMetadataWithBLOBs;
+import io.metersphere.dto.FileMetadataDTO;
 import io.metersphere.metadata.vo.MoveFIleMetadataRequest;
 import io.metersphere.request.QueryProjectFileRequest;
 import org.apache.ibatis.annotations.Param;
@@ -11,6 +12,8 @@ import java.util.Map;
 public interface BaseFileMetadataMapper {
     List<FileMetadataWithBLOBs> getProjectFiles(@Param("projectId") String projectId, @Param("request") QueryProjectFileRequest request);
 
+    List<FileMetadataDTO> getFileMetadataByProject(@Param("projectId") String projectId, @Param("request") QueryProjectFileRequest request);
+
     List<String> getTypes();
 
     void move(@Param("request") MoveFIleMetadataRequest request);
diff --git a/framework/sdk-parent/sdk/src/main/java/io/metersphere/base/mapper/ext/BaseFileMetadataMapper.xml b/framework/sdk-parent/sdk/src/main/java/io/metersphere/base/mapper/ext/BaseFileMetadataMapper.xml
index b6844cfce4..633186c986 100644
--- a/framework/sdk-parent/sdk/src/main/java/io/metersphere/base/mapper/ext/BaseFileMetadataMapper.xml
+++ b/framework/sdk-parent/sdk/src/main/java/io/metersphere/base/mapper/ext/BaseFileMetadataMapper.xml
@@ -63,6 +63,71 @@
             </foreach>
         </if>
     </select>
+
+    <select id="getFileMetadataByProject" resultType="io.metersphere.dto.FileMetadataDTO">
+        SELECT file_metadata.*,file_module.name AS moduleName FROM file_metadata
+            INNER JOIN file_module  ON file_metadata.module_id = file_module.id
+        WHERE file_metadata.project_id = #{projectId,jdbcType=VARCHAR} AND file_metadata.type != 'RSA_KEY' AND file_metadata.latest IS TRUE
+        <if test="request.name != null and request.name !=''">
+            AND ( file_metadata.name LIKE CONCAT('%', #{request.name}, '%')
+            OR file_metadata.tags LIKE CONCAT('%', #{request.name}, '%')
+            OR file_metadata.description LIKE CONCAT('%', #{request.name}, '%')
+            OR file_metadata.create_user LIKE CONCAT('%', #{request.name}, '%'))
+        </if>
+        <if test="request.moduleId != null and request.moduleId !=''">
+            AND file_metadata.module_id = #{request.moduleId}
+        </if>
+        <if test="request.filters != null and request.filters.size() > 0">
+            <foreach collection="request.filters.entrySet()" index="key" item="values">
+                <if test="values != null and values.size() > 0">
+                    <choose>
+                        <when test="key=='type'">
+                            and file_metadata.type in
+                            <foreach collection="values" item="value" separator="," open="(" close=")">
+                                #{value}
+                            </foreach>
+                        </when>
+                        <when test="key=='createUser'">
+                            and file_metadata.create_user in
+                            <foreach collection="values" item="value" separator="," open="(" close=")">
+                                #{value}
+                            </foreach>
+                        </when>
+                        <when test="key=='moduleIds'">
+                            and file_metadata.module_id in
+                            <foreach collection="values" item="value" separator="," open="(" close=")">
+                                #{value}
+                            </foreach>
+                        </when>
+                    </choose>
+                </if>
+            </foreach>
+        </if>
+        <if test="request.orders != null and request.orders.size() > 0">
+            order by
+            <foreach collection="request.orders" separator="," item="order">
+                <if test="order.name == 'name'">
+                    file_metadata.name ${order.type}
+                </if>
+                <if test="order.name == 'type'">
+                    file_metadata.type ${order.type}
+                </if>
+                <if test="order.name == 'create_user'">
+                    file_metadata.create_user ${order.type}
+                </if>
+                <if test="order.name == 'update_user'">
+                    file_metadata.update_user ${order.type}
+                </if>
+                <if test="order.name == 'create_time'">
+                    file_metadata.create_time ${order.type}
+                </if>
+                <if test="order.name == 'update_time'">
+                    file_metadata.update_time ${order.type}
+                </if>
+            </foreach>
+        </if>
+    </select>
+
     <select id="getTypes" resultType="java.lang.String">
         SELECT type
         FROM file_metadata
diff --git a/framework/sdk-parent/sdk/src/main/java/io/metersphere/dto/FileMetadataDTO.java b/framework/sdk-parent/sdk/src/main/java/io/metersphere/dto/FileMetadataDTO.java
new file mode 100644
index 0000000000..f595e932a5
--- /dev/null
+++ b/framework/sdk-parent/sdk/src/main/java/io/metersphere/dto/FileMetadataDTO.java
@@ -0,0 +1,9 @@
+package io.metersphere.dto;
+
+import io.metersphere.base.domain.FileMetadataWithBLOBs;
+import lombok.Data;
+
+@Data
+public class FileMetadataDTO extends FileMetadataWithBLOBs {
+    private String moduleName;
+}
diff --git a/framework/sdk-parent/sdk/src/main/java/io/metersphere/metadata/controller/FileMetadataController.java b/framework/sdk-parent/sdk/src/main/java/io/metersphere/metadata/controller/FileMetadataController.java
index 9bc1f7f8a6..015f002a57 100644
--- a/framework/sdk-parent/sdk/src/main/java/io/metersphere/metadata/controller/FileMetadataController.java
+++ b/framework/sdk-parent/sdk/src/main/java/io/metersphere/metadata/controller/FileMetadataController.java
@@ -8,6 +8,7 @@ import io.metersphere.commons.constants.OperLogConstants;
 import io.metersphere.commons.constants.OperLogModule;
 import io.metersphere.commons.utils.PageUtils;
 import io.metersphere.commons.utils.Pager;
+import io.metersphere.dto.FileMetadataDTO;
 import io.metersphere.log.annotation.MsAuditLog;
 import io.metersphere.metadata.service.FileMetadataService;
 import io.metersphere.metadata.vo.DownloadRequest;
@@ -15,13 +16,13 @@ import io.metersphere.metadata.vo.DumpFileRequest;
 import io.metersphere.metadata.vo.FileMetadataCreateRequest;
 import io.metersphere.metadata.vo.MoveFIleMetadataRequest;
 import io.metersphere.request.QueryProjectFileRequest;
+import jakarta.annotation.Resource;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import jakarta.annotation.Resource;
 import java.util.List;
 
 @RequestMapping("/file/metadata")
@@ -36,11 +37,11 @@ public class FileMetadataController {
     }
 
     @PostMapping("/project/{projectId}/{goPage}/{pageSize}")
-    public Pager<List<FileMetadataWithBLOBs>> getProjectFiles(@PathVariable String projectId,
-                                                              @PathVariable int goPage, @PathVariable int pageSize,
-                                                              @RequestBody QueryProjectFileRequest request) {
+    public Pager<List<FileMetadataDTO>> getProjectFiles(@PathVariable String projectId,
+                                                        @PathVariable int goPage, @PathVariable int pageSize,
+                                                        @RequestBody QueryProjectFileRequest request) {
         Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
-        return PageUtils.setPageInfo(page, fileMetadataService.getProjectFiles(projectId, request));
+        return PageUtils.setPageInfo(page, fileMetadataService.getFileMetadataByProject(projectId, request));
     }
 
     @PostMapping(value = "/create")
diff --git a/framework/sdk-parent/sdk/src/main/java/io/metersphere/metadata/service/FileMetadataService.java b/framework/sdk-parent/sdk/src/main/java/io/metersphere/metadata/service/FileMetadataService.java
index 74eccb2dd9..b4aefbed3c 100644
--- a/framework/sdk-parent/sdk/src/main/java/io/metersphere/metadata/service/FileMetadataService.java
+++ b/framework/sdk-parent/sdk/src/main/java/io/metersphere/metadata/service/FileMetadataService.java
@@ -16,6 +16,7 @@ import io.metersphere.commons.utils.LogUtil;
 import io.metersphere.commons.utils.SessionUtils;
 import io.metersphere.dto.AttachmentBodyFile;
 import io.metersphere.dto.FileInfoDTO;
+import io.metersphere.dto.FileMetadataDTO;
 import io.metersphere.i18n.Translator;
 import io.metersphere.log.utils.ReflexObjectUtil;
 import io.metersphere.log.vo.DetailColumn;
@@ -165,6 +166,18 @@ public class FileMetadataService {
         return saveFile(file, fileMetadata);
     }
 
+    public List<FileMetadataDTO> getFileMetadataByProject(String projectId, QueryProjectFileRequest request) {
+        if (CollectionUtils.isEmpty(request.getOrders())) {
+            OrderRequest req = new OrderRequest();
+            req.setName("update_time");
+            req.setType("desc");
+            request.setOrders(new ArrayList<>() {{
+                this.add(req);
+            }});
+        }
+        return baseFileMetadataMapper.getFileMetadataByProject(projectId, request);
+    }
+
     public List<FileMetadataWithBLOBs> getProjectFiles(String projectId, QueryProjectFileRequest request) {
         if (CollectionUtils.isEmpty(request.getOrders())) {
             OrderRequest req = new OrderRequest();