orga0063
/
BootstrapAdmin11
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改BUG：完善SQLite组件下Menu授权方法，移除对存储过程和SqlBulkCopy的依赖

This commit is contained in:
Argo-MacBookPro 2018-10-23 14:28:25 +08:00
parent 615ef01123
commit 152c3c8403
2 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
Bootstrap.DataAccess.SQLite/Menu.cs
View File

@ -3,7 +3,6 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data; using System.Data;
using System.Data.Common; using System.Data.Common;
using System.Data.SqlClient;
using System.Linq; using System.Linq;
namespace Bootstrap.DataAccess.SQLite namespace Bootstrap.DataAccess.SQLite
@ -21,28 +20,40 @@ namespace Bootstrap.DataAccess.SQLite
{ {
bool ret = false; bool ret = false;
var ids = string.Join(",", value); var ids = string.Join(",", value);
using (DbCommand cmd = DbAccessManager.DBAccess.CreateCommand(CommandType.StoredProcedure, "Proc_DeleteMenus")) using (TransactionPackage transaction = DbAccessManager.DBAccess.BeginTransaction())
{ {
cmd.Parameters.Add(DbAccessManager.DBAccess.CreateParameter("@ids", ids)); using (DbCommand cmd = DbAccessManager.DBAccess.CreateCommand(CommandType.Text, $"delete from NavigationRole where NavigationID in ({ids})"))
ret = DbAccessManager.DBAccess.ExecuteNonQuery(cmd) == -1; {
} try
{
DbAccessManager.DBAccess.ExecuteNonQuery(cmd, transaction);
cmd.CommandText = $"delete from Navigations where ID in ({ids})";
DbAccessManager.DBAccess.ExecuteNonQuery(cmd, transaction);
transaction.CommitTransaction();
CacheCleanUtility.ClearCache(menuIds: value); CacheCleanUtility.ClearCache(menuIds: value);
ret = true;
}
catch (Exception ex)
{
transaction.RollbackTransaction();
throw ex;
}
}
}
return ret; return ret;
} }
/// <summary> /// <summary>
/// <summary> /// <summary>
/// 通过角色ID保存当前授权菜单 /// 通过角色ID保存当前授权菜单
/// </summary> /// </summary>
/// <param name="id"></param> /// <param name="roleId"></param>
/// <param name="menuIds"></param> /// <param name="menuIds"></param>
/// <returns></returns> /// <returns></returns>
public override bool SaveMenusByRoleId(int id, IEnumerable<int> menuIds) public override bool SaveMenusByRoleId(int roleId, IEnumerable<int> menuIds)
{ {
bool ret = false; bool ret = false;
DataTable dt = new DataTable();
dt.Columns.Add("RoleID", typeof(int));
dt.Columns.Add("NavigationID", typeof(int));
menuIds.ToList().ForEach(menuId => dt.Rows.Add(id, menuId));
using (TransactionPackage transaction = DbAccessManager.DBAccess.BeginTransaction()) using (TransactionPackage transaction = DbAccessManager.DBAccess.BeginTransaction())
{ {
try try
@ -51,19 +62,16 @@ namespace Bootstrap.DataAccess.SQLite
string sql = "delete from NavigationRole where RoleID=@RoleID"; string sql = "delete from NavigationRole where RoleID=@RoleID";
using (DbCommand cmd = DbAccessManager.DBAccess.CreateCommand(CommandType.Text, sql)) using (DbCommand cmd = DbAccessManager.DBAccess.CreateCommand(CommandType.Text, sql))
{ {
cmd.Parameters.Add(DbAccessManager.DBAccess.CreateParameter("@RoleID", id));
DbAccessManager.DBAccess.ExecuteNonQuery(cmd, transaction); DbAccessManager.DBAccess.ExecuteNonQuery(cmd, transaction);
//批插入菜单角色表 //批插入菜单角色表
using (SqlBulkCopy bulk = new SqlBulkCopy((SqlConnection)transaction.Transaction.Connection, SqlBulkCopyOptions.Default, (SqlTransaction)transaction.Transaction)) menuIds.ToList().ForEach(mId =>
{ {
bulk.DestinationTableName = "NavigationRole"; cmd.CommandText = $"Insert Into NavigationRole (NavigationID, RoleID) Values ( {mId}, {roleId})";
bulk.ColumnMappings.Add("RoleID", "RoleID"); DbAccessManager.DBAccess.ExecuteNonQuery(cmd, transaction);
bulk.ColumnMappings.Add("NavigationID", "NavigationID"); });
bulk.WriteToServer(dt);
transaction.CommitTransaction(); transaction.CommitTransaction();
} }
} CacheCleanUtility.ClearCache(menuIds: menuIds, roleIds: new List<int>() { roleId });
CacheCleanUtility.ClearCache(menuIds: menuIds, roleIds: new List<int>() { id });
ret = true; ret = true;
} }
catch (Exception ex) catch (Exception ex)

11
Bootstrap.DataAccess/Menu.cs
View File

@ -104,25 +104,24 @@ namespace Bootstrap.DataAccess
/// <summary> /// <summary>
/// 通过角色ID保存当前授权菜单 /// 通过角色ID保存当前授权菜单
/// </summary> /// </summary>
/// <param name="id"></param> /// <param name="roleId"></param>
/// <param name="menuIds"></param> /// <param name="menuIds"></param>
/// <returns></returns> /// <returns></returns>
public virtual bool SaveMenusByRoleId(int id, IEnumerable<int> menuIds) public virtual bool SaveMenusByRoleId(int roleId, IEnumerable<int> menuIds)
{ {
bool ret = false; bool ret = false;
DataTable dt = new DataTable(); DataTable dt = new DataTable();
dt.Columns.Add("RoleID", typeof(int)); dt.Columns.Add("RoleID", typeof(int));
dt.Columns.Add("NavigationID", typeof(int)); dt.Columns.Add("NavigationID", typeof(int));
menuIds.ToList().ForEach(menuId => dt.Rows.Add(id, menuId)); menuIds.ToList().ForEach(menuId => dt.Rows.Add(roleId, menuId));
using (TransactionPackage transaction = DbAccessManager.DBAccess.BeginTransaction()) using (TransactionPackage transaction = DbAccessManager.DBAccess.BeginTransaction())
{ {
try try
{ {
//删除菜单角色表该角色所有的菜单 //删除菜单角色表该角色所有的菜单
string sql = "delete from NavigationRole where RoleID=@RoleID"; string sql = $"delete from NavigationRole where RoleID = {roleId}";
using (DbCommand cmd = DbAccessManager.DBAccess.CreateCommand(CommandType.Text, sql)) using (DbCommand cmd = DbAccessManager.DBAccess.CreateCommand(CommandType.Text, sql))
{ {
cmd.Parameters.Add(DbAccessManager.DBAccess.CreateParameter("@RoleID", id));
DbAccessManager.DBAccess.ExecuteNonQuery(cmd, transaction); DbAccessManager.DBAccess.ExecuteNonQuery(cmd, transaction);
//批插入菜单角色表 //批插入菜单角色表
using (SqlBulkCopy bulk = new SqlBulkCopy((SqlConnection)transaction.Transaction.Connection, SqlBulkCopyOptions.Default, (SqlTransaction)transaction.Transaction)) using (SqlBulkCopy bulk = new SqlBulkCopy((SqlConnection)transaction.Transaction.Connection, SqlBulkCopyOptions.Default, (SqlTransaction)transaction.Transaction))
@ -134,7 +133,7 @@ namespace Bootstrap.DataAccess
transaction.CommitTransaction(); transaction.CommitTransaction();
} }
} }
CacheCleanUtility.ClearCache(menuIds: menuIds, roleIds: new List<int>() { id }); CacheCleanUtility.ClearCache(menuIds: menuIds, roleIds: new List<int>() { roleId });
ret = true; ret = true;
} }
catch (Exception ex) catch (Exception ex)