From 1093a7b76aa66f39b60aa1f6948413731d7f0ddf Mon Sep 17 00:00:00 2001 From: anjoy8 <3143422472@qq.com> Date: Mon, 14 Mar 2022 15:15:05 +0800 Subject: [PATCH] fix: format the code. #236 --- Blog.Core.Api/Blog.Core.Model.xml | 8 +- Blog.Core.Api/Blog.Core.xml | 1 + .../Blog.Core.ConsoleApp.csproj | 8 - Blog.Core.ConsoleApp/Program.cs | 12 -- Blog.Core.IServices/BASE/IBaseServices.cs | 26 +-- Blog.Core.Model/PaginationModel.cs | 14 +- Blog.Core.Repository/BASE/BaseRepository.cs | 199 ++++++++---------- Blog.Core.Repository/BASE/IBaseRepository.cs | 64 +++--- Blog.Core.Services/BASE/BaseServices.cs | 116 +++++----- Blog.Core.sln | 7 - 10 files changed, 197 insertions(+), 258 deletions(-) delete mode 100644 Blog.Core.ConsoleApp/Blog.Core.ConsoleApp.csproj delete mode 100644 Blog.Core.ConsoleApp/Program.cs diff --git a/Blog.Core.Api/Blog.Core.Model.xml b/Blog.Core.Api/Blog.Core.Model.xml index 2d8c766..d6c167e 100644 --- a/Blog.Core.Api/Blog.Core.Model.xml +++ b/Blog.Core.Api/Blog.Core.Model.xml @@ -1514,22 +1514,22 @@ 时间:2020-4-3 20:31:26 - + 当前页 - + 每页大小 - + 排序字段(例如:id desc,time asc) - + 查询条件( 例如:id = 1 and name = 小明) diff --git a/Blog.Core.Api/Blog.Core.xml b/Blog.Core.Api/Blog.Core.xml index a2fa3a8..eb1ea54 100644 --- a/Blog.Core.Api/Blog.Core.xml +++ b/Blog.Core.Api/Blog.Core.xml @@ -735,6 +735,7 @@ + diff --git a/Blog.Core.ConsoleApp/Blog.Core.ConsoleApp.csproj b/Blog.Core.ConsoleApp/Blog.Core.ConsoleApp.csproj deleted file mode 100644 index 41f1d5a..0000000 --- a/Blog.Core.ConsoleApp/Blog.Core.ConsoleApp.csproj +++ /dev/null @@ -1,8 +0,0 @@ - - - - Exe - net6.0 - - - diff --git a/Blog.Core.ConsoleApp/Program.cs b/Blog.Core.ConsoleApp/Program.cs deleted file mode 100644 index 87e5d80..0000000 --- a/Blog.Core.ConsoleApp/Program.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; - -namespace Blog.Core.ConsoleApp -{ - class Program - { - static void Main(string[] args) - { - Console.WriteLine("Hello World!"); - } - } -} diff --git a/Blog.Core.IServices/BASE/IBaseServices.cs b/Blog.Core.IServices/BASE/IBaseServices.cs index dbc242c..27daae9 100644 --- a/Blog.Core.IServices/BASE/IBaseServices.cs +++ b/Blog.Core.IServices/BASE/IBaseServices.cs @@ -26,32 +26,32 @@ namespace Blog.Core.IServices.BASE Task DeleteByIds(object[] ids); Task Update(TEntity model); - Task Update(TEntity entity, string strWhere); + Task Update(TEntity entity, string where); Task Update(object operateAnonymousObjects); - Task Update(TEntity entity, List lstColumns = null, List lstIgnoreColumns = null, string strWhere = ""); + Task Update(TEntity entity, List lstColumns = null, List lstIgnoreColumns = null, string where = ""); Task> Query(); - Task> Query(string strWhere); + Task> Query(string where); Task> Query(Expression> whereExpression); - Task> Query(Expression> whereExpression, string strOrderByFileds); + Task> Query(Expression> whereExpression, string orderByFields); Task> Query(Expression> expression); - Task> Query(Expression> expression, Expression> whereExpression,string strOrderByFileds); + Task> Query(Expression> expression, Expression> whereExpression, string orderByFields); Task> Query(Expression> whereExpression, Expression> orderByExpression, bool isAsc = true); - Task> Query(string strWhere, string strOrderByFileds); - Task> QuerySql(string strSql, SugarParameter[] parameters = null); - Task QueryTable(string strSql, SugarParameter[] parameters = null); + Task> Query(string where, string orderByFields); + Task> QuerySql(string sql, SugarParameter[] parameters = null); + Task QueryTable(string sql, SugarParameter[] parameters = null); - Task> Query(Expression> whereExpression, int intTop, string strOrderByFileds); - Task> Query(string strWhere, int intTop, string strOrderByFileds); + Task> Query(Expression> whereExpression, int top, string orderByFields); + Task> Query(string where, int top, string orderByFields); Task> Query( - Expression> whereExpression, int intPageIndex, int intPageSize, string strOrderByFileds); - Task> Query(string strWhere, int intPageIndex, int intPageSize, string strOrderByFileds); + Expression> whereExpression, int pageIndex, int pageSize, string orderByFields); + Task> Query(string where, int pageIndex, int pageSize, string orderByFields); - Task> QueryPage(Expression> whereExpression, int intPageIndex = 1, int intPageSize = 20, string strOrderByFileds = null); + Task> QueryPage(Expression> whereExpression, int pageIndex = 1, int pageSize = 20, string orderByFields = null); Task> QueryMuch( Expression> joinExpression, diff --git a/Blog.Core.Model/PaginationModel.cs b/Blog.Core.Model/PaginationModel.cs index 3afee0b..f79b331 100644 --- a/Blog.Core.Model/PaginationModel.cs +++ b/Blog.Core.Model/PaginationModel.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace Blog.Core.Model +namespace Blog.Core.Model { /// /// 所需分页参数 @@ -14,18 +10,18 @@ namespace Blog.Core.Model /// /// 当前页 /// - public int intPageIndex { get; set; } = 1; + public int PageIndex { get; set; } = 1; /// /// 每页大小 /// - public int intPageSize { get; set; } = 10; + public int PageSize { get; set; } = 10; /// /// 排序字段(例如:id desc,time asc) /// - public string strOrderByFileds { get; set; } + public string OrderByFileds { get; set; } /// /// 查询条件( 例如:id = 1 and name = 小明) /// - public string conditions { get; set; } + public string Conditions { get; set; } } } diff --git a/Blog.Core.Repository/BASE/BaseRepository.cs b/Blog.Core.Repository/BASE/BaseRepository.cs index cd08893..bb83b4c 100644 --- a/Blog.Core.Repository/BASE/BaseRepository.cs +++ b/Blog.Core.Repository/BASE/BaseRepository.cs @@ -16,7 +16,7 @@ namespace Blog.Core.Repository.Base public class BaseRepository : IBaseRepository where TEntity : class, new() { private readonly IUnitOfWork _unitOfWork; - private SqlSugarScope _dbBase; + private readonly SqlSugarScope _dbBase; private ISqlSugarClient _db { @@ -42,10 +42,7 @@ namespace Blog.Core.Repository.Base } } - public ISqlSugarClient Db - { - get { return _db; } - } + public ISqlSugarClient Db => _db; public BaseRepository(IUnitOfWork unitOfWork) { @@ -148,16 +145,14 @@ namespace Blog.Core.Repository.Base return await _db.Updateable(entity).ExecuteCommandHasChangeAsync(); } - public async Task Update(TEntity entity, string strWhere) + public async Task Update(TEntity entity, string where) { - //return await Task.Run(() => _db.Updateable(entity).Where(strWhere).ExecuteCommand() > 0); - return await _db.Updateable(entity).Where(strWhere).ExecuteCommandHasChangeAsync(); + return await _db.Updateable(entity).Where(where).ExecuteCommandHasChangeAsync(); } - public async Task Update(string strSql, SugarParameter[] parameters = null) + public async Task Update(string sql, SugarParameter[] parameters = null) { - //return await Task.Run(() => _db.Ado.ExecuteCommand(strSql, parameters) > 0); - return await _db.Ado.ExecuteCommandAsync(strSql, parameters) > 0; + return await _db.Ado.ExecuteCommandAsync(sql, parameters) > 0; } public async Task Update(object operateAnonymousObjects) @@ -169,24 +164,9 @@ namespace Blog.Core.Repository.Base TEntity entity, List lstColumns = null, List lstIgnoreColumns = null, - string strWhere = "" + string where = "" ) { - //IUpdateable up = await Task.Run(() => _db.Updateable(entity)); - //if (lstIgnoreColumns != null && lstIgnoreColumns.Count > 0) - //{ - // up = await Task.Run(() => up.IgnoreColumns(it => lstIgnoreColumns.Contains(it))); - //} - //if (lstColumns != null && lstColumns.Count > 0) - //{ - // up = await Task.Run(() => up.UpdateColumns(it => lstColumns.Contains(it))); - //} - //if (!string.IsNullOrEmpty(strWhere)) - //{ - // up = await Task.Run(() => up.Where(strWhere)); - //} - //return await Task.Run(() => up.ExecuteCommand()) > 0; - IUpdateable up = _db.Updateable(entity); if (lstIgnoreColumns != null && lstIgnoreColumns.Count > 0) { @@ -196,9 +176,9 @@ namespace Blog.Core.Repository.Base { up = up.UpdateColumns(lstColumns.ToArray()); } - if (!string.IsNullOrEmpty(strWhere)) + if (!string.IsNullOrEmpty(where)) { - up = up.Where(strWhere); + up = up.Where(where); } return await up.ExecuteCommandHasChangeAsync(); } @@ -210,8 +190,6 @@ namespace Blog.Core.Repository.Base /// public async Task Delete(TEntity entity) { - //var i = await Task.Run(() => _db.Deleteable(entity).ExecuteCommand()); - //return i > 0; return await _db.Deleteable(entity).ExecuteCommandHasChangeAsync(); } @@ -222,8 +200,6 @@ namespace Blog.Core.Repository.Base /// public async Task DeleteById(object id) { - //var i = await Task.Run(() => _db.Deleteable(id).ExecuteCommand()); - //return i > 0; return await _db.Deleteable(id).ExecuteCommandHasChangeAsync(); } @@ -234,8 +210,6 @@ namespace Blog.Core.Repository.Base /// public async Task DeleteByIds(object[] ids) { - //var i = await Task.Run(() => _db.Deleteable().In(ids).ExecuteCommand()); - //return i > 0; return await _db.Deleteable().In(ids).ExecuteCommandHasChangeAsync(); } @@ -255,12 +229,11 @@ namespace Blog.Core.Repository.Base /// 功能描述:查询数据列表 /// 作　　者:Blog.Core /// - /// 条件 + /// 条件 /// 数据列表 - public async Task> Query(string strWhere) + public async Task> Query(string where) { - //return await Task.Run(() => _db.Queryable().WhereIF(!string.IsNullOrEmpty(strWhere), strWhere).ToList()); - return await _db.Queryable().WhereIF(!string.IsNullOrEmpty(strWhere), strWhere).ToListAsync(); + return await _db.Queryable().WhereIF(!string.IsNullOrEmpty(where), where).ToListAsync(); } /// @@ -293,11 +266,11 @@ namespace Blog.Core.Repository.Base /// /// 过滤条件 /// 查询实体条件 - /// 排序条件 + /// 排序条件 /// - public async Task> Query(Expression> expression, Expression> whereExpression, string strOrderByFileds) + public async Task> Query(Expression> expression, Expression> whereExpression, string orderByFields) { - return await _db.Queryable().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(whereExpression != null, whereExpression).Select(expression).ToListAsync(); + return await _db.Queryable().OrderByIF(!string.IsNullOrEmpty(orderByFields), orderByFields).WhereIF(whereExpression != null, whereExpression).Select(expression).ToListAsync(); } /// @@ -305,12 +278,11 @@ namespace Blog.Core.Repository.Base /// 作　　者:Blog.Core /// /// 条件表达式 - /// 排序字段，如name asc,age desc + /// 排序字段，如name asc,age desc /// 数据列表 - public async Task> Query(Expression> whereExpression, string strOrderByFileds) + public async Task> Query(Expression> whereExpression, string orderByFields) { - //return await Task.Run(() => _db.Queryable().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(whereExpression != null, whereExpression).ToList()); - return await _db.Queryable().WhereIF(whereExpression != null, whereExpression).OrderByIF(strOrderByFileds != null, strOrderByFileds).ToListAsync(); + return await _db.Queryable().WhereIF(whereExpression != null, whereExpression).OrderByIF(orderByFields != null, orderByFields).ToListAsync(); } /// /// 功能描述:查询一个列表 @@ -329,13 +301,12 @@ namespace Blog.Core.Repository.Base /// 功能描述:查询一个列表 /// 作　　者:Blog.Core /// - /// 条件 - /// 排序字段，如name asc,age desc + /// 条件 + /// 排序字段，如name asc,age desc /// 数据列表 - public async Task> Query(string strWhere, string strOrderByFileds) + public async Task> Query(string where, string orderByFields) { - //return await Task.Run(() => _db.Queryable().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(!string.IsNullOrEmpty(strWhere), strWhere).ToList()); - return await _db.Queryable().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(!string.IsNullOrEmpty(strWhere), strWhere).ToListAsync(); + return await _db.Queryable().OrderByIF(!string.IsNullOrEmpty(orderByFields), orderByFields).WhereIF(!string.IsNullOrEmpty(where), where).ToListAsync(); } @@ -344,55 +315,53 @@ namespace Blog.Core.Repository.Base /// 作　　者:Blog.Core /// /// 条件表达式 - /// 前N条 - /// 排序字段，如name asc,age desc + /// 前N条 + /// 排序字段，如name asc,age desc /// 数据列表 public async Task> Query( Expression> whereExpression, - int intTop, - string strOrderByFileds) + int top, + string orderByFields) { - //return await Task.Run(() => _db.Queryable().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(whereExpression != null, whereExpression).Take(intTop).ToList()); - return await _db.Queryable().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(whereExpression != null, whereExpression).Take(intTop).ToListAsync(); + return await _db.Queryable().OrderByIF(!string.IsNullOrEmpty(orderByFields), orderByFields).WhereIF(whereExpression != null, whereExpression).Take(top).ToListAsync(); } /// /// 功能描述:查询前N条数据 /// 作　　者:Blog.Core /// - /// 条件 - /// 前N条 - /// 排序字段，如name asc,age desc + /// 条件 + /// 前N条 + /// 排序字段，如name asc,age desc /// 数据列表 public async Task> Query( - string strWhere, - int intTop, - string strOrderByFileds) + string where, + int top, + string orderByFields) { - //return await Task.Run(() => _db.Queryable().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(!string.IsNullOrEmpty(strWhere), strWhere).Take(intTop).ToList()); - return await _db.Queryable().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(!string.IsNullOrEmpty(strWhere), strWhere).Take(intTop).ToListAsync(); + return await _db.Queryable().OrderByIF(!string.IsNullOrEmpty(orderByFields), orderByFields).WhereIF(!string.IsNullOrEmpty(where), where).Take(top).ToListAsync(); } /// /// 根据sql语句查询 /// - /// 完整的sql语句 + /// 完整的sql语句 /// 参数 /// 泛型集合 - public async Task> QuerySql(string strSql, SugarParameter[] parameters = null) + public async Task> QuerySql(string sql, SugarParameter[] parameters = null) { - return await _db.Ado.SqlQueryAsync(strSql, parameters); + return await _db.Ado.SqlQueryAsync(sql, parameters); } /// /// 根据sql语句查询 /// - /// 完整的sql语句 + /// 完整的sql语句 /// 参数 /// DataTable - public async Task QueryTable(string strSql, SugarParameter[] parameters = null) + public async Task QueryTable(string sql, SugarParameter[] parameters = null) { - return await _db.Ado.GetDataTableAsync(strSql, parameters); + return await _db.Ado.GetDataTableAsync(sql, parameters); } /// @@ -400,38 +369,38 @@ namespace Blog.Core.Repository.Base /// 作　　者:Blog.Core /// /// 条件表达式 - /// 页码（下标0） - /// 页大小 - /// 排序字段，如name asc,age desc + /// 页码（下标0） + /// 页大小 + /// 排序字段，如name asc,age desc /// 数据列表 public async Task> Query( Expression> whereExpression, - int intPageIndex, - int intPageSize, - string strOrderByFileds) + int pageIndex, + int pageSize, + string orderByFields) { - //return await Task.Run(() => _db.Queryable().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(whereExpression != null, whereExpression).ToPageList(intPageIndex, intPageSize)); - return await _db.Queryable().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(whereExpression != null, whereExpression).ToPageListAsync(intPageIndex, intPageSize); + return await _db.Queryable().OrderByIF(!string.IsNullOrEmpty(orderByFields), orderByFields) + .WhereIF(whereExpression != null, whereExpression).ToPageListAsync(pageIndex, pageSize); } /// /// 功能描述:分页查询 /// 作　　者:Blog.Core /// - /// 条件 - /// 页码（下标0） - /// 页大小 - /// 排序字段，如name asc,age desc + /// 条件 + /// 页码（下标0） + /// 页大小 + /// 排序字段，如name asc,age desc /// 数据列表 public async Task> Query( - string strWhere, - int intPageIndex, - int intPageSize, + string where, + int pageIndex, + int pageSize, - string strOrderByFileds) + string orderByFields) { - //return await Task.Run(() => _db.Queryable().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(!string.IsNullOrEmpty(strWhere), strWhere).ToPageList(intPageIndex, intPageSize)); - return await _db.Queryable().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(!string.IsNullOrEmpty(strWhere), strWhere).ToPageListAsync(intPageIndex, intPageSize); + return await _db.Queryable().OrderByIF(!string.IsNullOrEmpty(orderByFields), orderByFields) + .WhereIF(!string.IsNullOrEmpty(where), where).ToPageListAsync(pageIndex, pageSize); } @@ -440,20 +409,20 @@ namespace Blog.Core.Repository.Base /// 分页查询[使用版本，其他分页未测试] /// /// 条件表达式 - /// 页码（下标0） - /// 页大小 - /// 排序字段，如name asc,age desc + /// 页码（下标0） + /// 页大小 + /// 排序字段，如name asc,age desc /// - public async Task> QueryPage(Expression> whereExpression, int intPageIndex = 1, int intPageSize = 20, string strOrderByFileds = null) + public async Task> QueryPage(Expression> whereExpression, int pageIndex = 1, int pageSize = 20, string orderByFields = null) { RefAsync totalCount = 0; var list = await _db.Queryable() - .OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds) + .OrderByIF(!string.IsNullOrEmpty(orderByFields), orderByFields) .WhereIF(whereExpression != null, whereExpression) - .ToPageListAsync(intPageIndex, intPageSize, totalCount); + .ToPageListAsync(pageIndex, pageSize, totalCount); - return new PageModel(intPageIndex, totalCount, intPageSize, list); + return new PageModel(pageIndex, totalCount, pageSize, list); } @@ -490,26 +459,26 @@ namespace Blog.Core.Repository.Base /// 关联表达式 /// 返回表达式 /// 查询表达式 - /// 页码 - /// 页大小 - /// 排序字段 + /// 页码 + /// 页大小 + /// 排序字段 /// public async Task> QueryTabsPage( Expression> joinExpression, Expression> selectExpression, Expression> whereExpression, - int intPageIndex = 1, - int intPageSize = 20, - string strOrderByFileds = null) + int pageIndex = 1, + int pageSize = 20, + string orderByFields = null) { RefAsync totalCount = 0; var list = await _db.Queryable(joinExpression) .Select(selectExpression) - .OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds) + .OrderByIF(!string.IsNullOrEmpty(orderByFields), orderByFields) .WhereIF(whereExpression != null, whereExpression) - .ToPageListAsync(intPageIndex, intPageSize, totalCount); - return new PageModel(intPageIndex, totalCount, intPageSize, list); + .ToPageListAsync(pageIndex, pageSize, totalCount); + return new PageModel(pageIndex, totalCount, pageSize, list); } /// @@ -521,27 +490,27 @@ namespace Blog.Core.Repository.Base /// 关联表达式 /// 返回表达式 /// 查询表达式 - /// 页码 - /// 页大小 - /// 排序字段 + /// group表达式 + /// 页码 + /// 页大小 + /// 排序字段 /// public async Task> QueryTabsPage( Expression> joinExpression, Expression> selectExpression, Expression> whereExpression, Expression> groupExpression, - int intPageIndex = 1, - int intPageSize = 20, - string strOrderByFileds = null) + int pageIndex = 1, + int pageSize = 20, + string orderByFields = null) { - RefAsync totalCount = 0; var list = await _db.Queryable(joinExpression).GroupBy(groupExpression) .Select(selectExpression) - .OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds) + .OrderByIF(!string.IsNullOrEmpty(orderByFields), orderByFields) .WhereIF(whereExpression != null, whereExpression) - .ToPageListAsync(intPageIndex, intPageSize, totalCount); - return new PageModel(intPageIndex, totalCount, intPageSize, list); + .ToPageListAsync(pageIndex, pageSize, totalCount); + return new PageModel(pageIndex, totalCount, pageSize, list); } //var exp = Expressionable.Create() diff --git a/Blog.Core.Repository/BASE/IBaseRepository.cs b/Blog.Core.Repository/BASE/IBaseRepository.cs index 1d74d9a..2978350 100644 --- a/Blog.Core.Repository/BASE/IBaseRepository.cs +++ b/Blog.Core.Repository/BASE/IBaseRepository.cs @@ -74,9 +74,9 @@ namespace Blog.Core.IRepository.Base /// 根据model，更新，带where条件 /// /// - /// + /// /// - Task Update(TEntity entity, string strWhere); + Task Update(TEntity entity, string where); Task Update(object operateAnonymousObjects); /// @@ -85,9 +85,9 @@ namespace Blog.Core.IRepository.Base /// /// /// - /// + /// /// - Task Update(TEntity entity, List lstColumns = null, List lstIgnoreColumns = null, string strWhere = ""); + Task Update(TEntity entity, List lstColumns = null, List lstIgnoreColumns = null, string where = ""); /// /// 查询 @@ -98,9 +98,9 @@ namespace Blog.Core.IRepository.Base /// /// 带sql where查询 /// - /// + /// /// - Task> Query(string strWhere); + Task> Query(string where); /// /// 根据表达式查询 @@ -123,31 +123,31 @@ namespace Blog.Core.IRepository.Base /// /// /// - /// + /// /// - Task> Query(Expression> expression, Expression> whereExpression, string strOrderByFileds); - Task> Query(Expression> whereExpression, string strOrderByFileds); + Task> Query(Expression> expression, Expression> whereExpression, string orderByFields); + Task> Query(Expression> whereExpression, string orderByFields); Task> Query(Expression> whereExpression, Expression> orderByExpression, bool isAsc = true); - Task> Query(string strWhere, string strOrderByFileds); + Task> Query(string where, string orderByFields); - Task> Query(Expression> whereExpression, int intTop, string strOrderByFileds); - Task> Query(string strWhere, int intTop, string strOrderByFileds); - Task> QuerySql(string strSql, SugarParameter[] parameters = null); - Task QueryTable(string strSql, SugarParameter[] parameters = null); + Task> Query(Expression> whereExpression, int intTop, string orderByFields); + Task> Query(string where, int intTop, string orderByFields); + Task> QuerySql(string sql, SugarParameter[] parameters = null); + Task QueryTable(string sql, SugarParameter[] parameters = null); Task> Query( - Expression> whereExpression, int intPageIndex, int intPageSize, string strOrderByFileds); - Task> Query(string strWhere, int intPageIndex, int intPageSize, string strOrderByFileds); + Expression> whereExpression, int pageIndex, int pageSize, string orderByFields); + Task> Query(string where, int pageIndex, int pageSize, string orderByFields); /// /// 根据表达式，排序字段，分页查询 /// /// - /// - /// - /// + /// + /// + /// /// - Task> QueryPage(Expression> whereExpression, int intPageIndex = 1, int intPageSize = 20, string strOrderByFileds = null); + Task> QueryPage(Expression> whereExpression, int pageIndex = 1, int pageSize = 20, string orderByFields = null); /// /// 三表联查 @@ -174,17 +174,17 @@ namespace Blog.Core.IRepository.Base /// /// /// - /// - /// - /// + /// + /// + /// /// Task> QueryTabsPage( Expression> joinExpression, Expression> selectExpression, Expression> whereExpression, - int intPageIndex = 1, - int intPageSize = 20, - string strOrderByFileds = null); + int pageIndex = 1, + int pageSize = 20, + string orderByFields = null); /// /// 两表联合查询-分页-分组 @@ -196,17 +196,17 @@ namespace Blog.Core.IRepository.Base /// /// /// - /// - /// - /// + /// + /// + /// /// Task> QueryTabsPage( Expression> joinExpression, Expression> selectExpression, Expression> whereExpression, Expression> groupExpression, - int intPageIndex = 1, - int intPageSize = 20, - string strOrderByFileds = null); + int pageIndex = 1, + int pageSize = 20, + string orderByFields = null); } } diff --git a/Blog.Core.Services/BASE/BaseServices.cs b/Blog.Core.Services/BASE/BaseServices.cs index d110b58..5db1efe 100644 --- a/Blog.Core.Services/BASE/BaseServices.cs +++ b/Blog.Core.Services/BASE/BaseServices.cs @@ -72,9 +72,9 @@ namespace Blog.Core.Services.BASE { return await BaseDal.Update(entity); } - public async Task Update(TEntity entity, string strWhere) + public async Task Update(TEntity entity, string where) { - return await BaseDal.Update(entity, strWhere); + return await BaseDal.Update(entity, where); } public async Task Update(object operateAnonymousObjects) { @@ -85,10 +85,10 @@ namespace Blog.Core.Services.BASE TEntity entity, List lstColumns = null, List lstIgnoreColumns = null, - string strWhere = "" + string where = "" ) { - return await BaseDal.Update(entity, lstColumns, lstIgnoreColumns, strWhere); + return await BaseDal.Update(entity, lstColumns, lstIgnoreColumns, where); } @@ -138,11 +138,11 @@ namespace Blog.Core.Services.BASE /// 功能描述:查询数据列表 /// 作　　者:AZLinli.Blog.Core /// - /// 条件 + /// 条件 /// 数据列表 - public async Task> Query(string strWhere) + public async Task> Query(string where) { - return await BaseDal.Query(strWhere); + return await BaseDal.Query(where); } /// @@ -175,11 +175,11 @@ namespace Blog.Core.Services.BASE /// /// 过滤条件 /// 查询实体条件 - /// 排序条件 + /// 排序条件 /// - public async Task> Query(Expression> expression, Expression> whereExpression,string strOrderByFileds) + public async Task> Query(Expression> expression, Expression> whereExpression,string orderByFileds) { - return await BaseDal.Query(expression, whereExpression, strOrderByFileds); + return await BaseDal.Query(expression, whereExpression, orderByFileds); } /// @@ -194,44 +194,44 @@ namespace Blog.Core.Services.BASE return await BaseDal.Query(whereExpression, orderByExpression, isAsc); } - public async Task> Query(Expression> whereExpression, string strOrderByFileds) + public async Task> Query(Expression> whereExpression, string orderByFileds) { - return await BaseDal.Query(whereExpression, strOrderByFileds); + return await BaseDal.Query(whereExpression, orderByFileds); } /// /// 功能描述:查询一个列表 /// 作　　者:AZLinli.Blog.Core /// - /// 条件 - /// 排序字段，如name asc,age desc + /// 条件 + /// 排序字段，如name asc,age desc /// 数据列表 - public async Task> Query(string strWhere, string strOrderByFileds) + public async Task> Query(string where, string orderByFileds) { - return await BaseDal.Query(strWhere, strOrderByFileds); + return await BaseDal.Query(where, orderByFileds); } /// /// 根据sql语句查询 /// - /// 完整的sql语句 + /// 完整的sql语句 /// 参数 /// 泛型集合 - public async Task> QuerySql(string strSql, SugarParameter[] parameters = null) + public async Task> QuerySql(string sql, SugarParameter[] parameters = null) { - return await BaseDal.QuerySql(strSql, parameters); + return await BaseDal.QuerySql(sql, parameters); } /// /// 根据sql语句查询 /// - /// 完整的sql语句 + /// 完整的sql语句 /// 参数 /// DataTable - public async Task QueryTable(string strSql, SugarParameter[] parameters = null) + public async Task QueryTable(string sql, SugarParameter[] parameters = null) { - return await BaseDal.QueryTable(strSql, parameters); + return await BaseDal.QueryTable(sql, parameters); } /// @@ -239,28 +239,28 @@ namespace Blog.Core.Services.BASE /// 作　　者:AZLinli.Blog.Core /// /// 条件表达式 - /// 前N条 - /// 排序字段，如name asc,age desc + /// 前N条 + /// 排序字段，如name asc,age desc /// 数据列表 - public async Task> Query(Expression> whereExpression, int intTop, string strOrderByFileds) + public async Task> Query(Expression> whereExpression, int top, string orderByFileds) { - return await BaseDal.Query(whereExpression, intTop, strOrderByFileds); + return await BaseDal.Query(whereExpression, top, orderByFileds); } /// /// 功能描述:查询前N条数据 /// 作　　者:AZLinli.Blog.Core /// - /// 条件 - /// 前N条 - /// 排序字段，如name asc,age desc + /// 条件 + /// 前N条 + /// 排序字段，如name asc,age desc /// 数据列表 public async Task> Query( - string strWhere, - int intTop, - string strOrderByFileds) + string where, + int top, + string orderByFileds) { - return await BaseDal.Query(strWhere, intTop, strOrderByFileds); + return await BaseDal.Query(where, top, orderByFileds); } /// @@ -268,50 +268,50 @@ namespace Blog.Core.Services.BASE /// 作　　者:AZLinli.Blog.Core /// /// 条件表达式 - /// 页码（下标0） - /// 页大小 - /// 排序字段，如name asc,age desc + /// 页码（下标0） + /// 页大小 + /// 排序字段，如name asc,age desc /// 数据列表 public async Task> Query( Expression> whereExpression, - int intPageIndex, - int intPageSize, - string strOrderByFileds) + int pageIndex, + int pageSize, + string orderByFileds) { return await BaseDal.Query( whereExpression, - intPageIndex, - intPageSize, - strOrderByFileds); + pageIndex, + pageSize, + orderByFileds); } /// /// 功能描述:分页查询 /// 作　　者:AZLinli.Blog.Core /// - /// 条件 - /// 页码（下标0） - /// 页大小 - /// 排序字段，如name asc,age desc + /// 条件 + /// 页码（下标0） + /// 页大小 + /// 排序字段，如name asc,age desc /// 数据列表 public async Task> Query( - string strWhere, - int intPageIndex, - int intPageSize, - string strOrderByFileds) + string where, + int pageIndex, + int pageSize, + string orderByFileds) { return await BaseDal.Query( - strWhere, - intPageIndex, - intPageSize, - strOrderByFileds); + where, + pageIndex, + pageSize, + orderByFileds); } public async Task> QueryPage(Expression> whereExpression, - int intPageIndex = 1, int intPageSize = 20, string strOrderByFileds = null) + int pageIndex = 1, int pageSize = 20, string orderByFileds = null) { return await BaseDal.QueryPage(whereExpression, - intPageIndex, intPageSize, strOrderByFileds); + pageIndex, pageSize, orderByFileds); } public async Task> QueryMuch(Expression> joinExpression, Expression> selectExpression, Expression> whereLambda = null) where T : class, new() @@ -320,8 +320,8 @@ namespace Blog.Core.Services.BASE } public async Task> QueryPage(PaginationModel pagination) { - var express = DynamicLinqFactory.CreateLambda(pagination.conditions); - return await QueryPage(express, pagination.intPageIndex, pagination.intPageSize, pagination.strOrderByFileds); + var express = DynamicLinqFactory.CreateLambda(pagination.Conditions); + return await QueryPage(express, pagination.PageIndex, pagination.PageSize, pagination.OrderByFileds); } } diff --git a/Blog.Core.sln b/Blog.Core.sln index 1d40c8a..c8f6150 100644 --- a/Blog.Core.sln +++ b/Blog.Core.sln @@ -51,8 +51,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "EventBus", "EventBus", "{A5 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blog.Core.EventBus", "Blog.Core.EventBus\Blog.Core.EventBus.csproj", "{17C9E9DC-E926-4C90-9025-3DAC55D7EDA3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blog.Core.ConsoleApp", "Blog.Core.ConsoleApp\Blog.Core.ConsoleApp.csproj", "{0B3265A9-6716-4D28-8648-C64D5E692ACA}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blog.Core.Gateway", "Blog.Core.Gateway\Blog.Core.Gateway.csproj", "{A11C0DF2-1E13-4EED-BA49-44A57136B189}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blog.Core.Serilog.Es", "Blog.Core.Serilog.Es\Blog.Core.Serilog.Es.csproj", "{52AFAB53-D1CA-4014-8B63-3550FDCDA6E1}" @@ -109,10 +107,6 @@ Global {17C9E9DC-E926-4C90-9025-3DAC55D7EDA3}.Debug|Any CPU.Build.0 = Debug|Any CPU {17C9E9DC-E926-4C90-9025-3DAC55D7EDA3}.Release|Any CPU.ActiveCfg = Release|Any CPU {17C9E9DC-E926-4C90-9025-3DAC55D7EDA3}.Release|Any CPU.Build.0 = Release|Any CPU - {0B3265A9-6716-4D28-8648-C64D5E692ACA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0B3265A9-6716-4D28-8648-C64D5E692ACA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0B3265A9-6716-4D28-8648-C64D5E692ACA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0B3265A9-6716-4D28-8648-C64D5E692ACA}.Release|Any CPU.Build.0 = Release|Any CPU {A11C0DF2-1E13-4EED-BA49-44A57136B189}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A11C0DF2-1E13-4EED-BA49-44A57136B189}.Debug|Any CPU.Build.0 = Debug|Any CPU {A11C0DF2-1E13-4EED-BA49-44A57136B189}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -133,7 +127,6 @@ Global {300A8113-8033-4184-BE28-FC48D8349CD0} = {EDA8901E-541E-4ADC-B71E-59697D5F9549} {52D318A2-F44E-4CB7-8DD4-483357D4333F} = {047A9723-9AAC-42E3-8C69-B3835F15FF96} {17C9E9DC-E926-4C90-9025-3DAC55D7EDA3} = {A592C96A-4E44-4F2A-AC21-30683AF6C493} - {0B3265A9-6716-4D28-8648-C64D5E692ACA} = {047A9723-9AAC-42E3-8C69-B3835F15FF96} {A11C0DF2-1E13-4EED-BA49-44A57136B189} = {E2BD7D4D-9ED5-41CD-8401-C3FB26F203BB} {6463FB13-5F01-4A1D-8B62-A454FB3812EB} = {E2BD7D4D-9ED5-41CD-8401-C3FB26F203BB} EndGlobalSection