From 305868b713cf9d4b8daacb3ec4bd6249df568b3e Mon Sep 17 00:00:00 2001
From: cheng19920620 <511180749@qq.com>
Date: Wed, 15 Nov 2023 16:30:33 +0800
Subject: [PATCH] =?UTF-8?q?--=E4=BF=AE=E6=94=B9=E8=A7=92=E8=89=B2=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E6=B7=BB=E5=8A=A0=E4=BF=AE=E6=94=B9=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MinioController/MinioApiController.cs     | 50 +++++++++++--------
 .../Entity/MinioController/UserModel.cs       |  8 ++-
 2 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/IBKLinker-Minio/Controller/MinioController/MinioApiController.cs b/IBKLinker-Minio/Controller/MinioController/MinioApiController.cs
index 0b6c942..854e5ed 100644
--- a/IBKLinker-Minio/Controller/MinioController/MinioApiController.cs
+++ b/IBKLinker-Minio/Controller/MinioController/MinioApiController.cs
@@ -481,30 +481,35 @@ namespace IBKLinker_Minio.Controller.MinioController
         /// </summary>
         /// <param name="minioRolePermission">minio角色权限表</param>
         [HttpPost, Route("AddRolePermission")]
-        public RequestEntity AddRolePermission(MinioRolePermission minioRolePermission, List<MinioAuthority> ds)
+        public RequestEntity AddRolePermission(RolePermissionModel minioRolePermission)
         {
             RequestEntity request = new RequestEntity();
             try
             {
-                minioRolePermission.Id = Guid.NewGuid().ToString();
-                minioRolePermission.LimitsAuthorityId = Guid.NewGuid().ToString();
-                foreach (var item in ds)
+                List<MinioAuthority> AuthorityList = new List<MinioAuthority>();
+                minioRolePermission.minioRolePermission.Id = Guid.NewGuid().ToString();
+                minioRolePermission.minioRolePermission.LimitsAuthorityId = Guid.NewGuid().ToString();
+                foreach (var item in minioRolePermission.ds.Split(','))
                 {
-                    item.LimitsAuthorityId = minioRolePermission.LimitsAuthorityId;
-                    item.CreatorTime = DateTime.Now;
+                    MinioAuthority ds = new MinioAuthority();
+                    ds.LimitsAuthorityId = minioRolePermission.minioRolePermission.LimitsAuthorityId;
+                    ds.CreatorTime = DateTime.Now;
+                    ds.CreatorUser = minioRolePermission.minioRolePermission.CreatorUser;
+                    ds.FileId = int.Parse(item);
+                    AuthorityList.Add(ds);
                 }
                 ///创建数据库连接上下文对象
                 using (IDbContext db = ObjectContainer.GetObject<IDbContext>("db"))
                 {
                     db.BeginTransaction();
                     ///拿到表自增长的值赋值给自增长主键pk
-                    minioRolePermission.Pk = getPk("S_MINIO_ROLE_PERMISSION", "MINIO_ROLE_PERMISSION");
+                    minioRolePermission.minioRolePermission.Pk = getPk("S_MINIO_ROLE_PERMISSION", "MINIO_ROLE_PERMISSION");
                     ///给创建时间赋值
-                    minioRolePermission.CreatorTime = DateTime.Now;
+                    minioRolePermission.minioRolePermission.CreatorTime = DateTime.Now;
 
                     ///把需要添加的数据同步到数据库
-                    db.Insert<MinioRolePermission>(minioRolePermission);
-                    db.Insert<MinioAuthority>(ds);
+                    db.Insert<MinioRolePermission>(minioRolePermission.minioRolePermission);
+                    db.Insert<MinioAuthority>(AuthorityList);
                     db.Commit();
                     request.code = "0";
                 }
@@ -521,21 +526,26 @@ namespace IBKLinker_Minio.Controller.MinioController
         /// </summary>
         /// <param name="data">修改数据</param>
         [HttpPost, Route("UpdateRolePermission")]
-        public RequestEntity UpdateRolePermission(MinioRolePermission data,List<MinioAuthority> ds)
+        public RequestEntity UpdateRolePermission(RolePermissionModel minioRolePermission)
         {
             RequestEntity request = new RequestEntity();
             try
             {
+                List<MinioAuthority> AuthorityList = new List<MinioAuthority>();
                 //data.Id=Guid.NewGuid().ToString();
-                if (string.IsNullOrEmpty(data.LimitsAuthorityId))
+                if (string.IsNullOrEmpty(minioRolePermission.minioRolePermission.LimitsAuthorityId))
                 {
-                    data.LimitsAuthorityId = Guid.NewGuid().ToString();
+                    minioRolePermission.minioRolePermission.LimitsAuthorityId = Guid.NewGuid().ToString();
                 }
-                
-                foreach (var item in ds)
+
+                foreach (var item in minioRolePermission.ds.Split(','))
                 {
-                    item.LimitsAuthorityId = data.LimitsAuthorityId;
-                    item.CreatorTime = DateTime.Now;
+                    MinioAuthority ds = new MinioAuthority();
+                    ds.LimitsAuthorityId = minioRolePermission.minioRolePermission.LimitsAuthorityId;
+                    ds.CreatorTime = DateTime.Now;
+                    ds.CreatorUser = minioRolePermission.minioRolePermission.CreatorUser;
+                    ds.FileId = int.Parse(item);
+                    AuthorityList.Add(ds);
                 }
                 ///创建数据库连接上下文对象
                 using (IDbContext db = ObjectContainer.GetObject<IDbContext>("db"))
@@ -546,10 +556,10 @@ namespace IBKLinker_Minio.Controller.MinioController
                         db.BeginTransaction();
                         ///给修改时间赋值
                         //DateTime time = DateTime.Now;
-                        db.Update<MinioRolePermission>(data);
+                        db.Update<MinioRolePermission>(minioRolePermission.minioRolePermission);
                         //删除历史记录加入新的记录
-                        db.Query("delete from MINIO_AUTHORITY where LIMITS_AUTHORITY_ID='"+ data.LimitsAuthorityId + "' ");
-                        db.Insert<MinioAuthority>(ds);
+                        db.Query("delete from MINIO_AUTHORITY where LIMITS_AUTHORITY_ID='"+ minioRolePermission.minioRolePermission.LimitsAuthorityId + "' ");
+                        db.Insert<MinioAuthority>(AuthorityList);
                         db.Commit();
                         request.code = "0";
                     }
diff --git a/IBKLinker-Minio/Entity/MinioController/UserModel.cs b/IBKLinker-Minio/Entity/MinioController/UserModel.cs
index 6c89da5..b036baa 100644
--- a/IBKLinker-Minio/Entity/MinioController/UserModel.cs
+++ b/IBKLinker-Minio/Entity/MinioController/UserModel.cs
@@ -1,4 +1,5 @@
-using SOA.Persistent;
+using Org.BouncyCastle.Bcpg.Sig;
+using SOA.Persistent;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -22,4 +23,9 @@ namespace IBKLinker_Minio.Entity.MinioController
         /// </summary>
         public string RoleName { get; set; }
     }
+    public class RolePermissionModel  
+    {
+        public MinioRolePermission minioRolePermission { get; set; }
+        public string  ds { get; set; }
+    }
 }