Simon
/
Tiobon.Web.Core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码优化

Browse Source
master
xiaochanghai 1 year ago
parent 201c569f60
commit 9e7797362c
9 changed files with 237 additions and 219 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 55
      Tiobon.Core.Api/Controllers/BaseController.cs
  2. 20
      Tiobon.Core.Api/Tiobon.Core.Model.xml
  3. 18
      Tiobon.Core.Api/Tiobon.Core.xml
  4. 2
      Tiobon.Core.Extensions/ServiceExtensions/AuthorizationSetup.cs
  5. 4
      Tiobon.Core.IServices/BASE/IBaseServices.cs
  6. 6
      Tiobon.Core.Model/ServiceResult.cs
  7. 4
      Tiobon.Core.Repository/BASE/BaseRepository.cs
  8. 2
      Tiobon.Core.Repository/BASE/IBaseRepository.cs
  9. 21
      Tiobon.Core.Services/BASE/BaseServices.cs

55
Tiobon.Core.Api/Controllers/BaseController.cs
Unescape View File

@ -1,15 +1,21 @@
using System.Collections.Generic; using System.Reflection;
using System.Reflection;
using Tiobon.Core.Model;
namespace Tiobon.Core.Controllers namespace Tiobon.Core.Controllers;
{
/// <summary>
/// 增删改查基础服务
/// </summary>
/// <typeparam name="IServiceBase"></typeparam>
/// <typeparam name="TEntity"></typeparam>
/// <typeparam name="TEntityDto"></typeparam>
/// <typeparam name="TInsertDto"></typeparam>
/// <typeparam name="TEditDto"></typeparam>
public class BaseController<IServiceBase, TEntity, TEntityDto, TInsertDto, TEditDto> : Controller public class BaseController<IServiceBase, TEntity, TEntityDto, TInsertDto, TEditDto> : Controller
{ {
#region 初始化 #region 初始化
protected IServiceBase _service; protected IServiceBase _service;
/// <summary> /// <summary>
/// /// 初始化 (注入)
/// </summary> /// </summary>
public BaseController(IServiceBase service) public BaseController(IServiceBase service)
{ {
@ -27,10 +33,10 @@ namespace Tiobon.Core.Controllers
/// <param name="filter">条件</param> /// <param name="filter">条件</param>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpGet]
public async Task<ServiceResult<PageModel<TEntityDto>>> QueryByFilter([FromFilter] QueryFilter filter) public async Task<ServicePageResult<TEntityDto>> QueryByFilter([FromFilter] QueryFilter filter)
{ {
var response = (await InvokeServiceAsync("QueryFilterPage", [filter])) as PageModel<TEntityDto>; var data = (await InvokeServiceAsync("QueryFilterPage", [filter])) as ServicePageResult<TEntityDto>;
return new ServiceResult<PageModel<TEntityDto>>() { msg = "获取成功", success = true, response = response }; return data;
} }
/// <summary> /// <summary>
@ -41,7 +47,7 @@ namespace Tiobon.Core.Controllers
[HttpGet("{Id}")] [HttpGet("{Id}")]
public async Task<ServiceResult<object>> QueryById(long Id) public async Task<ServiceResult<object>> QueryById(long Id)
{ {
var entity = (await InvokeServiceAsync("QueryById", [Id])); var entity = await InvokeServiceAsync("QueryById", [Id]);
if (entity == null) if (entity == null)
return Failed<object>("获取失败"); return Failed<object>("获取失败");
else else
@ -56,7 +62,7 @@ namespace Tiobon.Core.Controllers
/// <param name="insertModel"></param> /// <param name="insertModel"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public async Task<ServiceResult<string>> Post([FromBody] TEditDto insertModel) public async Task<ServiceResult<string>> Insert([FromBody] TInsertDto insertModel)
{ {
var data = Success<string>(null, "新增成功"); var data = Success<string>(null, "新增成功");
var id = Convert.ToInt64(await InvokeServiceAsync("Add", [insertModel])); var id = Convert.ToInt64(await InvokeServiceAsync("Add", [insertModel]));
@ -64,7 +70,7 @@ namespace Tiobon.Core.Controllers
if (data.success) if (data.success)
data.response = id.ObjToString(); data.response = id.ObjToString();
else else
data.msg = "新增失败"; return Failed<string>("新增失败");
return data; return data;
} }
@ -74,17 +80,16 @@ namespace Tiobon.Core.Controllers
/// <summary> /// <summary>
/// Ghra_Grade -- 更新数据 /// Ghra_Grade -- 更新数据
/// </summary> /// </summary>
/// <param name="Id"></param> /// <param name="Id">主键ID</param>
/// <param name="editModel"></param> /// <param name="editModel"></param>
/// <returns></returns> /// <returns></returns>
[HttpPut("{Id}")] [HttpPut("{Id}")]
public async Task<ServiceResult> Put(long Id, [FromBody] TEditDto editModel) public async Task<ServiceResult> Put(long Id, [FromBody] TEditDto editModel)
{ {
var data = Success("更新成功"); var data = Success("更新成功");
var id = Convert.ToInt64(await InvokeServiceAsync("Update", [Id, editModel])); var flag = Convert.ToBoolean(await InvokeServiceAsync("Update", [Id, editModel]));
if (!data.success) if (!flag)
data.msg = "更新失败"; return Failed("更新失败");
return data; return data;
} }
#endregion #endregion
@ -93,20 +98,18 @@ namespace Tiobon.Core.Controllers
/// <summary> /// <summary>
/// Ghra_Grade -- 删除数据 /// Ghra_Grade -- 删除数据
/// </summary> /// </summary>
/// <param name="Id"></param> /// <param name="Id">主键ID</param>
/// <returns></returns> /// <returns></returns>
[HttpDelete("{Id}")] [HttpDelete("{Id}")]
public async Task<ServiceResult> Delete(long Id) public async Task<ServiceResult> Delete(long Id)
{ {
var data = Success("删除成功"); var data = Success("删除成功");
var entity = await QueryById(Id); var isExist = Convert.ToBoolean(await InvokeServiceAsync("AnyAsync", [Id]));
if (entity == null) if (!isExist)
return Failed("删除失败"); return Failed("删除失败");
data.success = Convert.ToBoolean(await InvokeServiceAsync("DeleteById1", [Id]));
//entity.IsEnable = 0;
data.success = Convert.ToBoolean(await InvokeServiceAsync("Update", [entity]));
if (!data.success) if (!data.success)
data.msg = "删除失败"; return Failed("删除失败");
return data; return data;
} }
#endregion #endregion
@ -119,6 +122,7 @@ namespace Tiobon.Core.Controllers
/// <param name="methodName"></param> /// <param name="methodName"></param>
/// <param name="parameters"></param> /// <param name="parameters"></param>
/// <returns></returns> /// <returns></returns>
[NonAction]
private object InvokeService(string methodName, object[] parameters) private object InvokeService(string methodName, object[] parameters)
{ {
return _service.GetType().GetMethod(methodName).Invoke(_service, parameters); return _service.GetType().GetMethod(methodName).Invoke(_service, parameters);
@ -130,9 +134,11 @@ namespace Tiobon.Core.Controllers
/// <param name="types">为要调用重载的方法参数类型：new Type[] { typeof(SaveDataModel)</param> /// <param name="types">为要调用重载的方法参数类型：new Type[] { typeof(SaveDataModel)</param>
/// <param name="parameters"></param> /// <param name="parameters"></param>
/// <returns></returns> /// <returns></returns>
[NonAction]
private object InvokeService(string methodName, Type[] types, object[] parameters) => _service.GetType().GetMethod(methodName, types).Invoke(_service, parameters); private object InvokeService(string methodName, Type[] types, object[] parameters) => _service.GetType().GetMethod(methodName, types).Invoke(_service, parameters);
[NonAction]
private async Task<object> InvokeServiceAsync(string methodName, object[] parameters) private async Task<object> InvokeServiceAsync(string methodName, object[] parameters)
{ {
var task = _service.GetType().InvokeMember(methodName, BindingFlags.InvokeMethod, null, _service, parameters) as Task; var task = _service.GetType().InvokeMember(methodName, BindingFlags.InvokeMethod, null, _service, parameters) as Task;
@ -187,4 +193,3 @@ namespace Tiobon.Core.Controllers
return new ServiceResult<PageModel<T>>() { success = true, msg = msg, response = pageModel }; return new ServiceResult<PageModel<T>>() { success = true, msg = msg, response = pageModel };
} }
} }
}

20
Tiobon.Core.Api/Tiobon.Core.Model.xml
Unescape View File

@ -2232,47 +2232,47 @@
<param name="status"></param> <param name="status"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="T:Tiobon.Core.Model.ServicPageeResult`1"> <member name="T:Tiobon.Core.Model.ServicePageResult`1">
<summary> <summary>
通用分页信息类 服务层分页响应实体(泛型)
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.ServicPageeResult`1.Status"> <member name="P:Tiobon.Core.Model.ServicePageResult`1.Status">
<summary> <summary>
状态码 状态码
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.ServicPageeResult`1.Success"> <member name="P:Tiobon.Core.Model.ServicePageResult`1.Success">
<summary> <summary>
操作是否成功 操作是否成功
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.ServicPageeResult`1.Message"> <member name="P:Tiobon.Core.Model.ServicePageResult`1.Message">
<summary> <summary>
返回信息 返回信息
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.ServicPageeResult`1.Page"> <member name="P:Tiobon.Core.Model.ServicePageResult`1.Page">
<summary> <summary>
当前页标 当前页标
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.ServicPageeResult`1.PageCount"> <member name="P:Tiobon.Core.Model.ServicePageResult`1.PageCount">
<summary> <summary>
总页数 总页数
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.ServicPageeResult`1.TotalCount"> <member name="P:Tiobon.Core.Model.ServicePageResult`1.TotalCount">
<summary> <summary>
数据总数 数据总数
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.ServicPageeResult`1.PageSize"> <member name="P:Tiobon.Core.Model.ServicePageResult`1.PageSize">
<summary> <summary>
每页大小 每页大小
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.ServicPageeResult`1.Data"> <member name="P:Tiobon.Core.Model.ServicePageResult`1.Data">
<summary> <summary>
返回数据 返回数据
</summary> </summary>

18
Tiobon.Core.Api/Tiobon.Core.xml
Unescape View File

@ -4,9 +4,19 @@
<name>Tiobon.Core.Api</name> <name>Tiobon.Core.Api</name>
</assembly> </assembly>
<members> <members>
<member name="T:Tiobon.Core.Controllers.BaseController`5">
<summary>
增删改查基础服务
</summary>
<typeparam name="IServiceBase"></typeparam>
<typeparam name="TEntity"></typeparam>
<typeparam name="TEntityDto"></typeparam>
<typeparam name="TInsertDto"></typeparam>
<typeparam name="TEditDto"></typeparam>
</member>
<member name="M:Tiobon.Core.Controllers.BaseController`5.#ctor(`0)"> <member name="M:Tiobon.Core.Controllers.BaseController`5.#ctor(`0)">
<summary> <summary>
初始化 (注入)
</summary> </summary>
</member> </member>
<member name="M:Tiobon.Core.Controllers.BaseController`5.QueryByFilter(Tiobon.Core.Common.QueryFilter)"> <member name="M:Tiobon.Core.Controllers.BaseController`5.QueryByFilter(Tiobon.Core.Common.QueryFilter)">
@ -23,7 +33,7 @@
<param name="Id">主键ID</param> <param name="Id">主键ID</param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Tiobon.Core.Controllers.BaseController`5.Post(`4)"> <member name="M:Tiobon.Core.Controllers.BaseController`5.Insert(`3)">
<summary> <summary>
Ghra_Grade -- 新增数据 Ghra_Grade -- 新增数据
</summary> </summary>
@ -34,7 +44,7 @@
<summary> <summary>
Ghra_Grade -- 更新数据 Ghra_Grade -- 更新数据
</summary> </summary>
<param name="Id"></param> <param name="Id">主键ID</param>
<param name="editModel"></param> <param name="editModel"></param>
<returns></returns> <returns></returns>
</member> </member>
@ -42,7 +52,7 @@
<summary> <summary>
Ghra_Grade -- 删除数据 Ghra_Grade -- 删除数据
</summary> </summary>
<param name="Id"></param> <param name="Id">主键ID</param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Tiobon.Core.Controllers.BaseController`5.InvokeService(System.String,System.Object[])"> <member name="M:Tiobon.Core.Controllers.BaseController`5.InvokeService(System.String,System.Object[])">

2
Tiobon.Core.Extensions/ServiceExtensions/AuthorizationSetup.cs
Unescape View File

@ -61,7 +61,7 @@ namespace Tiobon.Core.Extensions
Issuer,//发行人 Issuer,//发行人
Audience,//听众 Audience,//听众
signingCredentials,//签名凭据 signingCredentials,//签名凭据
expiration: TimeSpan.FromSeconds(60 * 60)//接口的过期时间 expiration: TimeSpan.FromSeconds(240 * 60)//接口的过期时间
); );
#endregion #endregion
// 3、自定义复杂的策略授权 // 3、自定义复杂的策略授权

4
Tiobon.Core.IServices/BASE/IBaseServices.cs
Unescape View File

@ -52,7 +52,6 @@ namespace Tiobon.Core.IServices.BASE
Task<PageModel<TEntity>> QueryPage(Expression<Func<TEntity, bool>> whereExpression, int pageIndex = 1, int pageSize = 20, string orderByFields = null); Task<PageModel<TEntity>> QueryPage(Expression<Func<TEntity, bool>> whereExpression, int pageIndex = 1, int pageSize = 20, string orderByFields = null);
Task<PageModel<TEntity>> QueryFilterPage([FromFilter] QueryFilter filter);
Task<List<TResult>> QueryMuch<T, T2, T3, TResult>( Task<List<TResult>> QueryMuch<T, T2, T3, TResult>(
Expression<Func<T, T2, T3, object[]>> joinExpression, Expression<Func<T, T2, T3, object[]>> joinExpression,
@ -97,6 +96,7 @@ namespace Tiobon.Core.IServices.BASE
Task<List<long>> Add(List<TInsertDto> listEntity); Task<List<long>> Add(List<TInsertDto> listEntity);
Task<bool> DeleteById(object id); Task<bool> DeleteById(object id);
Task<bool> DeleteById1(object id);
Task<bool> Delete(TEntity model); Task<bool> Delete(TEntity model);
@ -130,7 +130,7 @@ namespace Tiobon.Core.IServices.BASE
Task<PageModel<TEntity>> QueryPage(Expression<Func<TEntity, bool>> whereExpression, int pageIndex = 1, int pageSize = 20, string orderByFields = null); Task<PageModel<TEntity>> QueryPage(Expression<Func<TEntity, bool>> whereExpression, int pageIndex = 1, int pageSize = 20, string orderByFields = null);
Task<PageModel<TEntityDto>> QueryFilterPage([FromFilter] QueryFilter filter); Task<ServicePageResult<TEntityDto>> QueryFilterPage([FromFilter] QueryFilter filter);
Task<List<TResult>> QueryMuch<T, T2, T3, TResult>( Task<List<TResult>> QueryMuch<T, T2, T3, TResult>(
Expression<Func<T, T2, T3, object[]>> joinExpression, Expression<Func<T, T2, T3, object[]>> joinExpression,

6
Tiobon.Core.Model/ServiceResult.cs
Unescape View File

@ -138,7 +138,7 @@ public class ServiceResult
/// <summary> /// <summary>
/// 服务层分页响应实体(泛型) /// 服务层分页响应实体(泛型)
/// </summary> /// </summary>
public class ServicPageeResult<T> public class ServicePageResult<T>
{ {
/// <summary> /// <summary>
/// 状态码 /// 状态码
@ -173,9 +173,9 @@ public class ServicPageeResult<T>
/// </summary> /// </summary>
public List<T> Data { get; set; } public List<T> Data { get; set; }
public ServicPageeResult() { } public ServicePageResult() { }
public ServicPageeResult(int page, int totalCount, int pageSize, List<T> data) public ServicePageResult(int page, int totalCount, int pageSize, List<T> data)
{ {
this.Page = page; this.Page = page;
this.TotalCount = totalCount; this.TotalCount = totalCount;

4
Tiobon.Core.Repository/BASE/BaseRepository.cs
Unescape View File

@ -451,7 +451,7 @@ namespace Tiobon.Core.Repository.Base
/// <param name="pageSize">页大小</param> /// <param name="pageSize">页大小</param>
/// <param name="orderByFields">排序字段，如name asc,age desc</param> /// <param name="orderByFields">排序字段，如name asc,age desc</param>
/// <returns></returns> /// <returns></returns>
public async Task<PageModel<TEntity>> QueryFilterPage([FromFilter] QueryFilter filter) public async Task<ServicePageResult<TEntity>> QueryFilterPage([FromFilter] QueryFilter filter)
{ {
RefAsync<int> totalCount = 0; RefAsync<int> totalCount = 0;
var query = _db.Queryable<TEntity>(); var query = _db.Queryable<TEntity>();
@ -463,7 +463,7 @@ namespace Tiobon.Core.Repository.Base
.OrderByIF(!string.IsNullOrEmpty(filter.Sorting), filter.Sorting) .OrderByIF(!string.IsNullOrEmpty(filter.Sorting), filter.Sorting)
.ToPageListAsync(filter.PageIndex, filter.PageSize, totalCount); .ToPageListAsync(filter.PageIndex, filter.PageSize, totalCount);
return new PageModel<TEntity>(filter.PageIndex, totalCount, filter.PageSize, list); return new ServicePageResult<TEntity>(filter.PageIndex, totalCount, filter.PageSize, list);
} }

2
Tiobon.Core.Repository/BASE/IBaseRepository.cs
Unescape View File

@ -169,7 +169,7 @@ namespace Tiobon.Core.IRepository.Base
/// <param name="pageSize"></param> /// <param name="pageSize"></param>
/// <param name="orderByFields"></param> /// <param name="orderByFields"></param>
/// <returns></returns> /// <returns></returns>
Task<PageModel<TEntity>> QueryFilterPage([FromFilter] QueryFilter filter); Task<ServicePageResult<TEntity>> QueryFilterPage([FromFilter] QueryFilter filter);
/// <summary> /// <summary>
/// 三表联查 /// 三表联查

21
Tiobon.Core.Services/BASE/BaseServices.cs
Unescape View File

@ -3,6 +3,7 @@ using System.Linq.Expressions;
using System.Reflection; using System.Reflection;
using AgileObjects.AgileMapper; using AgileObjects.AgileMapper;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
using SqlSugar; using SqlSugar;
using Tiobon.Core.Common; using Tiobon.Core.Common;
using Tiobon.Core.Common.Extensions; using Tiobon.Core.Common.Extensions;
@ -294,12 +295,6 @@ namespace Tiobon.Core.Services.BASE
{ {
return await BaseDal.QueryPage(whereExpression, pageIndex, pageSize, orderByFileds); return await BaseDal.QueryPage(whereExpression, pageIndex, pageSize, orderByFileds);
} }
public async Task<PageModel<TEntity>> QueryFilterPage([FromFilter] QueryFilter filter)
{
return await BaseDal.QueryFilterPage(filter);
}
public async Task<List<TResult>> QueryMuch<T, T2, T3, TResult>(Expression<Func<T, T2, T3, object[]>> joinExpression, Expression<Func<T, T2, T3, TResult>> selectExpression, Expression<Func<T, T2, T3, bool>> whereLambda = null) where T : class, new() public async Task<List<TResult>> QueryMuch<T, T2, T3, TResult>(Expression<Func<T, T2, T3, object[]>> joinExpression, Expression<Func<T, T2, T3, TResult>> selectExpression, Expression<Func<T, T2, T3, bool>> whereLambda = null) where T : class, new()
{ {
return await BaseDal.QueryMuch(joinExpression, selectExpression, whereLambda); return await BaseDal.QueryMuch(joinExpression, selectExpression, whereLambda);
@ -409,7 +404,7 @@ namespace Tiobon.Core.Services.BASE
/// <summary> /// <summary>
/// 写入实体数据 /// 写入实体数据
/// </summary> /// </summary>
/// <param name="entity">博文实体类</param> /// <param name="entity">实体类</param>
/// <returns></returns> /// <returns></returns>
public async Task<long> Add(TInsertDto entity) public async Task<long> Add(TInsertDto entity)
{ {
@ -530,6 +525,14 @@ namespace Tiobon.Core.Services.BASE
return await BaseDal.DeleteById(id); return await BaseDal.DeleteById(id);
} }
public async Task<bool> DeleteById1(object id)
{
var entity = await BaseDal.QueryById(id);
BasePoco ent = entity as BasePoco;
ent.IsEnable = 0;
return await BaseDal.Update(entity);
}
/// <summary> /// <summary>
/// 删除指定ID集合的数据(批量删除) /// 删除指定ID集合的数据(批量删除)
/// </summary> /// </summary>
@ -698,11 +701,11 @@ namespace Tiobon.Core.Services.BASE
return await BaseDal.QueryPage(whereExpression, pageIndex, pageSize, orderByFileds); return await BaseDal.QueryPage(whereExpression, pageIndex, pageSize, orderByFileds);
} }
public async Task<PageModel<TEntityDto>> QueryFilterPage([FromFilter] QueryFilter filter) public async Task<ServicePageResult<TEntityDto>> QueryFilterPage([FromFilter] QueryFilter filter)
{ {
var data = await BaseDal.QueryFilterPage(filter); var data = await BaseDal.QueryFilterPage(filter);
return new PageModel<TEntityDto>(filter.PageIndex, data.dataCount, filter.PageSize, Mapper.Map(data.data).ToANew<List<TEntityDto>>()); return new ServicePageResult<TEntityDto>(filter.PageIndex, data.TotalCount, filter.PageSize, Mapper.Map(data.Data).ToANew<List<TEntityDto>>());
} }

Write Preview
Loading…
Cancel
Save