From d64390274777bbd3397ab980b9cb9b6f110598c7 Mon Sep 17 00:00:00 2001
From: chenxudong <chenxudong@cqida.cn>
Date: Mon, 10 Feb 2025 14:16:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=BC=BA=E5=88=A0=E9=99=A4=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../software/manage/pojo/models/EdFileInfo.java        | 10 ++++++++++
 .../service/serviceimpl/EdFileInfoServiceImpl.java     |  5 +++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdFileInfo.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdFileInfo.java
index d78e23a..ffaddb2 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdFileInfo.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdFileInfo.java
@@ -116,6 +116,16 @@ public class EdFileInfo extends BaseModel {
     @TableField(value = "prj_dir")
     private Boolean prjDir;
 
+    /** 当一个文件作废时，其所有的历史文件也会跟着作废，此时该文件及其历史文件的all_deleted=true**/
+    @TableField(value = "all_deleted")
+    private Boolean allDeleted;
+
+    /**
+     * 当文件被管理员永久物理删除，此时为true
+     */
+    @TableField(value = "permanent_deleted")
+    private Boolean permanentDeleted;
+
     public void newInit() {
         String userId = UserThreadLocal.getUserId();
         String newFileDbId = IdWorker.getSnowFlakeIdString();
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
index f70a36a..05e6c08 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
@@ -209,7 +209,8 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
                 .set(EdFileInfo::getUpdatedBy, currentUserId)
                 .set(EdFileInfo::getUpdatedTime, now)
                 .set(EdFileInfo::getEffectFlag, false)
-                .eq(EdFileInfo::getId, id));
+                .set(EdFileInfo::getAllDeleted, true)
+                .eq(EdFileInfo::getFileId, fileInfo.getFileId()));
         return ElectromagneticResultUtil.success(true);
     }
 
@@ -1153,7 +1154,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
                 throw new BizException(info);
             }
         }
-        Arrays.stream(FileUtil.ls(path)).forEach(e -> FileUtil.del(e.getAbsolutePath()));
+        FileUtil.del(path);
         return destColibPath;
     }