恢复

代码/System.Common/IRepositories/IRepository.cs

@@ -106,10 +106,10 @@ namespace System.Common
         Task<bool> UpdateListToColumns(List<T> obj, Expression<Func<T, object>> objColumns);
 
 
-        Data.DataTable GetTableSugar(string sql, SugarParameter[] sugarParameter = null);
+        Task<Data.DataTable> GetTableSugar(string sql, SugarParameter[] sugarParameter = null);
 
 
-        int ExecuteCommandSugar(string sql, SugarParameter[] sugarParameter = null);
+        Task<int> ExecuteCommandSugar(string sql, SugarParameter[] sugarParameter = null);
      
 
     }

代码/System.Common/Repositories/BaseRepository.cs

@@ -19,9 +19,10 @@ namespace System.Common
         public async Task<int> GetCount(Expression<Func<T, bool>> whereExpression = null)
         {
             if (whereExpression != null)
-                return await CurrentDB.AsSugarClient().Queryable<T>().With(SqlWith.NoLock).CountAsync(whereExpression);
+                return await Db.Queryable<T>().With(SqlWith.NoLock).CountAsync(whereExpression);
             else
-                return await CurrentDB.AsSugarClient().Queryable<T>().With(SqlWith.NoLock).CountAsync();
+                return await Db.Queryable<T>().With(SqlWith.NoLock).CountAsync();
+
         }
 
         /// <summary>
@@ -30,22 +31,23 @@ namespace System.Common
         /// <returns></returns>
         public async Task<List<T>> GetList()
         {
-            return await CurrentDB.AsSugarClient().Queryable<T>().With(SqlWith.NoLock).ToListAsync();
+
+            return await Db.Queryable<T>().With(SqlWith.NoLock).ToListAsync();
             //return CurrentCurrentDB.GetList();
         }
         public async Task<List<T>> GetListALL(Expression<Func<T, bool>> whereExpression)
         {
-            return await CurrentDB.AsSugarClient().Queryable<T>().With(SqlWith.NoLock).Where(whereExpression).ToListAsync();
+            return await Db.Queryable<T>().With(SqlWith.NoLock).Where(whereExpression).ToListAsync();
         }
 
         public async Task<List<T>> GetListALL(List<IConditionalModel> conModels, string orderby)
         {
-            return await CurrentDB.AsSugarClient().Queryable<T>().With(SqlWith.NoLock).Where(conModels).OrderBy(orderby).ToListAsync();
+            return await Db.Queryable<T>().With(SqlWith.NoLock).Where(conModels).OrderBy(orderby).ToListAsync();
         }
 
         public async Task<List<T>> GetListALL(Expression<Func<T, bool>> whereExpression, Expression<Func<T, object>> orderExpression, OrderByType ordertype = OrderByType.Asc)
         {
-            return await CurrentDB.AsSugarClient().Queryable<T>().With(SqlWith.NoLock).Where(whereExpression).OrderBy(orderExpression, ordertype).ToListAsync();
+            return await Db.Queryable<T>().With(SqlWith.NoLock).Where(whereExpression).OrderBy(orderExpression, ordertype).ToListAsync();
         }
 
         /// <summary>
