Skip to content

Commit

Permalink
Modifying the naming specification
Browse files Browse the repository at this point in the history
  • Loading branch information
@anjoy8
anjoy8 committed Mar 25, 2019
1 parent 10ccc47 commit a5b7908
Show file tree
Hide file tree
Showing 34 changed files with 333 additions and 343 deletions.
4 changes: 2 additions & 2 deletions Blog.Core.IRepository/BASE/IBaseRepository.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ namespace Blog.Core.IRepository.Base
public interface IBaseRepository<TEntity> where TEntity : class
{

Task<TEntity> QueryByID(object objId);
Task<TEntity> QueryByID(object objId, bool blnUseCache = false);
Task<TEntity> QueryById(object objId);
Task<TEntity> QueryById(object objId, bool blnUseCache = false);
Task<List<TEntity>> QueryByIDs(object[] lstIds);

Task<int> Add(TEntity model);
Expand Down
4 changes: 2 additions & 2 deletions Blog.Core.IServices/BASE/IBaseServices.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ namespace Blog.Core.IServices.BASE
public interface IBaseServices<TEntity> where TEntity : class
{

Task<TEntity> QueryByID(object objId);
Task<TEntity> QueryByID(object objId, bool blnUseCache = false);
Task<TEntity> QueryById(object objId);
Task<TEntity> QueryById(object objId, bool blnUseCache = false);
Task<List<TEntity>> QueryByIDs(object[] lstIds);

Task<int> Add(TEntity model);
Expand Down
4 changes: 2 additions & 2 deletions Blog.Core.IServices/IBlogArticleServices.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ namespace Blog.Core.IServices
{
public interface IBlogArticleServices :IBaseServices<BlogArticle>
{
Task<List<BlogArticle>> getBlogs();
Task<BlogViewModels> getBlogDetails(int id);
Task<List<BlogArticle>> GetBlogs();
Task<BlogViewModels> GetBlogDetails(int id);

}

Expand Down
6 changes: 3 additions & 3 deletions Blog.Core.IServices/IsysUserInfoServices.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ namespace Blog.Core.IServices
/// <summary>
/// sysUserInfoServices
/// </summary>
public interface IsysUserInfoServices :IBaseServices<sysUserInfo>
public interface ISysUserInfoServices :IBaseServices<sysUserInfo>
{
Task<sysUserInfo> SaveUserInfo(string loginName, string loginPWD);
Task<string> GetUserRoleNameStr(string loginName, string loginPWD);
Task<sysUserInfo> SaveUserInfo(string loginName, string loginPwd);
Task<string> GetUserRoleNameStr(string loginName, string loginPwd);
}
}
74 changes: 37 additions & 37 deletions Blog.Core.Repository/BASE/BaseRepository.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,38 +11,38 @@ namespace Blog.Core.Repository.Base
{
public class BaseRepository<TEntity> : IBaseRepository<TEntity> where TEntity : class, new()
{
private DbContext context;
private SqlSugarClient db;
private SimpleClient<TEntity> entityDB;
private DbContext _context;
private SqlSugarClient _db;
private SimpleClient<TEntity> _entityDb;

public DbContext Context
{
get { return context; }
set { context = value; }
get { return _context; }
set { _context = value; }
}
internal SqlSugarClient Db
{
get { return db; }
private set { db = value; }
get { return _db; }
private set { _db = value; }
}
internal SimpleClient<TEntity> EntityDB
internal SimpleClient<TEntity> entityDb
{
get { return entityDB; }
private set { entityDB = value; }
get { return _entityDb; }
private set { _entityDb = value; }
}
public BaseRepository()
{
DbContext.Init(BaseDBConfig.ConnectionString);
context = DbContext.GetDbContext();
db = context.Db;
entityDB = context.GetEntityDB<TEntity>(db);
_context = DbContext.GetDbContext();
_db = _context.Db;
_entityDb = _context.GetEntityDB<TEntity>(_db);
}



public async Task<TEntity> QueryByID(object objId)
public async Task<TEntity> QueryById(object objId)
{
return await Task.Run(() => db.Queryable<TEntity>().InSingle(objId));
return await Task.Run(() => _db.Queryable<TEntity>().InSingle(objId));
}
/// <summary>
/// 功能描述:根据ID查询一条数据
Expand All @@ -51,9 +51,9 @@ public async Task<TEntity> QueryByID(object objId)
/// <param name="objId">id（必须指定主键特性 [SugarColumn(IsPrimaryKey=true)]），如果是联合主键，请使用Where条件</param>
/// <param name="blnUseCache">是否使用缓存</param>
/// <returns>数据实体</returns>
public async Task<TEntity> QueryByID(object objId, bool blnUseCache = false)
public async Task<TEntity> QueryById(object objId, bool blnUseCache = false)
{
return await Task.Run(() => db.Queryable<TEntity>().WithCacheIF(blnUseCache).InSingle(objId));
return await Task.Run(() => _db.Queryable<TEntity>().WithCacheIF(blnUseCache).InSingle(objId));
}

/// <summary>
Expand All @@ -64,7 +64,7 @@ public async Task<TEntity> QueryByID(object objId, bool blnUseCache = false)
/// <returns>数据实体列表</returns>
public async Task<List<TEntity>> QueryByIDs(object[] lstIds)
{
return await Task.Run(() => db.Queryable<TEntity>().In(lstIds).ToList());
return await Task.Run(() => _db.Queryable<TEntity>().In(lstIds).ToList());
}

/// <summary>
Expand All @@ -74,7 +74,7 @@ public async Task<List<TEntity>> QueryByIDs(object[] lstIds)
/// <returns></returns>
public async Task<int> Add(TEntity entity)
{
var i = await Task.Run(() => db.Insertable(entity).ExecuteReturnBigIdentity());
var i = await Task.Run(() => _db.Insertable(entity).ExecuteReturnBigIdentity());
//返回的i是long类型,这里你可以根据你的业务需要进行处理
return (int)i;
}
Expand All @@ -87,18 +87,18 @@ public async Task<int> Add(TEntity entity)
public async Task<bool> Update(TEntity entity)
{
//这种方式会以主键为条件
var i = await Task.Run(() => db.Updateable(entity).ExecuteCommand());
var i = await Task.Run(() => _db.Updateable(entity).ExecuteCommand());
return i > 0;
}

public async Task<bool> Update(TEntity entity, string strWhere)
{
return await Task.Run(() => db.Updateable(entity).Where(strWhere).ExecuteCommand() > 0);
return await Task.Run(() => _db.Updateable(entity).Where(strWhere).ExecuteCommand() > 0);
}

public async Task<bool> Update(string strSql, SugarParameter[] parameters = null)
{
return await Task.Run(() => db.Ado.ExecuteCommand(strSql, parameters) > 0);
return await Task.Run(() => _db.Ado.ExecuteCommand(strSql, parameters) > 0);
}

public async Task<bool> Update(
Expand All @@ -108,7 +108,7 @@ public async Task<bool> Update(
string strWhere = ""
)
{
IUpdateable<TEntity> up = await Task.Run(() => db.Updateable(entity));
IUpdateable<TEntity> up = await Task.Run(() => _db.Updateable(entity));
if (lstIgnoreColumns != null && lstIgnoreColumns.Count > 0)
{
up = await Task.Run(() => up.IgnoreColumns(it => lstIgnoreColumns.Contains(it)));
Expand All @@ -131,7 +131,7 @@ public async Task<bool> Update(
/// <returns></returns>
public async Task<bool> Delete(TEntity entity)
{
var i = await Task.Run(() => db.Deleteable(entity).ExecuteCommand());
var i = await Task.Run(() => _db.Deleteable(entity).ExecuteCommand());
return i > 0;
}

Expand All @@ -142,7 +142,7 @@ public async Task<bool> Delete(TEntity entity)
/// <returns></returns>
public async Task<bool> DeleteById(object id)
{
var i = await Task.Run(() => db.Deleteable<TEntity>(id).ExecuteCommand());
var i = await Task.Run(() => _db.Deleteable<TEntity>(id).ExecuteCommand());
return i > 0;
}

Expand All @@ -153,7 +153,7 @@ public async Task<bool> DeleteById(object id)
/// <returns></returns>
public async Task<bool> DeleteByIds(object[] ids)
{
var i = await Task.Run(() => db.Deleteable<TEntity>().In(ids).ExecuteCommand());
var i = await Task.Run(() => _db.Deleteable<TEntity>().In(ids).ExecuteCommand());
return i > 0;
}

Expand All @@ -166,7 +166,7 @@ public async Task<bool> DeleteByIds(object[] ids)
/// <returns>数据列表</returns>
public async Task<List<TEntity>> Query()
{
return await Task.Run(() => entityDB.GetList());
return await Task.Run(() => _entityDb.GetList());
}

/// <summary>
Expand All @@ -177,7 +177,7 @@ public async Task<List<TEntity>> Query()
/// <returns>数据列表</returns>
public async Task<List<TEntity>> Query(string strWhere)
{
return await Task.Run(() => db.Queryable<TEntity>().WhereIF(!string.IsNullOrEmpty(strWhere), strWhere).ToList());
return await Task.Run(() => _db.Queryable<TEntity>().WhereIF(!string.IsNullOrEmpty(strWhere), strWhere).ToList());
}

/// <summary>
Expand All @@ -188,7 +188,7 @@ public async Task<List<TEntity>> Query(string strWhere)
/// <returns>数据列表</returns>
public async Task<List<TEntity>> Query(Expression<Func<TEntity, bool>> whereExpression)
{
return await Task.Run(() => entityDB.GetList(whereExpression));
return await Task.Run(() => _entityDb.GetList(whereExpression));
}

/// <summary>
Expand All @@ -200,7 +200,7 @@ public async Task<List<TEntity>> Query(Expression<Func<TEntity, bool>> whereExpr
/// <returns>数据列表</returns>
public async Task<List<TEntity>> Query(Expression<Func<TEntity, bool>> whereExpression, string strOrderByFileds)
{
return await Task.Run(() => db.Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(whereExpression != null, whereExpression).ToList());
return await Task.Run(() => _db.Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(whereExpression != null, whereExpression).ToList());
}
/// <summary>
/// 功能描述:查询一个列表
Expand All @@ -211,7 +211,7 @@ public async Task<List<TEntity>> Query(Expression<Func<TEntity, bool>> whereExpr
/// <returns></returns>
public async Task<List<TEntity>> Query(Expression<Func<TEntity, bool>> whereExpression, Expression<Func<TEntity, object>> orderByExpression, bool isAsc = true)
{
return await Task.Run(() => db.Queryable<TEntity>().OrderByIF(orderByExpression != null, orderByExpression, isAsc ? OrderByType.Asc : OrderByType.Desc).WhereIF(whereExpression != null, whereExpression).ToList());
return await Task.Run(() => _db.Queryable<TEntity>().OrderByIF(orderByExpression != null, orderByExpression, isAsc ? OrderByType.Asc : OrderByType.Desc).WhereIF(whereExpression != null, whereExpression).ToList());
}

/// <summary>
Expand All @@ -223,7 +223,7 @@ public async Task<List<TEntity>> Query(Expression<Func<TEntity, bool>> whereExpr
/// <returns>数据列表</returns>
public async Task<List<TEntity>> Query(string strWhere, string strOrderByFileds)
{
return await Task.Run(() => db.Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(!string.IsNullOrEmpty(strWhere), strWhere).ToList());
return await Task.Run(() => _db.Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(!string.IsNullOrEmpty(strWhere), strWhere).ToList());
}


Expand All @@ -240,7 +240,7 @@ public async Task<List<TEntity>> Query(
int intTop,
string strOrderByFileds)
{
return await Task.Run(() => db.Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(whereExpression != null, whereExpression).Take(intTop).ToList());
return await Task.Run(() => _db.Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(whereExpression != null, whereExpression).Take(intTop).ToList());
}

/// <summary>
Expand All @@ -256,7 +256,7 @@ public async Task<List<TEntity>> Query(
int intTop,
string strOrderByFileds)
{
return await Task.Run(() => db.Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(!string.IsNullOrEmpty(strWhere), strWhere).Take(intTop).ToList());
return await Task.Run(() => _db.Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(!string.IsNullOrEmpty(strWhere), strWhere).Take(intTop).ToList());
}


Expand All @@ -277,7 +277,7 @@ public async Task<List<TEntity>> Query(
int intPageSize,
string strOrderByFileds)
{
return await Task.Run(() => db.Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(whereExpression != null, whereExpression).ToPageList(intPageIndex, intPageSize));
return await Task.Run(() => _db.Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(whereExpression != null, whereExpression).ToPageList(intPageIndex, intPageSize));
}

/// <summary>
Expand All @@ -297,7 +297,7 @@ public async Task<List<TEntity>> Query(

string strOrderByFileds)
{
return await Task.Run(() => db.Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(!string.IsNullOrEmpty(strWhere), strWhere).ToPageList(intPageIndex, intPageSize));
return await Task.Run(() => _db.Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds).WhereIF(!string.IsNullOrEmpty(strWhere), strWhere).ToPageList(intPageIndex, intPageSize));
}


Expand All @@ -306,7 +306,7 @@ public async Task<List<TEntity>> Query(
public async Task<List<TEntity>> QueryPage(Expression<Func<TEntity, bool>> whereExpression,
int intPageIndex = 0, int intPageSize = 20, string strOrderByFileds = null)
{
return await Task.Run(() => db.Queryable<TEntity>()
return await Task.Run(() => _db.Queryable<TEntity>()
.OrderByIF(!string.IsNullOrEmpty(strOrderByFileds), strOrderByFileds)
.WhereIF(whereExpression != null, whereExpression)
.ToPageList(intPageIndex, intPageSize));
Expand Down
6 changes: 3 additions & 3 deletions Blog.Core.Services/AdvertisementServices.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ namespace Blog.Core.Services
{
public class AdvertisementServices : BaseServices<Advertisement>, IAdvertisementServices
{
IAdvertisementRepository dal;
IAdvertisementRepository _dal;
public AdvertisementServices(IAdvertisementRepository dal)
{
this.dal = dal;
base.baseDal = dal;
this._dal = dal;
base.BaseDal = dal;
}

public void ReturnExp()
Expand Down
Loading

0 comments on commit a5b7908

Please sign in to comment.