修改增加删除关联关系逻辑及增加字段

IBKLinker-Minio/Controller/MinioController/MinioApiController.cs

@@ -329,11 +329,13 @@ namespace IBKLinker_Minio.Controller.MinioController
         public RequestEntity AddFileassociation(MinioFileassociation minioFileassociation)
         {
             RequestEntity request = new RequestEntity();
-            try
+            using (IDbContext db = ObjectContainer.GetObject<IDbContext>("db"))
             {
-                ///创建数据库连接上下文对象
-                using (IDbContext db = ObjectContainer.GetObject<IDbContext>("db"))
+                try
                 {
+                    db.BeginTransaction();//启动事务
+                    ///创建数据库连接上下文对象
+
                     ///拿到表自增长的值赋值给自增长主键pk
                     minioFileassociation.Pk = getPk("S_MINIO_FILEASSOCIATION", "MINIO_FILEASSOCIATION");
                     ///给创建时间赋值
@@ -341,13 +343,16 @@ namespace IBKLinker_Minio.Controller.MinioController
 
                     ///把需要添加的数据同步到数据库
                     db.Insert<MinioFileassociation>(minioFileassociation);
+                    db.Commit();//提交事务
                     request.code = "0";
+                    request.msg = "关联成功！";
+                }
+                catch (Exception ex)
+                {
+                    db.Rollback();//回滚
+                    request.code = "1";
+                    logger.ErrorFormat("主表:MINIO_FILEASSOCIATION，minio文件关联表表添加数据失败，错误原因:{0}", ex);
                 }
-            }
-            catch (Exception ex)
-            {
-                request.code = "1";
-                logger.ErrorFormat("主表:MINIO_FILEASSOCIATION，minio文件关联表表添加数据失败，错误原因:{0}", ex);
             }
             return request;
         }
@@ -359,10 +364,10 @@ namespace IBKLinker_Minio.Controller.MinioController
         public RequestEntity UpdateFileassociation(List<MinioFileassociation> data)
         {
             RequestEntity request = new RequestEntity();
-            try
+            ///创建数据库连接上下文对象
+            using (IDbContext db = ObjectContainer.GetObject<IDbContext>("db"))
             {
-                ///创建数据库连接上下文对象
-                using (IDbContext db = ObjectContainer.GetObject<IDbContext>("db"))
+                try
                 {
                     try
                     {
@@ -373,20 +378,22 @@ namespace IBKLinker_Minio.Controller.MinioController
                         db.Update<MinioFileassociation>(data);
                         db.Commit();
                         request.code = "0";
+                        request.msg = "修改成功！";
                     }
                     catch (Exception ex)
                     {
                         request.code = "1";
-                        db.Rollback();
+                        db.Rollback();//回滚
                         ///把错误日志写到日志文件
                         logger.ErrorFormat("主表:MINIO_FILEASSOCIATION，修改minio文件关联表表失败，错误原因:{0}", ex);
                     }
                 }
-            }
-            catch (Exception ex)
-            {
-                request.code = "1";
-                logger.ErrorFormat("主表:MINIO_FILEASSOCIATION，创建数据库连接对象，错误原因:{0}", ex);
+                catch (Exception ex)
+                {
+                    db.Rollback();//回滚
+                    request.code = "1";
+                    logger.ErrorFormat("主表:MINIO_FILEASSOCIATION，创建数据库连接对象，错误原因:{0}", ex);
+                }
             }
             return request;
         }
@@ -396,26 +403,27 @@ namespace IBKLinker_Minio.Controller.MinioController
         /// </summary>
         /// <param name="master">需要删除的数据</param>
         [HttpPost, Route("RemoveFileassociation")]
-        public RequestEntity RemoveFileassociation(List<MinioFileassociation> master)
+        public RequestEntity RemoveFileassociation(MinioFileassociation master)
         {
             RequestEntity request = new RequestEntity();
-            try
+            ///创建数据库连接上下文对象
+            using (IDbContext db = ObjectContainer.GetObject<IDbContext>("db"))
             {
-                using (IDbContext db = ObjectContainer.GetObject<IDbContext>("db"))
+                try
                 {
-                    db.BeginTransaction();
-
+                    db.BeginTransaction();//启动事务
                     db.Delete<MinioFileassociation>(master);
-
-                    db.Commit();
+                    db.Commit();//提交事务
                     request.code = "0";
-                }
-            }
-            catch (Exception ex)
-            {
-                request.code = "1";
+                    request.msg = "删除成功！";
 
-                logger.ErrorFormat("主表:MINIO_FILEASSOCIATION，创建数据库连接对象失败，错误原因:{0}", ex);
+                }
+                catch (Exception ex)
+                {
+                    db.Rollback();//回滚
+                    request.code = "1";
+                    logger.ErrorFormat("主表:MINIO_FILEASSOCIATION，创建数据库连接对象失败，错误原因:{0}", ex);
+                }
             }
             return request;
         }

IBKLinker-Minio/Entity/MinioController/MinioFileassociation.cs

@@ -34,6 +34,34 @@ namespace IBKLinker_Minio.Entity.MinioController
         [Persistent("FILE_NAME"), DisplayName("文件名称")]
         public string FileName { get; set; }
 
+        /// <summary>
+        ///文件类型
+        /// </summary>
+        [Persistent("FILE_TYPE"), DisplayName("文件类型")]
+        public string FileType { get; set; }
+
+
+        /// <summary>
+        ///文件下载次数
+        /// </summary>
+        [Persistent("DOWNLOAD_NUM"), DisplayName("文件下载次数")]
+        public string DownloadNum { get; set; }
+
+
+
+        /// <summary>
+        ///文件层级
+        /// </summary>
+        [Persistent("FILE_LEVEL"), DisplayName("文件层级")]
+        public string FileLevel { get; set; }
+
+
+        /// <summary>
+        ///文件路径
+        /// </summary>
+        [Persistent("FILE_PATH"), DisplayName("文件路径")]
+        public string FilePath { get; set; }
+
 
         /// <summary>
         ///关联文件PK
@@ -46,7 +74,35 @@ namespace IBKLinker_Minio.Entity.MinioController
         ///关联文件名称
         /// </summary>
         [Persistent("ASSOCIATION_FILE_NAME"), DisplayName("关联文件名称")]
-        public string AssorciationFileName { get; set; }
+        public string AssociationFileName { get; set; }
+
+
+        /// <summary>
+        ///关联文件类型
+        /// </summary>
+        [Persistent("ASSOCIATION_FILE_TYPE"), DisplayName("文件类型")]
+        public string AssociationFileType { get; set; }
+
+
+        /// <summary>
+        ///关联文件下载次数
+        /// </summary>
+        [Persistent("ASSOCIATION_DOWNLOAD_NUM"), DisplayName("文件下载次数")]
+        public string AssociationDownloadNum { get; set; }
+
+
+
+        /// <summary>
+        ///关联文件层级
+        /// </summary>
+        [Persistent("ASSOCIATION_FILE_LEVEL"), DisplayName("文件层级")]
+        public string AssociationFileLevel { get; set; }
+
+        /// <summary>
+        ///关联文件路径
+        /// </summary>
+        [Persistent("ASSOCIATION_FILE_PATH"), DisplayName("关联文件路径")]
+        public string AssorciationFilePath { get; set; }
 
 
         /// <summary>