@@ -56,7 +58,7 @@ namespace System.Common
         /// <returns></returns>
         public async Task<PageData<T>> GetListByPage(List<IConditionalModel> conModels, MyPageModel pagemodel, string orderby)
         {
-            var list = await CurrentDB.AsSugarClient().Queryable<T>().With(SqlWith.NoLock).Where(conModels).OrderBy(orderby).ToPageListAsync(pagemodel.PageIndex, pagemodel.PageSize, pagemodel.PageCount);
+            var list = await Db.Queryable<T>().With(SqlWith.NoLock).Where(conModels).OrderBy(orderby).ToPageListAsync(pagemodel.PageIndex, pagemodel.PageSize, pagemodel.PageCount);
             PageData<T> pd = new PageData<T>();
             pd.Rows = list;
             pd.Totals = pagemodel.PageCount;
@@ -65,7 +67,7 @@ namespace System.Common
 
         public async Task<PageData<T>> GetListByPage(List<IConditionalModel> conModels, MyPageModel pagemodel)
         {
-            var list = await CurrentDB.AsSugarClient().Queryable<T>().With(SqlWith.NoLock).Where(conModels).ToPageListAsync(pagemodel.PageIndex, pagemodel.PageSize, pagemodel.PageCount);
+            var list = await Db.Queryable<T>().With(SqlWith.NoLock).Where(conModels).ToPageListAsync(pagemodel.PageIndex, pagemodel.PageSize, pagemodel.PageCount);
             PageData<T> pd = new PageData<T>();
             pd.Rows = list;
             pd.Totals = pagemodel.PageCount;
@@ -74,7 +76,7 @@ namespace System.Common
 
         public async Task<PageData<T>> GetListByPage(Expression<Func<T, bool>> whereExpression, MyPageModel pagemodel)
         {
-            var list = await CurrentDB.AsSugarClient().Queryable<T>().With(SqlWith.NoLock).Where(whereExpression).ToPageListAsync(pagemodel.PageIndex, pagemodel.PageSize, pagemodel.PageCount);
+            var list = await Db.Queryable<T>().With(SqlWith.NoLock).Where(whereExpression).ToPageListAsync(pagemodel.PageIndex, pagemodel.PageSize, pagemodel.PageCount);
             PageData<T> pd = new PageData<T>();
             pd.Rows = list;
             pd.Totals = pagemodel.PageCount;
@@ -83,17 +85,20 @@ namespace System.Common
 
         public async Task<PageData<T>> GetListByPage(Expression<Func<T, bool>> whereExpression, MyPageModel pagemodel, string orderby)
         {
-            var list = await CurrentDB.AsSugarClient().Queryable<T>().With(SqlWith.NoLock).Where(whereExpression).OrderBy(orderby).ToPageListAsync(pagemodel.PageIndex, pagemodel.PageSize, pagemodel.PageCount);
+            var list = await Db.Queryable<T>().With(SqlWith.NoLock).Where(whereExpression).OrderBy(orderby).ToPageListAsync(pagemodel.PageIndex, pagemodel.PageSize, pagemodel.PageCount);
             PageData<T> pd = new PageData<T>();
             pd.Rows = list;
             pd.Totals = pagemodel.PageCount;
             return pd;// CurrentCurrentDB.GetPageList(conModels, pagemodel);
+
         }
 
         public async Task<T> GetSingle(Expression<Func<T, bool>> whereExpression)
         {
-            return await CurrentDB.AsSugarClient().Queryable<T>().With(SqlWith.NoLock).Where(whereExpression).SingleAsync();
+
+            return await Db.Queryable<T>().With(SqlWith.NoLock).Where(whereExpression).SingleAsync();
             //return CurrentCurrentDB.GetSingle(whereExpression);
+
         }
 
         /// <summary>
@@ -103,7 +108,7 @@ namespace System.Common
         /// <returns></returns>
         public async Task<int> Add(T obj)
         {
-            return await CurrentDB.AsSugarClient().Insertable<T>(obj).ExecuteReturnIdentityAsync();
+            return await Db.Insertable<T>(obj).ExecuteReturnIdentityAsync();
             //return CurrentCurrentDB.InsertReturnIdentity(obj);
         }
 
@@ -114,7 +119,7 @@ namespace System.Common
         /// <returns></returns>
         public async Task<bool> AddReturnCount(T obj)
         {
-            int res = await CurrentDB.AsSugarClient().Insertable<T>(obj).ExecuteCommandAsync();
+            int res = await Db.Insertable<T>(obj).ExecuteCommandAsync();
             return res > 0;
         }
 
@@ -126,7 +131,7 @@ namespace System.Common
         /// <returns></returns>
         public async Task<int> AddIgnore(T obj, Expression<Func<T, object>> IgnoreColumns)
         {
-            return await CurrentDB.AsSugarClient().Insertable<T>(obj).IgnoreColumns(IgnoreColumns).ExecuteReturnIdentityAsync();
+            return await Db.Insertable<T>(obj).IgnoreColumns(IgnoreColumns).ExecuteReturnIdentityAsync();
             //return CurrentCurrentDB.InsertReturnIdentity(obj);
         }
 
@@ -138,7 +143,7 @@ namespace System.Common
         /// <returns></returns>
         public async Task<int> AddStrong(T obj, bool isStrong = false)
         {
-            return await CurrentDB.AsSugarClient().Insertable<T>(obj).IgnoreColumns(true, isStrong).ExecuteReturnIdentityAsync();
+            return await Db.Insertable<T>(obj).IgnoreColumns(true, isStrong).ExecuteReturnIdentityAsync();
             //return CurrentCurrentDB.InsertReturnIdentity(obj);
         }
         /// <summary>
@@ -148,7 +153,7 @@ namespace System.Common
         /// <returns></returns>
         public async Task<bool> AddMany(List<T> objlist)
         {
-            var res = await CurrentDB.AsSugarClient().Insertable<T>(objlist).ExecuteCommandAsync();
+            var res = await Db.Insertable<T>(objlist).ExecuteCommandAsync();
             return res > 0;
         }
 
@@ -158,7 +163,7 @@ namespace System.Common
         /// <returns></returns>
         public async Task<bool> Delete(Expression<Func<T, bool>> whereExpression)
         {
-            return await CurrentDB.AsSugarClient().Deleteable<T>(whereExpression).ExecuteCommandHasChangeAsync();
+            return await Db.Deleteable<T>(whereExpression).ExecuteCommandHasChangeAsync();
             //return CurrentCurrentDB.Delete(whereExpression);
         }
 
@@ -169,7 +174,7 @@ namespace System.Common
         /// <returns></returns>
         public async Task<bool> Update(T obj)
         {
-            return await CurrentDB.AsSugarClient().Updateable<T>(obj).ExecuteCommandHasChangeAsync();
+            return await Db.Updateable<T>(obj).ExecuteCommandHasChangeAsync();
             //return CurrentCurrentDB.Update(obj);
         }
         /// <summary>
@@ -179,7 +184,7 @@ namespace System.Common
         /// <returns></returns>
         public async Task<bool> Update(Expression<Func<T, T>> UpdateColumnsExpression, Expression<Func<T, bool>> whereExpression)
         {
-            return await CurrentDB.AsSugarClient().Updateable<T>().SetColumns(UpdateColumnsExpression).Where(whereExpression).ExecuteCommandHasChangeAsync();
+            return await Db.Updateable<T>().SetColumns(UpdateColumnsExpression).Where(whereExpression).ExecuteCommandHasChangeAsync();
             //return CurrentCurrentDB.Update(obj);
         }
         /// <summary>
@@ -189,24 +194,24 @@ namespace System.Common
         /// <returns></returns>
         public async Task<bool> UpdateList(List<T> obj)
         {
-            return await CurrentDB.AsSugarClient().Updateable<T>(obj).ExecuteCommandHasChangeAsync();
+            return await Db.Updateable<T>(obj).ExecuteCommandHasChangeAsync();
             //return CurrentCurrentDB.Update(obj);
         }
 
-        public Data.DataTable GetTableSugar(string sql, SugarParameter[] sugarParameter = null)
+        public async Task<Data.DataTable> GetTableSugar(string sql, SugarParameter[] sugarParameter = null)
         {
             if (sugarParameter == null)
-            { return CurrentDB.AsSugarClient().Ado.GetDataTable(sql); }
+            { return await Db.Ado.GetDataTableAsync(sql); }
             else
-            { return CurrentDB.AsSugarClient().Ado.GetDataTable(sql, sugarParameter); }
+            { return await Db.Ado.GetDataTableAsync(sql, sugarParameter); }
         }
 
-        public int ExecuteCommandSugar(string sql,SugarParameter[] sugarParameter=null)
+        public async Task<int> ExecuteCommandSugar(string sql, SugarParameter[] sugarParameter = null)
         {
             if (sugarParameter == null)
-            { return CurrentDB.AsSugarClient().Ado.ExecuteCommand(sql); }
+            { return await Db.Ado.ExecuteCommandAsync(sql); }
             else
-            { return CurrentDB.AsSugarClient().Ado.ExecuteCommand(sql, sugarParameter); }
+            { return await Db.Ado.ExecuteCommandAsync(sql, sugarParameter); }
         }
 
         /// <summary>
@@ -217,8 +222,8 @@ namespace System.Common
         [Obsolete]
         public async Task<bool> UpdateListToColumns(List<T> obj, Expression<Func<T, object>> objColumns)
         {
-            return await CurrentDB.AsSugarClient().Updateable<T>(obj).UpdateColumns(objColumns).ExecuteCommandHasChangeAsync();
-            //return CurrentCurrentDB.Update(obj);
+            return await Db.Updateable<T>(obj).UpdateColumns(objColumns).ExecuteCommandHasChangeAsync();
+            //return CurrentCurrentDB.Update(obj);            
         }
     }
 }