From 87668b7e6594a964b1e516aacd567bb6a1417a04 Mon Sep 17 00:00:00 2001
From: sunliang <593170460@qq.com>
Date: Sat, 21 Oct 2023 13:22:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=8F=8A=E6=96=87=E4=BB=B6=E5=A4=B9=E7=9A=84=E7=89=A9=E7=90=86?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=B9=E5=BC=8F=E6=94=B9=E4=B8=BA=E6=A0=87?=
 =?UTF-8?q?=E5=BF=97=E4=BD=8D=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MinioController/MinioApiController.cs     | 18 +++++++++----
 .../MinioController/MinioStoragePath.cs       | 27 +++++++++++++++++++
 2 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/IBKLinker-Minio/Controller/MinioController/MinioApiController.cs b/IBKLinker-Minio/Controller/MinioController/MinioApiController.cs
index 55ac33d..5e5c0e5 100644
--- a/IBKLinker-Minio/Controller/MinioController/MinioApiController.cs
+++ b/IBKLinker-Minio/Controller/MinioController/MinioApiController.cs
@@ -748,8 +748,15 @@ namespace IBKLinker_Minio.Controller.MinioController
                     {
                         if (item.FileType == 1) //如果类型是文件
                         {
-                            minio.RemoveObjectAsync(buckname, item.FileName);//minio操作删除文件
-                            string sql = string.Format(" delete from MINIO_FILEASSOCIATION where FILE_PK like'%{0}%' or ASSOCIATION_FILE_PK like'%{0}%'", item.Pk);//删除关联表中的关联关系
+                            //minio.RemoveObjectAsync(buckname, item.FileName);//minio操作删除文件
+                            string sql = string.Format("update MINIO_STORAGE_PATH set CLEAR_FLAG='1',CLEAR_USERS='{0}',CLEAR_TIME='{1}' where PK='{2}' ", item.ClearUsers, item.ClearTime, item.Pk);//更新文件路径表中的删除状态
+                            db.Execute(sql);
+                            sql = string.Format(" delete from MINIO_FILEASSOCIATION where FILE_PK like'%{0}%' or ASSOCIATION_FILE_PK like'%{0}%'", item.Pk);//删除关联表中的关联关系
+                            db.Execute(sql);
+                        }
+                        else 
+                        {
+                            string sql = string.Format("update MINIO_STORAGE_PATH set CLEAR_FLAG='1',CLEAR_USERS='{0}',CLEAR_TIME='{1}' where PK='{2}' ",item.ClearUsers,item.ClearTime, item.Pk);//更新文件路径表中的删除状态
                             db.Execute(sql);
                         }
                     }
@@ -759,6 +766,7 @@ namespace IBKLinker_Minio.Controller.MinioController
                 }
                 catch (Exception ex)
                 {
+                    db.Rollback();
                     request.code = "1";
                     logger.ErrorFormat("主表:MINIO_ROLE_PERMISSION，创建数据库连接对象失败，错误原因:{0}", ex);
                 }
@@ -786,7 +794,7 @@ namespace IBKLinker_Minio.Controller.MinioController
                         sql += " and  FILE_NAME ='" + minioStoragePath.FileName + "'";
                     }
 
-                    request.data = db.Query<MinioStoragePath>("select * from MINIO_STORAGE_PATH where 1=1 " + sql + " ORDER BY PK");
+                    request.data = db.Query<MinioStoragePath>("select * from MINIO_STORAGE_PATH where 1=1 " + sql + " and  CLEAR_FLAG='0' ORDER BY PK");
                     request.code = "0";
                 }
             }
@@ -819,7 +827,7 @@ namespace IBKLinker_Minio.Controller.MinioController
                     sql += " and  UPK =" + int.Parse(PK);
                 }
 
-                date = db.Query<MinioStoragePath>("select * from MINIO_STORAGE_PATH where 1=1 " + sql + " ORDER BY PK").ToList();
+                date = db.Query<MinioStoragePath>("select * from MINIO_STORAGE_PATH where 1=1 " + sql + "and  CLEAR_FLAG='0'   ORDER BY PK").ToList();
 
             }
             return date;
@@ -842,7 +850,7 @@ namespace IBKLinker_Minio.Controller.MinioController
                     string sql = string.Empty;
 
 
-                    date = db.Query<MinioStoragePath>("select * from MINIO_STORAGE_PATH  ORDER BY PK").ToList();
+                    date = db.Query<MinioStoragePath>("select * from MINIO_STORAGE_PATH where  CLEAR_FLAG='0' ORDER BY PK").ToList();
 
                 }
                 if (date.Count > 0)
diff --git a/IBKLinker-Minio/Entity/MinioController/MinioStoragePath.cs b/IBKLinker-Minio/Entity/MinioController/MinioStoragePath.cs
index 321ff25..4c02a8f 100644
--- a/IBKLinker-Minio/Entity/MinioController/MinioStoragePath.cs
+++ b/IBKLinker-Minio/Entity/MinioController/MinioStoragePath.cs
@@ -96,6 +96,33 @@ namespace IBKLinker_Minio.Entity.MinioController
         [Persistent("ALTERNATE_FIELDS"), DisplayName("备用字段")]
         public string AlternateFields { get; set; }
 
+
+
+        /// <summary>
+        ///删除时间
+        /// </summary>
+        [Persistent("CLEAR_TIME"), DisplayName("删除时间")]
+        public DateTime? ClearTime { get; set; }
+
+
+
+        /// <summary>
+        ///删除用户
+        /// </summary>
+        [Persistent("CLEAR_USERS"), DisplayName("删除用户")]
+        public string ClearUsers { get; set; }
+
+
+
+        /// <summary>
+        ///删除标记 0未删除 1删除
+        /// </summary>
+        [Persistent("CLEAR_FLAG"), DisplayName("删除标记 0未删除 1删除")]
+        public string ClearFlag { get; set; }
+
+
+
+
         /// <summary>
         ///文件格式
         /// </summary>