From 3bd1cc45f80bc83b100093ec6f577fb963ab9a2f Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Thu, 1 Feb 2024 15:06:41 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86=E5=88=A0=E9=99=A4=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E5=86=8D=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E8=A1=A8=EF=BC=8C=E5=B9=B6=E5=8A=A0=E4=BB=A5?=
 =?UTF-8?q?=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/domain/FileAssociation.java       |  11 +-
 .../domain/FileAssociationExample.java        | 130 ++++++++++++++++++
 .../project/mapper/FileAssociationMapper.xml  |  53 ++++++-
 .../ddl/V3.0.0_4__project_management.sql      |  25 ++--
 .../project/mapper/ExtFileMetadataMapper.xml  |   4 +-
 .../service/FileAssociationService.java       |   1 +
 .../service/FileManagementService.java        |  13 +-
 .../project/service/FileMetadataService.java  |  15 +-
 .../project/utils/FileMetadataUtils.java      |   8 ++
 .../main/resources/projectGeneratorConfig.xml |  10 +-
 .../FileManagementControllerTests.java        |  36 +++--
 .../system/dto/excel/ExcelValidateHelper.java |  12 +-
 .../resources/file/user_import_error_all.xlsx | Bin 9242 -> 9241 bytes
 13 files changed, 255 insertions(+), 63 deletions(-)

diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/domain/FileAssociation.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/FileAssociation.java
index 0a47694000..ae0f2f3746 100644
--- a/backend/framework/domain/src/main/java/io/metersphere/project/domain/FileAssociation.java
+++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/FileAssociation.java
@@ -52,6 +52,13 @@ public class FileAssociation implements Serializable {
     @Schema(description = "创建人")
     private String createUser;
 
+    @Schema(description = "是否删除", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "{file_association.deleted.not_blank}", groups = {Created.class})
+    private Boolean deleted;
+
+    @Schema(description = "删除时的文件名称")
+    private String deletedFileName;
+
     private static final long serialVersionUID = 1L;
 
     public enum Column {
@@ -64,7 +71,9 @@ public class FileAssociation implements Serializable {
         createTime("create_time", "createTime", "BIGINT", false),
         updateUser("update_user", "updateUser", "VARCHAR", false),
         updateTime("update_time", "updateTime", "BIGINT", false),
-        createUser("create_user", "createUser", "VARCHAR", false);
+        createUser("create_user", "createUser", "VARCHAR", false),
+        deleted("deleted", "deleted", "BIT", false),
+        deletedFileName("deleted_file_name", "deletedFileName", "VARCHAR", false);
 
         private static final String BEGINNING_DELIMITER = "`";
 
diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/domain/FileAssociationExample.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/FileAssociationExample.java
index 8745070ed2..1baa4a3274 100644
--- a/backend/framework/domain/src/main/java/io/metersphere/project/domain/FileAssociationExample.java
+++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/FileAssociationExample.java
@@ -783,6 +783,136 @@ public class FileAssociationExample {
             addCriterion("create_user not between", value1, value2, "createUser");
             return (Criteria) this;
         }
+
+        public Criteria andDeletedIsNull() {
+            addCriterion("deleted is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedIsNotNull() {
+            addCriterion("deleted is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedEqualTo(Boolean value) {
+            addCriterion("deleted =", value, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedNotEqualTo(Boolean value) {
+            addCriterion("deleted <>", value, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedGreaterThan(Boolean value) {
+            addCriterion("deleted >", value, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("deleted >=", value, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedLessThan(Boolean value) {
+            addCriterion("deleted <", value, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedLessThanOrEqualTo(Boolean value) {
+            addCriterion("deleted <=", value, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedIn(List<Boolean> values) {
+            addCriterion("deleted in", values, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedNotIn(List<Boolean> values) {
+            addCriterion("deleted not in", values, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedBetween(Boolean value1, Boolean value2) {
+            addCriterion("deleted between", value1, value2, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("deleted not between", value1, value2, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedFileNameIsNull() {
+            addCriterion("deleted_file_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedFileNameIsNotNull() {
+            addCriterion("deleted_file_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedFileNameEqualTo(String value) {
+            addCriterion("deleted_file_name =", value, "deletedFileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedFileNameNotEqualTo(String value) {
+            addCriterion("deleted_file_name <>", value, "deletedFileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedFileNameGreaterThan(String value) {
+            addCriterion("deleted_file_name >", value, "deletedFileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedFileNameGreaterThanOrEqualTo(String value) {
+            addCriterion("deleted_file_name >=", value, "deletedFileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedFileNameLessThan(String value) {
+            addCriterion("deleted_file_name <", value, "deletedFileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedFileNameLessThanOrEqualTo(String value) {
+            addCriterion("deleted_file_name <=", value, "deletedFileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedFileNameLike(String value) {
+            addCriterion("deleted_file_name like", value, "deletedFileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedFileNameNotLike(String value) {
+            addCriterion("deleted_file_name not like", value, "deletedFileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedFileNameIn(List<String> values) {
+            addCriterion("deleted_file_name in", values, "deletedFileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedFileNameNotIn(List<String> values) {
+            addCriterion("deleted_file_name not in", values, "deletedFileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedFileNameBetween(String value1, String value2) {
+            addCriterion("deleted_file_name between", value1, value2, "deletedFileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedFileNameNotBetween(String value1, String value2) {
+            addCriterion("deleted_file_name not between", value1, value2, "deletedFileName");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {
diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/mapper/FileAssociationMapper.xml b/backend/framework/domain/src/main/java/io/metersphere/project/mapper/FileAssociationMapper.xml
index 8cc9c4ba62..4ebe7490f0 100644
--- a/backend/framework/domain/src/main/java/io/metersphere/project/mapper/FileAssociationMapper.xml
+++ b/backend/framework/domain/src/main/java/io/metersphere/project/mapper/FileAssociationMapper.xml
@@ -12,6 +12,8 @@
     <result column="update_user" jdbcType="VARCHAR" property="updateUser" />
     <result column="update_time" jdbcType="BIGINT" property="updateTime" />
     <result column="create_user" jdbcType="VARCHAR" property="createUser" />
+    <result column="deleted" jdbcType="BIT" property="deleted" />
+    <result column="deleted_file_name" jdbcType="VARCHAR" property="deletedFileName" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -73,7 +75,7 @@
   </sql>
   <sql id="Base_Column_List">
     id, source_type, source_id, file_id, file_ref_id, file_version, create_time, update_user, 
-    update_time, create_user
+    update_time, create_user, deleted, deleted_file_name
   </sql>
   <select id="selectByExample" parameterType="io.metersphere.project.domain.FileAssociationExample" resultMap="BaseResultMap">
     select
@@ -109,11 +111,13 @@
     insert into file_association (id, source_type, source_id, 
       file_id, file_ref_id, file_version, 
       create_time, update_user, update_time, 
-      create_user)
+      create_user, deleted, deleted_file_name
+      )
     values (#{id,jdbcType=VARCHAR}, #{sourceType,jdbcType=VARCHAR}, #{sourceId,jdbcType=VARCHAR}, 
       #{fileId,jdbcType=VARCHAR}, #{fileRefId,jdbcType=VARCHAR}, #{fileVersion,jdbcType=VARCHAR}, 
       #{createTime,jdbcType=BIGINT}, #{updateUser,jdbcType=VARCHAR}, #{updateTime,jdbcType=BIGINT}, 
-      #{createUser,jdbcType=VARCHAR})
+      #{createUser,jdbcType=VARCHAR}, #{deleted,jdbcType=BIT}, #{deletedFileName,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="io.metersphere.project.domain.FileAssociation">
     insert into file_association
@@ -148,6 +152,12 @@
       <if test="createUser != null">
         create_user,
       </if>
+      <if test="deleted != null">
+        deleted,
+      </if>
+      <if test="deletedFileName != null">
+        deleted_file_name,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -180,6 +190,12 @@
       <if test="createUser != null">
         #{createUser,jdbcType=VARCHAR},
       </if>
+      <if test="deleted != null">
+        #{deleted,jdbcType=BIT},
+      </if>
+      <if test="deletedFileName != null">
+        #{deletedFileName,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="io.metersphere.project.domain.FileAssociationExample" resultType="java.lang.Long">
@@ -221,6 +237,12 @@
       <if test="record.createUser != null">
         create_user = #{record.createUser,jdbcType=VARCHAR},
       </if>
+      <if test="record.deleted != null">
+        deleted = #{record.deleted,jdbcType=BIT},
+      </if>
+      <if test="record.deletedFileName != null">
+        deleted_file_name = #{record.deletedFileName,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -237,7 +259,9 @@
       create_time = #{record.createTime,jdbcType=BIGINT},
       update_user = #{record.updateUser,jdbcType=VARCHAR},
       update_time = #{record.updateTime,jdbcType=BIGINT},
-      create_user = #{record.createUser,jdbcType=VARCHAR}
+      create_user = #{record.createUser,jdbcType=VARCHAR},
+      deleted = #{record.deleted,jdbcType=BIT},
+      deleted_file_name = #{record.deletedFileName,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -272,6 +296,12 @@
       <if test="createUser != null">
         create_user = #{createUser,jdbcType=VARCHAR},
       </if>
+      <if test="deleted != null">
+        deleted = #{deleted,jdbcType=BIT},
+      </if>
+      <if test="deletedFileName != null">
+        deleted_file_name = #{deletedFileName,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -285,19 +315,22 @@
       create_time = #{createTime,jdbcType=BIGINT},
       update_user = #{updateUser,jdbcType=VARCHAR},
       update_time = #{updateTime,jdbcType=BIGINT},
-      create_user = #{createUser,jdbcType=VARCHAR}
+      create_user = #{createUser,jdbcType=VARCHAR},
+      deleted = #{deleted,jdbcType=BIT},
+      deleted_file_name = #{deletedFileName,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   <insert id="batchInsert" parameterType="map">
     insert into file_association
     (id, source_type, source_id, file_id, file_ref_id, file_version, create_time, update_user, 
-      update_time, create_user)
+      update_time, create_user, deleted, deleted_file_name)
     values
     <foreach collection="list" item="item" separator=",">
       (#{item.id,jdbcType=VARCHAR}, #{item.sourceType,jdbcType=VARCHAR}, #{item.sourceId,jdbcType=VARCHAR}, 
         #{item.fileId,jdbcType=VARCHAR}, #{item.fileRefId,jdbcType=VARCHAR}, #{item.fileVersion,jdbcType=VARCHAR}, 
         #{item.createTime,jdbcType=BIGINT}, #{item.updateUser,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=BIGINT}, 
-        #{item.createUser,jdbcType=VARCHAR})
+        #{item.createUser,jdbcType=VARCHAR}, #{item.deleted,jdbcType=BIT}, #{item.deletedFileName,jdbcType=VARCHAR}
+        )
     </foreach>
   </insert>
   <insert id="batchInsertSelective" parameterType="map">
@@ -340,6 +373,12 @@
         <if test="'create_user'.toString() == column.value">
           #{item.createUser,jdbcType=VARCHAR}
         </if>
+        <if test="'deleted'.toString() == column.value">
+          #{item.deleted,jdbcType=BIT}
+        </if>
+        <if test="'deleted_file_name'.toString() == column.value">
+          #{item.deletedFileName,jdbcType=VARCHAR}
+        </if>
       </foreach>
       )
     </foreach>
diff --git a/backend/framework/domain/src/main/resources/migration/3.0.0/ddl/V3.0.0_4__project_management.sql b/backend/framework/domain/src/main/resources/migration/3.0.0/ddl/V3.0.0_4__project_management.sql
index 2cb69f66f8..207f5d1110 100644
--- a/backend/framework/domain/src/main/resources/migration/3.0.0/ddl/V3.0.0_4__project_management.sql
+++ b/backend/framework/domain/src/main/resources/migration/3.0.0/ddl/V3.0.0_4__project_management.sql
@@ -52,17 +52,19 @@ CREATE INDEX idx_name ON fake_error (name);
 
 CREATE TABLE IF NOT EXISTS file_association
 (
-    `id`             VARCHAR(50) NOT NULL COMMENT '',
-    `source_type`    VARCHAR(50) NOT NULL COMMENT '资源类型',
-    `source_id`      VARCHAR(50) NOT NULL COMMENT '资源ID',
-    `file_id`        VARCHAR(50) NOT NULL COMMENT '文件ID',
-    `file_ref_id`    VARCHAR(50) NOT NULL COMMENT '文件同版本ID',
-    `file_version`   VARCHAR(50) NOT NULL COMMENT '文件版本',
-    `create_time`    BIGINT      NOT NULL COMMENT '创建时间',
-    `update_user`    VARCHAR(50) NOT NULL COMMENT '修改人',
-    `update_time`    BIGINT      NOT NULL COMMENT '更新时间',
-    `create_user`    VARCHAR(50) COMMENT '创建人',
-    PRIMARY KEY (id)
+       `id` VARCHAR(50) NOT NULL   COMMENT '' ,
+       `source_type` VARCHAR(50) NOT NULL   COMMENT '资源类型' ,
+       `source_id` VARCHAR(50) NOT NULL   COMMENT '资源ID' ,
+       `file_id` VARCHAR(50) NOT NULL   COMMENT '文件ID' ,
+       `file_ref_id` VARCHAR(50) NOT NULL   COMMENT '文件同版本ID' ,
+       `file_version` VARCHAR(50) NOT NULL   COMMENT '文件版本' ,
+       `create_time` BIGINT NOT NULL   COMMENT '创建时间' ,
+       `update_user` VARCHAR(50) NOT NULL   COMMENT '修改人' ,
+       `update_time` BIGINT NOT NULL   COMMENT '更新时间' ,
+       `create_user` VARCHAR(50)    COMMENT '创建人' ,
+       `deleted` BIT NOT NULL  DEFAULT 0 COMMENT '是否删除' ,
+       `deleted_file_name` VARCHAR(255)    COMMENT '删除时的文件名称' ,
+       PRIMARY KEY (id)
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4
   COLLATE = utf8mb4_general_ci
@@ -70,6 +72,7 @@ CREATE TABLE IF NOT EXISTS file_association
 
 
 
+
 CREATE INDEX idx_file_metadata_id ON file_association (file_id);
 CREATE INDEX idx_source_type ON file_association (source_type);
 CREATE INDEX idx_source_id ON file_association (source_id);
diff --git a/backend/services/project-management/src/main/java/io/metersphere/project/mapper/ExtFileMetadataMapper.xml b/backend/services/project-management/src/main/java/io/metersphere/project/mapper/ExtFileMetadataMapper.xml
index 333fcb9a04..8a36c2601a 100644
--- a/backend/services/project-management/src/main/java/io/metersphere/project/mapper/ExtFileMetadataMapper.xml
+++ b/backend/services/project-management/src/main/java/io/metersphere/project/mapper/ExtFileMetadataMapper.xml
@@ -122,9 +122,7 @@
 
     <select id="selectDeleteFileInfoByIds" resultType="io.metersphere.project.domain.FileMetadata">
         SELECT
-            f.id,
-            f.project_id,
-            f.storage
+        f.id,f.name,f.type,f.project_id,f.storage
         FROM  file_metadata f WHERE f.id IN
         <foreach collection="ids" item="item" open="(" separator="," close=")">
             #{item}
diff --git a/backend/services/project-management/src/main/java/io/metersphere/project/service/FileAssociationService.java b/backend/services/project-management/src/main/java/io/metersphere/project/service/FileAssociationService.java
index 7ded797a22..4613afc9ff 100644
--- a/backend/services/project-management/src/main/java/io/metersphere/project/service/FileAssociationService.java
+++ b/backend/services/project-management/src/main/java/io/metersphere/project/service/FileAssociationService.java
@@ -174,6 +174,7 @@ public class FileAssociationService {
                 fileAssociation.setUpdateTime(operatorTime);
                 fileAssociation.setUpdateUser(logRecord.getOperator());
                 fileAssociation.setFileVersion(item.getFileVersion());
+                fileAssociation.setDeleted(false);
                 createFile.add(fileAssociation);
             });
             fileAssociationMapper.batchInsert(createFile);
diff --git a/backend/services/project-management/src/main/java/io/metersphere/project/service/FileManagementService.java b/backend/services/project-management/src/main/java/io/metersphere/project/service/FileManagementService.java
index 07be70452e..acbf8350ba 100644
--- a/backend/services/project-management/src/main/java/io/metersphere/project/service/FileManagementService.java
+++ b/backend/services/project-management/src/main/java/io/metersphere/project/service/FileManagementService.java
@@ -4,6 +4,7 @@ import io.metersphere.project.domain.*;
 import io.metersphere.project.dto.filemanagement.FileManagementQuery;
 import io.metersphere.project.dto.filemanagement.request.FileBatchProcessRequest;
 import io.metersphere.project.mapper.*;
+import io.metersphere.project.utils.FileMetadataUtils;
 import io.metersphere.sdk.constants.DefaultRepositoryDir;
 import io.metersphere.sdk.constants.ModuleConstants;
 import io.metersphere.sdk.constants.StorageType;
@@ -66,9 +67,15 @@ public class FileManagementService {
             repositoryExample.createCriteria().andFileMetadataIdIn(deleteIds);
             fileMetadataRepositoryMapper.deleteByExample(repositoryExample);
 
-            FileAssociationExample associationExample = new FileAssociationExample();
-            associationExample.createCriteria().andFileIdIn(deleteIds);
-            fileAssociationMapper.deleteByExample(associationExample);
+            // 2.1 需求： 删除文件时，对应的关系不应删除，要打上删除标记并赋值删除时的文件名称。这样在关联列表中就可以看到删除的文件
+            for (FileMetadata fileMetadata : deleteList) {
+                FileAssociationExample associationExample = new FileAssociationExample();
+                associationExample.createCriteria().andFileIdEqualTo(fileMetadata.getId());
+                FileAssociation updateAssociation = new FileAssociation();
+                updateAssociation.setDeleted(true);
+                updateAssociation.setDeletedFileName(FileMetadataUtils.getFileName(fileMetadata));
+                fileAssociationMapper.updateByExampleSelective(updateAssociation, associationExample);
+            }
 
             //记录日志
             fileMetadataLogService.saveDeleteLog(deleteList, request.getProjectId(), operator);
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 809389e6e9..b5b2413955 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
@@ -328,17 +328,10 @@ public class FileMetadataService {
         byte[] bytes = this.getFileByte(fileMetadata);
         return ResponseEntity.ok()
                 .contentType(MediaType.parseMediaType("application/octet-stream"))
-                .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + this.getFileName(fileMetadata.getName(), fileMetadata.getType()) + "\"")
+                .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + FileMetadataUtils.getFileName(fileMetadata) + "\"")
                 .body(bytes);
     }
 
-    private String getFileName(String fileName, String type) {
-        if (StringUtils.isBlank(type)) {
-            return fileName;
-        }
-        return fileName + "." + type;
-    }
-
     public void update(FileUpdateRequest request, String operator) {
         //检查模块的合法性
         FileMetadata fileMetadata = fileMetadataMapper.selectByPrimaryKey(request.getId());
@@ -391,7 +384,7 @@ public class FileMetadataService {
 
     public void batchDownloadWithResponse(List<FileMetadata> fileMetadataList, HttpServletResponse response) {
         Map<String, File> fileMap = new HashMap<>();
-        fileMetadataList.forEach(fileMetadata -> fileMap.put(this.getFileName(fileMetadata.getName(), fileMetadata.getType()), this.getTmpFile(fileMetadata)));
+        fileMetadataList.forEach(fileMetadata -> fileMap.put(FileMetadataUtils.getFileName(fileMetadata), this.getTmpFile(fileMetadata)));
         FileDownloadUtils.zipFilesWithResponse(fileMap, response);
     }
 
@@ -467,7 +460,7 @@ public class FileMetadataService {
         return moduleCountMap;
     }
 
-    public ResponseEntity<byte[]> downloadPreviewImgById(String id) throws Exception {
+    public ResponseEntity<byte[]> downloadPreviewImgById(String id) {
         FileMetadata fileMetadata = fileMetadataMapper.selectByPrimaryKey(id);
         byte[] bytes = new byte[]{};
 
@@ -488,7 +481,7 @@ public class FileMetadataService {
 
         return ResponseEntity.ok()
                 .contentType(contentType)
-                .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + this.getFileName(fileMetadata.getId(), fileMetadata.getType()) + "\"")
+                .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + FileMetadataUtils.getFileName(fileMetadata) + "\"")
                 .body(bytes);
     }
 
diff --git a/backend/services/project-management/src/main/java/io/metersphere/project/utils/FileMetadataUtils.java b/backend/services/project-management/src/main/java/io/metersphere/project/utils/FileMetadataUtils.java
index 7546721ffa..9c2cbf33b9 100644
--- a/backend/services/project-management/src/main/java/io/metersphere/project/utils/FileMetadataUtils.java
+++ b/backend/services/project-management/src/main/java/io/metersphere/project/utils/FileMetadataUtils.java
@@ -1,5 +1,6 @@
 package io.metersphere.project.utils;
 
+import io.metersphere.project.domain.FileMetadata;
 import io.metersphere.project.dto.filemanagement.request.FileMetadataTableRequest;
 import org.apache.commons.lang3.StringUtils;
 
@@ -26,6 +27,13 @@ public class FileMetadataUtils {
         }
     }
 
+    public static String getFileName(FileMetadata fileMetadata) {
+        if (StringUtils.isBlank(fileMetadata.getType())) {
+            return fileMetadata.getName();
+        }
+        return fileMetadata.getName() + "." + fileMetadata.getType();
+    }
+
     /**
      * 将空文件类型转换为unknown
      *
diff --git a/backend/services/project-management/src/main/resources/projectGeneratorConfig.xml b/backend/services/project-management/src/main/resources/projectGeneratorConfig.xml
index b0b6a2d8fd..8a2f651bbd 100644
--- a/backend/services/project-management/src/main/resources/projectGeneratorConfig.xml
+++ b/backend/services/project-management/src/main/resources/projectGeneratorConfig.xml
@@ -72,10 +72,12 @@
         <!--要生成的数据库表 -->
         <!--        <table tableName="custom_function"/>-->
         <!--        <table tableName="fake_error"/>-->
-        <table tableName="file_metadata">
-            <columnOverride column="tags" javaType="java.util.List&lt;String&gt;" jdbcType="VARCHAR"
-                            typeHandler="io.metersphere.handler.ListTypeHandler"/>
-        </table>
+        <!--        <table tableName="file_metadata">-->
+        <!--            <columnOverride column="tags" javaType="java.util.List&lt;String&gt;" jdbcType="VARCHAR"-->
+        <!--                            typeHandler="io.metersphere.handler.ListTypeHandler"/>-->
+        <!--        </table>-->
+
+        <table tableName="file_association"/>
         <!--        <table tableName="file_metadata_repository"/>-->
         <!--        <table tableName="file_module_repository"/>-->
         <!--        <table tableName="project"/>-->
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 4851d38c72..81b470ac8a 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
@@ -1388,6 +1388,22 @@ public class FileManagementControllerTests extends BaseTest {
         if (MapUtils.isEmpty(FILE_VERSIONS_ID_MAP)) {
             this.fileReUploadTestSuccess();
         }
+        //测试中涉及到全部删除。删除文件时FileAssociation不会删除。在删除前先把相关数据全部查询出来，用于全部删除之后的数据检查对比
+        FileAssociationExample fileAssociationExample = new FileAssociationExample();
+        fileAssociationExample.createCriteria().andFileIdIn(new ArrayList<>() {{
+            this.add(fileAssociationNewFilesOne);
+            this.add(fileAssociationNewFilesTwo);
+            this.add(fileAssociationNewFilesThree);
+            this.add(fileAssociationNewFilesFour);
+            this.add(fileAssociationNewFileId);
+            this.add(fileAssociationOldFileId);
+        }});
+        List<FileAssociation> beforeDeletedList = fileAssociationMapper.selectByExample(fileAssociationExample);
+        beforeDeletedList.forEach(item -> {
+            Assertions.assertFalse(item.getDeleted());
+            Assertions.assertNull(item.getDeletedFileName());
+        });
+
         FileBatchProcessRequest fileBatchProcessRequest;
         //删除指定文件
         for (Map.Entry<String, String> entry : FILE_VERSIONS_ID_MAP.entrySet()) {
@@ -1420,17 +1436,13 @@ public class FileManagementControllerTests extends BaseTest {
         example.createCriteria().andProjectIdEqualTo(project.getId());
         Assertions.assertEquals(fileMetadataMapper.countByExample(example), 0);
 
-        //检查fileAssociation表中的数据是否被删除
-        FileAssociationExample fileAssociationExample = new FileAssociationExample();
-        fileAssociationExample.createCriteria().andFileIdIn(new ArrayList<>() {{
-            this.add(fileAssociationNewFilesOne);
-            this.add(fileAssociationNewFilesTwo);
-            this.add(fileAssociationNewFilesThree);
-            this.add(fileAssociationNewFilesFour);
-            this.add(fileAssociationNewFileId);
-            this.add(fileAssociationOldFileId);
-        }});
-        Assertions.assertEquals(fileAssociationMapper.countByExample(fileAssociationExample), 0);
+        //检查fileAssociation
+        List<FileAssociation> aftreDeletedList = fileAssociationMapper.selectByExample(fileAssociationExample);
+        Assertions.assertEquals(beforeDeletedList.size(), aftreDeletedList.size());
+        aftreDeletedList.forEach(item -> {
+            Assertions.assertTrue(item.getDeleted());
+            Assertions.assertNotNull(item.getDeletedFileName());
+        });
 
         //重新上传，用于后续的测试
         this.fileUploadTestSuccess();
@@ -1894,7 +1906,7 @@ public class FileManagementControllerTests extends BaseTest {
         fileAssociation.setUpdateTime(System.currentTimeMillis());
         fileAssociation.setUpdateUser("admin");
         fileAssociation.setFileVersion(fileId);
-        fileAssociationMapper.insert(fileAssociation);
+        fileAssociationMapper.insertSelective(fileAssociation);
         return fileAssociation.getId();
     }
 
diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/dto/excel/ExcelValidateHelper.java b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/excel/ExcelValidateHelper.java
index b904c89a72..ada979a4dc 100644
--- a/backend/services/system-setting/src/main/java/io/metersphere/system/dto/excel/ExcelValidateHelper.java
+++ b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/excel/ExcelValidateHelper.java
@@ -1,15 +1,12 @@
 package io.metersphere.system.dto.excel;
 
-import com.alibaba.excel.annotation.ExcelProperty;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.Resource;
 import jakarta.validation.ConstraintViolation;
 import jakarta.validation.Validator;
 import jakarta.validation.groups.Default;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
-import java.lang.reflect.Field;
 import java.util.Set;
 
 @Component
@@ -25,14 +22,7 @@ public class ExcelValidateHelper {
         Set<ConstraintViolation<T>> set = excelValidateHelper.validator.validate(obj, Default.class);
         if (set != null && !set.isEmpty()) {
             for (ConstraintViolation<T> cv : set) {
-                Field declaredField = obj.getClass().getDeclaredField(cv.getPropertyPath().toString());
-                ExcelProperty annotation = declaredField.getAnnotation(ExcelProperty.class);
-                //拼接错误信息，包含当前出错数据的标题名字+错误信息。  如果列中有必填标识*号，去掉*
-                String columnName = annotation.value()[0];
-                if (StringUtils.endsWith(columnName, "*")) {
-                    columnName = StringUtils.removeEnd(columnName, "*");
-                }
-                result.append(columnName + ":" + cv.getMessage()).append("; ");
+                result.append(cv.getMessage()).append("; ");
             }
         }
         return result.toString();
diff --git a/backend/services/system-setting/src/test/resources/file/user_import_error_all.xlsx b/backend/services/system-setting/src/test/resources/file/user_import_error_all.xlsx
index e8d7f37f7aa42128d89cce11e6a21a21fa4f674e..96fcb7828ddedc81f44585aac1f5aa4e355df49b 100644
GIT binary patch
delta 5206
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
F@Lxz9ije>S

delta 5239
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