liulb
/
AUCMA_SCADA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改查询报错问题

Browse Source
dev
liulb@mesnac.com 1 year ago
parent 3bf3c908cf
commit 0f24c0ae6a
1 changed files with 109 additions and 101 deletions
Show Stats Download Patch File Download Diff File

210
Admin.Core.Repository/BASE/BaseRepository.cs
Unescape Escape View File

@ -36,6 +36,14 @@ namespace Admin.Core.Repository
}
}
//输入最终SQL语句...
//_db.Aop.OnLogExecuting = (sql, pars) =>
//{
// //var s1 = sql;//断点打在这里看内部生成的sql语句...
// Console.Write(sql);
//};
return _dbBase;
}
}
@ -83,7 +91,7 @@ namespace Admin.Core.Repository
public async Task<TEntity> QueryByIdAsync(object objId)
{
if (GetConnectionState() == false) return null;
return await _db.Queryable<TEntity>().In(objId).SingleAsync();
return await _db.CopyNew().Queryable<TEntity>().In(objId).SingleAsync();
}
/// <summary>
/// 功能描述:根据ID查询一条数据
@ -95,7 +103,7 @@ namespace Admin.Core.Repository
public async Task<TEntity> QueryByIdAsync(object objId, bool blnUseCache = false)
{
if (GetConnectionState() == false) return null;
return await _db.Queryable<TEntity>().WithCacheIF(blnUseCache).In(objId).SingleAsync();
return await _db.CopyNew().Queryable<TEntity>().WithCacheIF(blnUseCache).In(objId).SingleAsync();
}
/// <summary>
@ -107,7 +115,7 @@ namespace Admin.Core.Repository
public async Task<List<TEntity>> QueryByIDsAsync(object[] lstIds)
{
if (GetConnectionState() == false) return null;
return await _db.Queryable<TEntity>().In(lstIds).ToListAsync();
return await _db.CopyNew().Queryable<TEntity>().In(lstIds).ToListAsync();
}
/// <summary>
@ -117,11 +125,11 @@ namespace Admin.Core.Repository
/// <returns></returns>
public async Task<int> AddAsync(TEntity entity)
{
//var i = await Task.Run(() => _db.Insertable(entity).ExecuteReturnBigIdentity());
//var i = await Task.Run(() => _db.CopyNew().Insertable(entity).ExecuteReturnBigIdentity());
////返回的i是long类型,这里你可以根据你的业务需要进行处理
//return (int)i;
var insert = _db.Insertable(entity);
var insert = _db.CopyNew().Insertable(entity);
//这里你可以返回TEntity，这样的话就可以获取id值，无论主键是什么类型
//var return3 = await insert.ExecuteReturnEntityAsync();
@ -138,7 +146,7 @@ namespace Admin.Core.Repository
/// <returns>返回自增量列</returns>
public async Task<int> AddAsync(TEntity entity, Expression<Func<TEntity, object>> insertColumns = null)
{
var insert = _db.Insertable(entity);
var insert = _db.CopyNew().Insertable(entity);
if (insertColumns == null)
{
return await insert.ExecuteReturnIdentityAsync();
@ -156,7 +164,7 @@ namespace Admin.Core.Repository
/// <returns>影响行数</returns>
public async Task<int> AddAsync(List<TEntity> listEntity)
{
return await _db.Insertable(listEntity.ToArray()).ExecuteCommandAsync();
return await _db.CopyNew().Insertable(listEntity.ToArray()).ExecuteCommandAsync();
}
/// <summary>
@ -167,27 +175,27 @@ namespace Admin.Core.Repository
public async Task<bool> UpdateAsync(TEntity entity)
{
////这种方式会以主键为条件
//var i = await Task.Run(() => _db.Updateable(entity).ExecuteCommand());
//var i = await Task.Run(() => _db.CopyNew().Updateable(entity).ExecuteCommand());
//return i > 0;
//这种方式会以主键为条件
return await _db.Updateable(entity).ExecuteCommandHasChangeAsync();
return await _db.CopyNew().Updateable(entity).ExecuteCommandHasChangeAsync();
}
public async Task<bool> UpdateAsync(TEntity entity, string strWhere)
{
//return await Task.Run(() => _db.Updateable(entity).Where(strWhere).ExecuteCommand() > 0);
return await _db.Updateable(entity).Where(strWhere).ExecuteCommandHasChangeAsync();
//return await Task.Run(() => _db.CopyNew().Updateable(entity).Where(strWhere).ExecuteCommand() > 0);
return await _db.CopyNew().Updateable(entity).Where(strWhere).ExecuteCommandHasChangeAsync();
}
public async Task<bool> UpdateAsync(string strSql, SugarParameter[] parameters = null)
{
//return await Task.Run(() => _db.Ado.ExecuteCommand(strSql, parameters) > 0);
return await _db.Ado.ExecuteCommandAsync(strSql, parameters) > 0;
//return await Task.Run(() => _db.CopyNew().Ado.ExecuteCommand(strSql, parameters) > 0);
return await _db.CopyNew().Ado.ExecuteCommandAsync(strSql, parameters) > 0;
}
public async Task<bool> UpdateAsync(object operateAnonymousObjects)
{
return await _db.Updateable<TEntity>(operateAnonymousObjects).ExecuteCommandAsync() > 0;
return await _db.CopyNew().Updateable<TEntity>(operateAnonymousObjects).ExecuteCommandAsync() > 0;
}
public async Task<bool> UpdateAsync(
@ -197,7 +205,7 @@ namespace Admin.Core.Repository
string strWhere = ""
)
{
//IUpdateable<TEntity> up = await Task.Run(() => _db.Updateable(entity));
//IUpdateable<TEntity> up = await Task.Run(() => _db.CopyNew().Updateable(entity));
//if (lstIgnoreColumns != null && lstIgnoreColumns.Count > 0)
//{
// up = await Task.Run(() => up.IgnoreColumns(it => lstIgnoreColumns.Contains(it)));
@ -212,7 +220,7 @@ namespace Admin.Core.Repository
//}
//return await Task.Run(() => up.ExecuteCommand()) > 0;
IUpdateable<TEntity> up = _db.Updateable(entity);
IUpdateable<TEntity> up = _db.CopyNew().Updateable(entity);
if (lstIgnoreColumns != null && lstIgnoreColumns.Count > 0)
{
up = up.IgnoreColumns(lstIgnoreColumns.ToArray());
@ -234,7 +242,7 @@ namespace Admin.Core.Repository
public async Task<TEntity> FirstAsync()
{
if (GetConnectionState() == false) return null;
return await _db.Queryable<TEntity>().FirstAsync();
return await _db.CopyNew().Queryable<TEntity>().FirstAsync();
}
/// <summary>
/// 查询第一条数据
@ -244,7 +252,7 @@ namespace Admin.Core.Repository
public async Task<TEntity> FirstAsync(Expression<Func<TEntity, bool>> whereExpression)
{
if (GetConnectionState() == false) return null;
return await _db.Queryable<TEntity>().WhereIF(whereExpression != null, whereExpression).FirstAsync();
return await _db.CopyNew().Queryable<TEntity>().WhereIF(whereExpression != null, whereExpression).FirstAsync();
}
/// <summary>
/// 根据实体删除一条数据
@ -253,9 +261,9 @@ namespace Admin.Core.Repository
/// <returns></returns>
public async Task<bool> DeleteAsync(TEntity entity)
{
//var i = await Task.Run(() => _db.Deleteable(entity).ExecuteCommand());
//var i = await Task.Run(() => _db.CopyNew().Deleteable(entity).ExecuteCommand());
//return i > 0;
return await _db.Deleteable(entity).ExecuteCommandHasChangeAsync();
return await _db.CopyNew().Deleteable(entity).ExecuteCommandHasChangeAsync();
}
/// <summary>
@ -265,9 +273,9 @@ namespace Admin.Core.Repository
/// <returns></returns>
public async Task<bool> DeleteByIdAsync(object id)
{
//var i = await Task.Run(() => _db.Deleteable<TEntity>(id).ExecuteCommand());
//var i = await Task.Run(() => _db.CopyNew().Deleteable<TEntity>(id).ExecuteCommand());
//return i > 0;
return await _db.Deleteable<TEntity>(id).ExecuteCommandHasChangeAsync();
return await _db.CopyNew().Deleteable<TEntity>(id).ExecuteCommandHasChangeAsync();
}
/// <summary>
@ -277,9 +285,9 @@ namespace Admin.Core.Repository
/// <returns></returns>
public async Task<bool> DeletesAsync(List<TEntity> entitys)
{
//var i = await Task.Run(() => _db.Deleteable<TEntity>().In(ids).ExecuteCommand());
//var i = await Task.Run(() => _db.CopyNew().Deleteable<TEntity>().In(ids).ExecuteCommand());
//return i > 0;
return await _db.Deleteable<TEntity>(entitys).ExecuteCommandHasChangeAsync();
return await _db.CopyNew().Deleteable<TEntity>(entitys).ExecuteCommandHasChangeAsync();
}
/// <summary>
@ -292,7 +300,7 @@ namespace Admin.Core.Repository
try
{
if (GetConnectionState() == false) return null;
return await _db.Queryable<TEntity>().ToListAsync();
return await _db.CopyNew().Queryable<TEntity>().ToListAsync();
}catch(Exception ex)
{
Console.WriteLine($"QueryAsync执行异常:{ex.Message}");
@ -309,8 +317,8 @@ namespace Admin.Core.Repository
public async Task<List<TEntity>> QueryAsync(string strWhere)
{
if (GetConnectionState() == false) return null;
//return await Task.Run(() => _db.Queryable<TEntity>().WhereIF(!string.IsNullOrEmpty(strWhere), strWhere).ToList());
return await _db.Queryable<TEntity>().WhereIF(!string.IsNullOrEmpty(strWhere), strWhere).ToListAsync();
//return await Task.Run(() => _db.CopyNew().Queryable<TEntity>().WhereIF(!string.IsNullOrEmpty(strWhere), strWhere).ToList());
return await _db.CopyNew().Queryable<TEntity>().WhereIF(!string.IsNullOrEmpty(strWhere), strWhere).ToListAsync();
}
/// <summary>
@ -322,7 +330,7 @@ namespace Admin.Core.Repository
public async Task<List<TEntity>> QueryAsync(Expression<Func<TEntity, bool>> whereExpression)
{
if (GetConnectionState() == false) return null;
return await _db.Queryable<TEntity>().WhereIF(whereExpression != null, whereExpression).ToListAsync();
return await _db.CopyNew().Queryable<TEntity>().WhereIF(whereExpression != null, whereExpression).ToListAsync();
}
/// <summary>
@ -335,7 +343,7 @@ namespace Admin.Core.Repository
public async Task<List<TResult>> QueryAsync<TResult>(Expression<Func<TEntity, TResult>> expression)
{
if (GetConnectionState() == false) return null;
return await _db.Queryable<TEntity>().Select(expression).ToListAsync();
return await _db.CopyNew().Queryable<TEntity>().Select(expression).ToListAsync();
}
/// <summary>
@ -350,7 +358,7 @@ namespace Admin.Core.Repository
public async Task<List<TResult>> QueryAsync<TResult>(Expression<Func<TEntity, TResult>> expression, Expression<Func<TEntity, bool>> whereExpression, string strOrderByFileds)
{
if (GetConnectionState() == false) return null;
return await _db.Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(whereExpression != null, whereExpression).Select(expression).ToListAsync();
return await _db.CopyNew().Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(whereExpression != null, whereExpression).Select(expression).ToListAsync();
}
/// <summary>
@ -363,8 +371,8 @@ namespace Admin.Core.Repository
public async Task<List<TEntity>> QueryAsync(Expression<Func<TEntity, bool>> whereExpression, string strOrderByFileds)
{
if (GetConnectionState() == false) return null;
//return await Task.Run(() => _db.Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(whereExpression != null, whereExpression).ToList());
return await _db.Queryable<TEntity>().WhereIF(whereExpression != null, whereExpression).OrderByIF(strOrderByFileds != null, strOrderByFileds).ToListAsync();
//return await Task.Run(() => _db.CopyNew().Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(whereExpression != null, whereExpression).ToList());
return await _db.CopyNew().Queryable<TEntity>().WhereIF(whereExpression != null, whereExpression).OrderByIF(strOrderByFileds != null, strOrderByFileds).ToListAsync();
}
/// <summary>
/// 功能描述:查询一个列表
@ -376,8 +384,8 @@ namespace Admin.Core.Repository
public async Task<List<TEntity>> QueryAsync(Expression<Func<TEntity, bool>> whereExpression, Expression<Func<TEntity, object>> orderByExpression, bool isAsc = true)
{
if (GetConnectionState() == false) return null;
//return await Task.Run(() => _db.Queryable<TEntity>().OrderByIF(orderByExpression != null, orderByExpression, isAsc ? OrderByType.Asc : OrderByType.Desc).WhereIF(whereExpression != null, whereExpression).ToList());
return await _db.Queryable<TEntity>().OrderByIF(orderByExpression != null, orderByExpression, isAsc ? OrderByType.Asc : OrderByType.Desc).WhereIF(whereExpression != null, whereExpression).ToListAsync();
//return await Task.Run(() => _db.CopyNew().Queryable<TEntity>().OrderByIF(orderByExpression != null, orderByExpression, isAsc ? OrderByType.Asc : OrderByType.Desc).WhereIF(whereExpression != null, whereExpression).ToList());
return await _db.CopyNew().Queryable<TEntity>().OrderByIF(orderByExpression != null, orderByExpression, isAsc ? OrderByType.Asc : OrderByType.Desc).WhereIF(whereExpression != null, whereExpression).ToListAsync();
}
/// <summary>
@ -390,8 +398,8 @@ namespace Admin.Core.Repository
public async Task<List<TEntity>> QueryAsync(string strWhere, string strOrderByFileds)
{
if (GetConnectionState() == false) return null;
//return await Task.Run(() => _db.Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(!string.IsNullOrEmpty(strWhere), strWhere).ToList());
return await _db.Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(!string.IsNullOrEmpty(strWhere), strWhere).ToListAsync();
//return await Task.Run(() => _db.CopyNew().Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(!string.IsNullOrEmpty(strWhere), strWhere).ToList());
return await _db.CopyNew().Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(!string.IsNullOrEmpty(strWhere), strWhere).ToListAsync();
}
@ -409,8 +417,8 @@ namespace Admin.Core.Repository
string strOrderByFileds)
{
if (GetConnectionState() == false) return null;
//return await Task.Run(() => _db.Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(whereExpression != null, whereExpression).Take(intTop).ToList());
return await _db.Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(whereExpression != null, whereExpression).Take(intTop).ToListAsync();
//return await Task.Run(() => _db.CopyNew().Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(whereExpression != null, whereExpression).Take(intTop).ToList());
return await _db.CopyNew().Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(whereExpression != null, whereExpression).Take(intTop).ToListAsync();
}
/// <summary>
@ -427,8 +435,8 @@ namespace Admin.Core.Repository
string strOrderByFileds)
{
if (GetConnectionState() == false) return null;
//return await Task.Run(() => _db.Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(!string.IsNullOrEmpty(strWhere), strWhere).Take(intTop).ToList());
return await _db.Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(!string.IsNullOrEmpty(strWhere), strWhere).Take(intTop).ToListAsync();
//return await Task.Run(() => _db.CopyNew().Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(!string.IsNullOrEmpty(strWhere), strWhere).Take(intTop).ToList());
return await _db.CopyNew().Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(!string.IsNullOrEmpty(strWhere), strWhere).Take(intTop).ToListAsync();
}
/// <summary>
@ -440,7 +448,7 @@ namespace Admin.Core.Repository
public async Task<List<TEntity>> QuerySqlAsync(string strSql, SugarParameter[] parameters = null)
{
if (GetConnectionState() == false) return null;
return await _db.Ado.SqlQueryAsync<TEntity>(strSql, parameters);
return await _db.CopyNew().Ado.SqlQueryAsync<TEntity>(strSql, parameters);
}
/// <summary>
@ -451,7 +459,7 @@ namespace Admin.Core.Repository
/// <returns>泛型集合</returns>
public async Task<int> ExecSqlAsync(string strSql, SugarParameter[] parameters = null)
{
return await _db.Ado.ExecuteCommandAsync(strSql, parameters);
return await _db.CopyNew().Ado.ExecuteCommandAsync(strSql, parameters);
}
/// <summary>
@ -463,7 +471,7 @@ namespace Admin.Core.Repository
public async Task<DataTable> QueryTableAsync(string strSql, SugarParameter[] parameters = null)
{
if (GetConnectionState() == false) return null;
return await _db.Ado.GetDataTableAsync(strSql, parameters);
return await _db.CopyNew().Ado.GetDataTableAsync(strSql, parameters);
}
/// <summary>
@ -482,8 +490,8 @@ namespace Admin.Core.Repository
string strOrderByFileds)
{
if (GetConnectionState() == false) return null;
//return await Task.Run(() => _db.Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(whereExpression != null, whereExpression).ToPageList(intPageIndex, intPageSize));
return await _db.Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(whereExpression != null, whereExpression).ToPageListAsync(intPageIndex, intPageSize);
//return await Task.Run(() => _db.CopyNew().Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(whereExpression != null, whereExpression).ToPageList(intPageIndex, intPageSize));
return await _db.CopyNew().Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(whereExpression != null, whereExpression).ToPageListAsync(intPageIndex, intPageSize);
}
/// <summary>
@ -503,8 +511,8 @@ namespace Admin.Core.Repository
string strOrderByFileds)
{
if (GetConnectionState() == false) return null;
//return await Task.Run(() => _db.Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(!string.IsNullOrEmpty(strWhere), strWhere).ToPageList(intPageIndex, intPageSize));
return await _db.Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(!string.IsNullOrEmpty(strWhere), strWhere).ToPageListAsync(intPageIndex, intPageSize);
//return await Task.Run(() => _db.CopyNew().Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(!string.IsNullOrEmpty(strWhere), strWhere).ToPageList(intPageIndex, intPageSize));
return await _db.CopyNew().Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(!string.IsNullOrEmpty(strWhere), strWhere).ToPageListAsync(intPageIndex, intPageSize);
}
@ -522,7 +530,7 @@ namespace Admin.Core.Repository
if (GetConnectionState() == false) return null;
RefAsync<int> totalCount = 0;
var list = await _db.Queryable<TEntity>()
var list = await _db.CopyNew().Queryable<TEntity>()
.OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds)
.WhereIF(whereExpression != null, whereExpression)
.ToPageListAsync(intPageIndex, intPageSize, totalCount);
@ -551,9 +559,9 @@ namespace Admin.Core.Repository
if (GetConnectionState() == false) return null;
if (whereLambda == null)
{
return await _db.Queryable(joinExpression).Select(selectExpression).ToListAsync();
return await _db.CopyNew().Queryable(joinExpression).Select(selectExpression).ToListAsync();
}
return await _db.Queryable(joinExpression).Where(whereLambda).Select(selectExpression).ToListAsync();
return await _db.CopyNew().Queryable(joinExpression).Where(whereLambda).Select(selectExpression).ToListAsync();
}
@ -580,7 +588,7 @@ namespace Admin.Core.Repository
{
if (GetConnectionState() == false) return null;
RefAsync<int> totalCount = 0;
var list = await _db.Queryable<T, T2>(joinExpression)
var list = await _db.CopyNew().Queryable<T, T2>(joinExpression)
.Select(selectExpression)
.OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds)
.WhereIF(whereExpression != null, whereExpression)
@ -614,7 +622,7 @@ namespace Admin.Core.Repository
if (GetConnectionState() == false) return null;
RefAsync<int> totalCount = 0;
var list = await _db.Queryable<T, T2>(joinExpression).GroupBy(groupExpression)
var list = await _db.CopyNew().Queryable<T, T2>(joinExpression).GroupBy(groupExpression)
.Select(selectExpression)
.OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds)
.WhereIF(whereExpression != null, whereExpression)
@ -629,7 +637,7 @@ namespace Admin.Core.Repository
public TEntity QueryById(object objId)
{
return _db.Queryable<TEntity>().In(objId).Single();
return _db.CopyNew().Queryable<TEntity>().In(objId).Single();
}
/// <summary
/// 功能描述:根据ID查询一条数据
@ -640,7 +648,7 @@ namespace Admin.Core.Repository
/// <returns数据实体</returns
public TEntity QueryById(object objId, bool blnUseCache = false)
{
return _db.Queryable<TEntity>().WithCacheIF(blnUseCache).In(objId).Single();
return _db.CopyNew().Queryable<TEntity>().WithCacheIF(blnUseCache).In(objId).Single();
}
/// <summary
@ -651,7 +659,7 @@ namespace Admin.Core.Repository
/// <returns数据实体列表</returns
public List<TEntity> QueryByIDs(object[] lstIds)
{
return _db.Queryable<TEntity>().In(lstIds).ToList();
return _db.CopyNew().Queryable<TEntity>().In(lstIds).ToList();
}
/// <summary
@ -663,8 +671,8 @@ namespace Admin.Core.Repository
{
if (GetConnectionState() == false)
{
_db.Open();
var insert = _db.Insertable(entity);
_db.CopyNew().Open();
var insert = _db.CopyNew().Insertable(entity);
if (insert == null)
{
@ -688,7 +696,7 @@ namespace Admin.Core.Repository
/// <returns返回自增量列</returns
public int Add(TEntity entity, Expression<Func<TEntity, object>> insertColumns = null)
{
var insert = _db.Insertable(entity);
var insert = _db.CopyNew().Insertable(entity);
if (insertColumns == null)
{
return insert.ExecuteReturnIdentity();
@ -706,7 +714,7 @@ namespace Admin.Core.Repository
/// <returns影响行数</returns
public int Add(List<TEntity> listEntity)
{
return _db.Insertable(listEntity.ToArray()).ExecuteCommand();
return _db.CopyNew().Insertable(listEntity.ToArray()).ExecuteCommand();
}
/// <summary
@ -717,27 +725,27 @@ namespace Admin.Core.Repository
public bool Update(TEntity entity)
{
////这种方式会以主键为条件
//var i = Task.Run(() = _db.Updateable(entity).ExecuteCommand());
//var i = Task.Run(() = _db.CopyNew().Updateable(entity).ExecuteCommand());
//return i 0;
//这种方式会以主键为条件
return _db.Updateable(entity).ExecuteCommandHasChange();
return _db.CopyNew().Updateable(entity).ExecuteCommandHasChange();
}
public bool Update(TEntity entity, string strWhere)
{
//return Task.Run(() = _db.Updateable(entity).Where(strWhere).ExecuteCommand() 0);
return _db.Updateable(entity).Where(strWhere).ExecuteCommandHasChange();
//return Task.Run(() = _db.CopyNew().Updateable(entity).Where(strWhere).ExecuteCommand() 0);
return _db.CopyNew().Updateable(entity).Where(strWhere).ExecuteCommandHasChange();
}
public bool Update(string strSql, SugarParameter[] parameters = null)
{
//return Task.Run(() = _db.Ado.ExecuteCommand(strSql, parameters) 0);
return _db.Ado.ExecuteCommand(strSql, parameters) > 0;
//return Task.Run(() = _db.CopyNew().Ado.ExecuteCommand(strSql, parameters) 0);
return _db.CopyNew().Ado.ExecuteCommand(strSql, parameters) > 0;
}
public bool Update(object operateAnonymousObjects)
{
return _db.Updateable<TEntity>(operateAnonymousObjects).ExecuteCommand() > 0;
return _db.CopyNew().Updateable<TEntity>(operateAnonymousObjects).ExecuteCommand() > 0;
}
public bool Update(
@ -748,7 +756,7 @@ namespace Admin.Core.Repository
)
{
IUpdateable<TEntity> up = _db.Updateable(entity);
IUpdateable<TEntity> up = _db.CopyNew().Updateable(entity);
if (lstIgnoreColumns != null && lstIgnoreColumns.Count > 0)
{
up = up.IgnoreColumns(lstIgnoreColumns.ToArray());
@ -771,9 +779,9 @@ namespace Admin.Core.Repository
/// <returns</returns
public bool Delete(TEntity entity)
{
//var i = Task.Run(() = _db.Deleteable(entity).ExecuteCommand());
//var i = Task.Run(() = _db.CopyNew().Deleteable(entity).ExecuteCommand());
//return i 0;
return _db.Deleteable(entity).ExecuteCommandHasChange();
return _db.CopyNew().Deleteable(entity).ExecuteCommandHasChange();
}
/// <summary
@ -783,9 +791,9 @@ namespace Admin.Core.Repository
/// <returns</returns
public bool DeleteById(object id)
{
//var i = Task.Run(() = _db.Deleteable<TEntity(id).ExecuteCommand());
//var i = Task.Run(() = _db.CopyNew().Deleteable<TEntity(id).ExecuteCommand());
//return i 0;
return _db.Deleteable<TEntity>(id).ExecuteCommandHasChange();
return _db.CopyNew().Deleteable<TEntity>(id).ExecuteCommandHasChange();
}
/// <summary
@ -795,9 +803,9 @@ namespace Admin.Core.Repository
/// <returns</returns
public bool Deletes(List<TEntity> entitys)
{
//var i = Task.Run(() = _db.Deleteable<TEntity().In(ids).ExecuteCommand());
//var i = Task.Run(() = _db.CopyNew().Deleteable<TEntity().In(ids).ExecuteCommand());
//return i 0;
return _db.Deleteable<TEntity>(entitys).ExecuteCommandHasChange();
return _db.CopyNew().Deleteable<TEntity>(entitys).ExecuteCommandHasChange();
}
@ -810,7 +818,7 @@ namespace Admin.Core.Repository
public List<TEntity> Query()
{
if (GetConnectionState() == false) return null;
return _db.Queryable<TEntity>().ToList();
return _db.CopyNew().Queryable<TEntity>().ToList();
}
/// <summary
@ -822,8 +830,8 @@ namespace Admin.Core.Repository
public List<TEntity> Query(string strWhere)
{
if (GetConnectionState() == false) return null;
//return Task.Run(() = _db.Queryable<TEntity().WhereIF(!string.IsNullOrEmpty(strWhere), strWhere).ToList());
return _db.Queryable<TEntity>().WhereIF(!string.IsNullOrEmpty(strWhere), strWhere).ToList();
//return Task.Run(() = _db.CopyNew().Queryable<TEntity().WhereIF(!string.IsNullOrEmpty(strWhere), strWhere).ToList());
return _db.CopyNew().Queryable<TEntity>().WhereIF(!string.IsNullOrEmpty(strWhere), strWhere).ToList();
}
/// <summary
@ -835,7 +843,7 @@ namespace Admin.Core.Repository
public List<TEntity> Query(Expression<Func<TEntity, bool>> whereExpression)
{
if (GetConnectionState() == false) return null;
return _db.Queryable<TEntity>().WhereIF(whereExpression != null, whereExpression).ToList();
return _db.CopyNew().Queryable<TEntity>().WhereIF(whereExpression != null, whereExpression).ToList();
}
/// <summary
@ -848,7 +856,7 @@ namespace Admin.Core.Repository
public List<TResult> Query<TResult>(Expression<Func<TEntity, TResult>> expression)
{
if (GetConnectionState() == false) return null;
return _db.Queryable<TEntity>().Select(expression).ToList();
return _db.CopyNew().Queryable<TEntity>().Select(expression).ToList();
}
/// <summary
@ -863,7 +871,7 @@ namespace Admin.Core.Repository
public List<TResult> Query<TResult>(Expression<Func<TEntity, TResult>> expression, Expression<Func<TEntity, bool>> whereExpression, string strOrderByFileds)
{
if (GetConnectionState() == false) return null;
return _db.Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(whereExpression != null, whereExpression).Select(expression).ToList();
return _db.CopyNew().Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(whereExpression != null, whereExpression).Select(expression).ToList();
}
/// <summary
@ -876,8 +884,8 @@ namespace Admin.Core.Repository
public List<TEntity> Query(Expression<Func<TEntity, bool>> whereExpression, string strOrderByFileds)
{
if (GetConnectionState() == false) return null;
//return Task.Run(() = _db.Queryable<TEntity().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(whereExpression != null, whereExpression).ToList());
return _db.Queryable<TEntity>().WhereIF(whereExpression != null, whereExpression).OrderByIF(strOrderByFileds != null, strOrderByFileds).ToList();
//return Task.Run(() = _db.CopyNew().Queryable<TEntity().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(whereExpression != null, whereExpression).ToList());
return _db.CopyNew().Queryable<TEntity>().WhereIF(whereExpression != null, whereExpression).OrderByIF(strOrderByFileds != null, strOrderByFileds).ToList();
}
/// <summary
/// 功能描述:查询一个列表
@ -889,8 +897,8 @@ namespace Admin.Core.Repository
public List<TEntity> Query(Expression<Func<TEntity, bool>> whereExpression, Expression<Func<TEntity, object>> orderByExpression, bool isAsc = true)
{
if (GetConnectionState() == false) return null;
//return Task.Run(() = _db.Queryable<TEntity().OrderByIF(orderByExpression != null, orderByExpression, isAsc ? OrderByType.Asc : OrderByType.Desc).WhereIF(whereExpression != null, whereExpression).ToList());
return _db.Queryable<TEntity>().OrderByIF(orderByExpression != null, orderByExpression, isAsc ? OrderByType.Asc : OrderByType.Desc).WhereIF(whereExpression != null, whereExpression).ToList();
//return Task.Run(() = _db.CopyNew().Queryable<TEntity().OrderByIF(orderByExpression != null, orderByExpression, isAsc ? OrderByType.Asc : OrderByType.Desc).WhereIF(whereExpression != null, whereExpression).ToList());
return _db.CopyNew().Queryable<TEntity>().OrderByIF(orderByExpression != null, orderByExpression, isAsc ? OrderByType.Asc : OrderByType.Desc).WhereIF(whereExpression != null, whereExpression).ToList();
}
/// <summary
@ -903,8 +911,8 @@ namespace Admin.Core.Repository
public List<TEntity> Query(string strWhere, string strOrderByFileds)
{
if (GetConnectionState() == false) return null;
//return Task.Run(() = _db.Queryable<TEntity().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(!string.IsNullOrEmpty(strWhere), strWhere).ToList());
return _db.Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(!string.IsNullOrEmpty(strWhere), strWhere).ToList();
//return Task.Run(() = _db.CopyNew().Queryable<TEntity().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(!string.IsNullOrEmpty(strWhere), strWhere).ToList());
return _db.CopyNew().Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(!string.IsNullOrEmpty(strWhere), strWhere).ToList();
}
@ -922,8 +930,8 @@ namespace Admin.Core.Repository
string strOrderByFileds)
{
if (GetConnectionState() == false) return null;
//return Task.Run(() = _db.Queryable<TEntity().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(whereExpression != null, whereExpression).Take(intTop).ToList());
return _db.Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(whereExpression != null, whereExpression).Take(intTop).ToList();
//return Task.Run(() = _db.CopyNew().Queryable<TEntity().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(whereExpression != null, whereExpression).Take(intTop).ToList());
return _db.CopyNew().Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(whereExpression != null, whereExpression).Take(intTop).ToList();
}
/// <summary
@ -939,8 +947,8 @@ namespace Admin.Core.Repository
int intTop,
string strOrderByFileds)
{
//return Task.Run(() = _db.Queryable<TEntity().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(!string.IsNullOrEmpty(strWhere), strWhere).Take(intTop).ToList());
return _db.Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(!string.IsNullOrEmpty(strWhere), strWhere).Take(intTop).ToList();
//return Task.Run(() = _db.CopyNew().Queryable<TEntity().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(!string.IsNullOrEmpty(strWhere), strWhere).Take(intTop).ToList());
return _db.CopyNew().Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(!string.IsNullOrEmpty(strWhere), strWhere).Take(intTop).ToList();
}
/// <summary
@ -951,7 +959,7 @@ namespace Admin.Core.Repository
/// <returns泛型集合</returns
public List<TEntity> QuerySql(string strSql, SugarParameter[] parameters = null)
{
return _db.Ado.SqlQuery<TEntity>(strSql, parameters);
return _db.CopyNew().Ado.SqlQuery<TEntity>(strSql, parameters);
}
/// <summary
@ -962,7 +970,7 @@ namespace Admin.Core.Repository
/// <returns泛型集合</returns
public int ExecSql(string strSql, SugarParameter[] parameters = null)
{
return _db.Ado.ExecuteCommand(strSql, parameters);
return _db.CopyNew().Ado.ExecuteCommand(strSql, parameters);
}
/// <summary
@ -973,7 +981,7 @@ namespace Admin.Core.Repository
/// <returnsDataTable</returns
public DataTable QueryTable(string strSql, SugarParameter[] parameters = null)
{
return _db.Ado.GetDataTable(strSql, parameters);
return _db.CopyNew().Ado.GetDataTable(strSql, parameters);
}
/// <summary
@ -991,8 +999,8 @@ namespace Admin.Core.Repository
int intPageSize,
string strOrderByFileds)
{
//return Task.Run(() = _db.Queryable<TEntity().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(whereExpression != null, whereExpression).ToPageList(intPageIndex, intPageSize));
return _db.Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(whereExpression != null, whereExpression).ToPageList(intPageIndex, intPageSize);
//return Task.Run(() = _db.CopyNew().Queryable<TEntity().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(whereExpression != null, whereExpression).ToPageList(intPageIndex, intPageSize));
return _db.CopyNew().Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(whereExpression != null, whereExpression).ToPageList(intPageIndex, intPageSize);
}
/// <summary
@ -1011,8 +1019,8 @@ namespace Admin.Core.Repository
string strOrderByFileds)
{
//return Task.Run(() = _db.Queryable<TEntity().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(!string.IsNullOrEmpty(strWhere), strWhere).ToPageList(intPageIndex, intPageSize));
return _db.Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(!string.IsNullOrEmpty(strWhere), strWhere).ToPageList(intPageIndex, intPageSize);
//return Task.Run(() = _db.CopyNew().Queryable<TEntity().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(!string.IsNullOrEmpty(strWhere), strWhere).ToPageList(intPageIndex, intPageSize));
return _db.CopyNew().Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(!string.IsNullOrEmpty(strWhere), strWhere).ToPageList(intPageIndex, intPageSize);
}
@ -1029,7 +1037,7 @@ namespace Admin.Core.Repository
{
int totalCount = 0;
var list = _db.Queryable<TEntity>()
var list = _db.CopyNew().Queryable<TEntity>()
.OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds)
.WhereIF(whereExpression != null, whereExpression)
.ToPageList(intPageIndex, intPageSize, ref totalCount);
@ -1057,9 +1065,9 @@ namespace Admin.Core.Repository
{
if (whereLambda == null)
{
return _db.Queryable(joinExpression).Select(selectExpression).ToList();
return _db.CopyNew().Queryable(joinExpression).Select(selectExpression).ToList();
}
return _db.Queryable(joinExpression).Where(whereLambda).Select(selectExpression).ToList();
return _db.CopyNew().Queryable(joinExpression).Where(whereLambda).Select(selectExpression).ToList();
}
@ -1086,7 +1094,7 @@ namespace Admin.Core.Repository
{
int totalCount = 0;
var list = _db.Queryable<T, T2>(joinExpression)
var list = _db.CopyNew().Queryable<T, T2>(joinExpression)
.Select(selectExpression)
.OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds)
.WhereIF(whereExpression != null, whereExpression)
@ -1119,7 +1127,7 @@ namespace Admin.Core.Repository
{
int totalCount = 0;
var list = _db.Queryable<T, T2>(joinExpression).GroupBy(groupExpression)
var list = _db.CopyNew().Queryable<T, T2>(joinExpression).GroupBy(groupExpression)
.Select(selectExpression)
.OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds)
.WhereIF(whereExpression != null, whereExpression)

Write Preview
Loading…
Cancel
Save