From c3e1991dbdaf7236fb98cde5513e5e3d46be3940 Mon Sep 17 00:00:00 2001 From: sunliang <593170460@qq.com> Date: Sat, 11 Nov 2023 18:07:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A2=9E=E5=8A=A0=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=85=B3=E8=81=94=E5=85=B3=E7=B3=BB=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E5=8F=8A=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MinioController/MinioApiController.cs | 68 +++++++++++-------- .../MinioController/MinioFileassociation.cs | 58 +++++++++++++++- 2 files changed, 95 insertions(+), 31 deletions(-) diff --git a/IBKLinker-Minio/Controller/MinioController/MinioApiController.cs b/IBKLinker-Minio/Controller/MinioController/MinioApiController.cs index f78fd46..bcbd73b 100644 --- a/IBKLinker-Minio/Controller/MinioController/MinioApiController.cs +++ b/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("db")) { - ///创建数据库连接上下文对象 - using (IDbContext db = ObjectContainer.GetObject("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); + 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 data) { RequestEntity request = new RequestEntity(); - try + ///创建数据库连接上下文对象 + using (IDbContext db = ObjectContainer.GetObject("db")) { - ///创建数据库连接上下文对象 - using (IDbContext db = ObjectContainer.GetObject("db")) + try { try { @@ -373,20 +378,22 @@ namespace IBKLinker_Minio.Controller.MinioController db.Update(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 /// /// 需要删除的数据 [HttpPost, Route("RemoveFileassociation")] - public RequestEntity RemoveFileassociation(List master) + public RequestEntity RemoveFileassociation(MinioFileassociation master) { RequestEntity request = new RequestEntity(); - try + ///创建数据库连接上下文对象 + using (IDbContext db = ObjectContainer.GetObject("db")) { - using (IDbContext db = ObjectContainer.GetObject("db")) + try { - db.BeginTransaction(); - + db.BeginTransaction();//启动事务 db.Delete(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; } diff --git a/IBKLinker-Minio/Entity/MinioController/MinioFileassociation.cs b/IBKLinker-Minio/Entity/MinioController/MinioFileassociation.cs index 90cfa57..c28e7fe 100644 --- a/IBKLinker-Minio/Entity/MinioController/MinioFileassociation.cs +++ b/IBKLinker-Minio/Entity/MinioController/MinioFileassociation.cs @@ -34,6 +34,34 @@ namespace IBKLinker_Minio.Entity.MinioController [Persistent("FILE_NAME"), DisplayName("文件名称")] public string FileName { get; set; } + /// + ///文件类型 + /// + [Persistent("FILE_TYPE"), DisplayName("文件类型")] + public string FileType { get; set; } + + + /// + ///文件下载次数 + /// + [Persistent("DOWNLOAD_NUM"), DisplayName("文件下载次数")] + public string DownloadNum { get; set; } + + + + /// + ///文件层级 + /// + [Persistent("FILE_LEVEL"), DisplayName("文件层级")] + public string FileLevel { get; set; } + + + /// + ///文件路径 + /// + [Persistent("FILE_PATH"), DisplayName("文件路径")] + public string FilePath { get; set; } + /// ///关联文件PK @@ -46,7 +74,35 @@ namespace IBKLinker_Minio.Entity.MinioController ///关联文件名称 /// [Persistent("ASSOCIATION_FILE_NAME"), DisplayName("关联文件名称")] - public string AssorciationFileName { get; set; } + public string AssociationFileName { get; set; } + + + /// + ///关联文件类型 + /// + [Persistent("ASSOCIATION_FILE_TYPE"), DisplayName("文件类型")] + public string AssociationFileType { get; set; } + + + /// + ///关联文件下载次数 + /// + [Persistent("ASSOCIATION_DOWNLOAD_NUM"), DisplayName("文件下载次数")] + public string AssociationDownloadNum { get; set; } + + + + /// + ///关联文件层级 + /// + [Persistent("ASSOCIATION_FILE_LEVEL"), DisplayName("文件层级")] + public string AssociationFileLevel { get; set; } + + /// + ///关联文件路径 + /// + [Persistent("ASSOCIATION_FILE_PATH"), DisplayName("关联文件路径")] + public string AssorciationFilePath { get; set; } ///