BaseService调用全部改为POST

master
xiaochanghai 1 year ago
parent f630233c76
commit e0d50ef9ad
  1. 6
      Model/Tiobon.Web.pdm
  2. 14
      Tiobon.Core.Api/Controllers/Base/BaseController.cs
  3. 8
      Tiobon.Core.Api/Controllers/Ghre/Ghre_QuestionController.cs
  4. 39
      Tiobon.Core.Api/Tiobon.Core.Model.xml
  5. 2
      Tiobon.Core.Api/Tiobon.Core.xml
  6. 4
      Tiobon.Core.Model/Base/Ghre/Ghre_Question.Dto.Base.cs
  7. 4
      Tiobon.Core.Model/Models/Ghre/Ghre_Question.cs
  8. 170
      Tiobon.Core.Model/ServiceResult.cs
  9. 19
      Tiobon.Core.Model/ViewModels/Menu.cs
  10. 2
      Tiobon.Core.Services/BASE/BaseServices.cs
  11. 11
      Tiobon.Core.Services/CommonServices.cs
  12. 39
      Tiobon.Core/Tiobon.Core.Model.xml
  13. 2
      Tiobon.Core/Tiobon.Core.xml

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<?PowerDesigner AppLocale="UTF16" ID="{C294868A-C3F3-41AD-98CC-78B6D4E0CC40}" Label="" LastModificationDate="1714290780" Name="一优开发平台" Objects="6470" Symbols="275" Target="Microsoft SQL Server 2008" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="15.0.0.2613"?>
<?PowerDesigner AppLocale="UTF16" ID="{C294868A-C3F3-41AD-98CC-78B6D4E0CC40}" Label="" LastModificationDate="1714468178" Name="一优开发平台" Objects="6470" Symbols="275" Target="Microsoft SQL Server 2008" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="15.0.0.2613"?>
<!-- do not edit this file -->
<Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@ -105658,10 +105658,10 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<o:Column Id="o6335">
<a:ObjectID>2A7151E4-7A47-4EC7-926D-46F18A4EB848</a:ObjectID>
<a:Name>题目编号</a:Name>
<a:Code>QuestionINo</a:Code>
<a:Code>QuestionNo</a:Code>
<a:CreationDate>1713840195</a:CreationDate>
<a:Creator>Administrator</a:Creator>
<a:ModificationDate>1714290772</a:ModificationDate>
<a:ModificationDate>1714468178</a:ModificationDate>
<a:Modifier>Administrator</a:Modifier>
<a:Comment>题目编号</a:Comment>
<a:DataType>nvarchar(32)</a:DataType>

@ -32,7 +32,7 @@ public class BaseController<IServiceBase, TEntity, TEntityDto, TInsertDto, TEdit
/// </summary>
/// <param name="filter">条件</param>
/// <returns></returns>
[HttpGet]
[HttpPost, Route("Query")]
public virtual async Task<ServicePageResult<TEntityDto>> QueryByFilter([FromFilter] QueryFilter filter)
{
var data = (await InvokeServiceAsync("QueryFilterPage", [filter])) as ServicePageResult<TEntityDto>;
@ -73,7 +73,7 @@ public class BaseController<IServiceBase, TEntity, TEntityDto, TInsertDto, TEdit
/// </summary>
/// <param name="Id">主键ID</param>
/// <returns></returns>
[HttpGet("{Id}")]
[HttpPost("Query/{Id}")]
public virtual async Task<ServiceResult<TEntityDto>> QueryById(long Id)
{
var entity1 = await InvokeServiceAsync("QueryById", [Id]);
@ -91,7 +91,7 @@ public class BaseController<IServiceBase, TEntity, TEntityDto, TInsertDto, TEdit
/// </summary>
/// <param name="insertModel"></param>
/// <returns></returns>
[HttpPost]
[HttpPost("Insert")]
public virtual async Task<ServiceResult<string>> Insert([FromBody] TInsertDto insertModel)
{
var data = Success<string>(null, "新增成功");
@ -132,7 +132,7 @@ public class BaseController<IServiceBase, TEntity, TEntityDto, TInsertDto, TEdit
/// <param name="Id">主键ID</param>
/// <param name="editModel"></param>
/// <returns></returns>
[HttpPut("{Id}")]
[HttpPost("Update/{Id}")]
public virtual async Task<ServiceResult> Put(long Id, [FromBody] TEditDto editModel)
{
var data = Success("更新成功");
@ -145,7 +145,7 @@ public class BaseController<IServiceBase, TEntity, TEntityDto, TInsertDto, TEdit
/// 批量更新数据
/// </summary>
/// <param name="editModels"></param>
[HttpPut, Route("BulkUpdate")]
[HttpPost, Route("BulkUpdate")]
public virtual async Task<ServiceResult> BulkUpdate([FromBody] Dictionary<long, TEditDto> editModels)
{
var data = Success("更新成功");
@ -162,7 +162,7 @@ public class BaseController<IServiceBase, TEntity, TEntityDto, TInsertDto, TEdit
/// </summary>
/// <param name="Id">主键ID</param>
/// <returns></returns>
[HttpDelete("{Id}")]
[HttpPost("Delete/{Id}")]
public virtual async Task<ServiceResult> Delete(long Id)
{
var data = Success("删除成功");
@ -180,7 +180,7 @@ public class BaseController<IServiceBase, TEntity, TEntityDto, TInsertDto, TEdit
/// </summary>
/// <param name="Ids">主键IDs</param>
/// <returns></returns>
[HttpDelete, Route("BulkDelete")]
[HttpPost, Route("BulkDelete")]
public virtual async Task<ServiceResult> BulkDelete([FromBody] long[] Ids)
{
var data = Success("删除成功");

@ -23,7 +23,7 @@ public class Ghre_QuestionController : BaseController<IGhre_QuestionServices, Gh
/// </summary>
/// <param name="filter">条件</param>
/// <returns></returns>
[HttpGet]
[HttpPost, Route("Query")]
public override async Task<ServicePageResult<Ghre_QuestionDto>> QueryByFilter([FromFilter] QueryFilter filter)
{
var data = await _service.QueryFilterPage(filter);
@ -35,7 +35,7 @@ public class Ghre_QuestionController : BaseController<IGhre_QuestionServices, Gh
/// </summary>
/// <param name="Id">主键ID</param>
/// <returns></returns>
[HttpGet("{Id}")]
[HttpPost("Query/{Id}")]
public override async Task<ServiceResult<Ghre_QuestionDto>> QueryById(long Id)
{
var entity = await _service.QueryById(Id);
@ -52,7 +52,7 @@ public class Ghre_QuestionController : BaseController<IGhre_QuestionServices, Gh
/// </summary>
/// <param name="insertModel"></param>
/// <returns></returns>
[HttpPost]
[HttpPost("Insert")]
public override async Task<ServiceResult<string>> Insert([FromBody] InsertGhre_QuestionInput insertModel)
{
insertModel.CourseIds = string.Join(";", insertModel.CourseId.Select(x => x));
@ -87,7 +87,7 @@ public class Ghre_QuestionController : BaseController<IGhre_QuestionServices, Gh
/// <param name="Id">主键ID</param>
/// <param name="editModel"></param>
/// <returns></returns>
[HttpPut("{Id}")]
[HttpPost("Update/{Id}")]
public override async Task<ServiceResult> Put(long Id, [FromBody] EditGhre_QuestionInput editModel)
{
await _ghre_QuestionAnswerServices.Delete(x=>x.QuestionId == Id);

@ -721,7 +721,7 @@
课程Ids
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_QuestionBase.QuestionINo">
<member name="P:Tiobon.Core.Model.Models.Ghre_QuestionBase.QuestionNo">
<summary>
题目编号
</summary>
@ -2079,7 +2079,7 @@
课程Ids
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_Question.QuestionINo">
<member name="P:Tiobon.Core.Model.Models.Ghre_Question.QuestionNo">
<summary>
题目编号
</summary>
@ -3695,14 +3695,14 @@
<param name="status"></param>
<returns></returns>
</member>
<member name="T:Tiobon.Core.Model.ServicePageResult`1">
<member name="P:Tiobon.Core.Model.DT_TableDataT`1.DT_TableDataT1">
<summary>
服务层分页响应实体(泛型)
返回数据
</summary>
</member>
<member name="P:Tiobon.Core.Model.ServicePageResult`1.Status">
<member name="T:Tiobon.Core.Model.ServicePageResult`1">
<summary>
状态码
服务层分页响应实体(泛型)
</summary>
</member>
<member name="P:Tiobon.Core.Model.ServicePageResult`1.Success">
@ -3710,36 +3710,11 @@
操作是否成功
</summary>
</member>
<member name="P:Tiobon.Core.Model.ServicePageResult`1.Message">
<member name="P:Tiobon.Core.Model.ServicePageResult`1.message">
<summary>
返回信息
</summary>
</member>
<member name="P:Tiobon.Core.Model.ServicePageResult`1.Page">
<summary>
当前页标
</summary>
</member>
<member name="P:Tiobon.Core.Model.ServicePageResult`1.PageCount">
<summary>
总页数
</summary>
</member>
<member name="P:Tiobon.Core.Model.ServicePageResult`1.TotalCount">
<summary>
数据总数
</summary>
</member>
<member name="P:Tiobon.Core.Model.ServicePageResult`1.PageSize">
<summary>
每页大小
</summary>
</member>
<member name="P:Tiobon.Core.Model.ServicePageResult`1.Data">
<summary>
返回数据
</summary>
</member>
<member name="T:Tiobon.Core.Model.Systems.DataBase.DataBaseReadType">
<summary>
数据库读取类型

@ -232,7 +232,7 @@
</member>
<member name="M:Tiobon.Core.Controllers.CommonController.GetModuleInfoAsync(Tiobon.Core.Model.ModuleParam)">
<summary>
获取菜单
获取模块信息接口
</summary>
<param name="param"></param>
<returns></returns>

@ -35,8 +35,8 @@ namespace Tiobon.Core.Model.Models
/// <summary>
/// 题目编号
/// </summary>
[Display(Name = "QuestionINo"), Description("题目编号"), MaxLength(32, ErrorMessage = "题目编号 不能超过 32 个字符")]
public string QuestionINo { get; set; }
[Display(Name = "QuestionNo"), Description("题目编号"), MaxLength(32, ErrorMessage = "题目编号 不能超过 32 个字符")]
public string QuestionNo { get; set; }
/// <summary>
/// 难易程度

@ -37,8 +37,8 @@ namespace Tiobon.Core.Model.Models
/// <summary>
/// 题目编号
/// </summary>
[Display(Name = "QuestionINo"), Description("题目编号"), MaxLength(32, ErrorMessage = "题目编号 不能超过 32 个字符")]
public string QuestionINo { get; set; }
[Display(Name = "QuestionNo"), Description("题目编号"), MaxLength(32, ErrorMessage = "题目编号 不能超过 32 个字符")]
public string QuestionNo { get; set; }
/// <summary>
/// 难易程度

@ -134,16 +134,109 @@ public class ServiceResult
}
}
//public class ServicePageResult<T>
//{
// /// <summary>
// /// 状态码
// /// </summary>
// public int Status { get; set; } = 200;
// /// <summary>
// /// 操作是否成功
// /// </summary>
// public bool Success { get; set; } = true;
// /// <summary>
// /// 返回信息
// /// </summary>
// public string Message { get; set; } = null;
// /// <summary>
// /// 当前页标
// /// </summary>
// public int Page { get; set; } = 1;
// /// <summary>
// /// 总页数
// /// </summary>
// public int PageCount => (int)Math.Ceiling((decimal)TotalCount / PageSize);
// /// <summary>
// /// 数据总数
// /// </summary>
// public int TotalCount { get; set; } = 0;
// /// <summary>
// /// 每页大小
// /// </summary>
// public int PageSize { set; get; } = 20;
// /// <summary>
// /// 返回数据
// /// </summary>
// public List<T> Data { get; set; }
// public ServicePageResult() { }
// public ServicePageResult(int page, int totalCount, int pageSize, List<T> data)
// {
// this.Page = page;
// this.TotalCount = totalCount;
// PageSize = pageSize;
// this.Data = data;
// }
// public PageModel<TOut> ConvertTo<TOut>()
// {
// return new PageModel<TOut>(Page, TotalCount, PageSize, default);
// }
// public PageModel<TOut> ConvertTo<TOut>(IMapper mapper)
// {
// var model = ConvertTo<TOut>();
// if (Data != null)
// {
// model.data = mapper.Map<List<TOut>>(Data);
// }
// return model;
// }
// public PageModel<TOut> ConvertTo<TOut>(IMapper mapper, Action<IMappingOperationOptions> options)
// {
// var model = ConvertTo<TOut>();
// if (Data != null)
// {
// model.data = mapper.Map<List<TOut>>(Data, options);
// }
// return model;
// }
//}
public class DT_TableDataT<T>
{
/// <summary>
/// 返回数据
/// </summary>
public List<T> DT_TableDataT1 { get; set; } = new List<T>();
public DT_TablePageInfoT DT_TablePageInfoT1 { get; set; } = new DT_TablePageInfoT();
}
public class DT_TablePageInfoT
{
public int PageNum { get; set; }
public int PageSize { get; set; }
public int TotalCount { get; set; }
}
/// <summary>
/// 服务层分页响应实体(泛型)
/// </summary>
public class ServicePageResult<T>
{
/// <summary>
/// 状态码
/// </summary>
public int Status { get; set; } = 200;
public int code { get; set; } = 0;
public string type { get; set; } = "success";
/// <summary>
/// 操作是否成功
/// </summary>
@ -151,67 +244,18 @@ public class ServicePageResult<T>
/// <summary>
/// 返回信息
/// </summary>
public string Message { get; set; } = null;
/// <summary>
/// 当前页标
/// </summary>
public int Page { get; set; } = 1;
/// <summary>
/// 总页数
/// </summary>
public int PageCount => (int)Math.Ceiling((decimal)TotalCount / PageSize);
/// <summary>
/// 数据总数
/// </summary>
public int TotalCount { get; set; } = 0;
/// <summary>
/// 每页大小
/// </summary>
public int PageSize { set; get; } = 20;
/// <summary>
/// 返回数据
/// </summary>
public List<T> Data { get; set; }
public ServicePageResult() { }
public ServicePageResult(int page, int totalCount, int pageSize, List<T> data)
{
this.Page = page;
this.TotalCount = totalCount;
PageSize = pageSize;
this.Data = data;
}
public string message { get; set; } = null;
public PageModel<TOut> ConvertTo<TOut>()
{
return new PageModel<TOut>(Page, TotalCount, PageSize, default);
}
public PageModel<TOut> ConvertTo<TOut>(IMapper mapper)
{
var model = ConvertTo<TOut>();
if (Data != null)
{
model.data = mapper.Map<List<TOut>>(Data);
}
public DT_TableDataT<T> result { get; set; }
return model;
}
public PageModel<TOut> ConvertTo<TOut>(IMapper mapper, Action<IMappingOperationOptions> options)
public ServicePageResult(int page, int totalCount, int pageSize, List<T> data, string message = "查询成功!")
{
var model = ConvertTo<TOut>();
if (Data != null)
{
model.data = mapper.Map<List<TOut>>(Data, options);
}
return model;
var result = new DT_TableDataT<T>();
result.DT_TableDataT1 = data;
result.DT_TablePageInfoT1.PageNum = page;
result.DT_TablePageInfoT1.PageSize = pageSize;
result.DT_TablePageInfoT1.TotalCount = totalCount;
this.message = message;
this.result = result;
}
}

@ -82,15 +82,15 @@ public class TableColumn
public string dataSource { get; set; }
public bool? sortable { get; set; }
public string sortOrder { get; set; }
public string defaultHidden { get; set; }
public string ConfigIsShow { get; set; }
public bool? defaultHidden { get; set; }
public bool? ConfigIsShow { get; set; }
public string filterable { get; set; }
public int width { get; set; }
public string align { get; set; }
public string fixed1 { get; set; }
public bool? editable { get; set; }
public string searchable { get; set; }
public string searchRequired { get; set; }
public bool? searchable { get; set; }
public bool? searchRequired { get; set; }
public string searchColumnSeq { get; set; }
public string multipleSearchValue { get; set; }
public string maxTagCount { get; set; }
@ -101,11 +101,18 @@ public class TableColumn
public bool? isHidden { get; set; }
public bool? isSearched { get; set; }
public int SortNo { get; set; }
public string searchCanOperator { get; set; }
public string searchOperator1 { get; set; }
public List<searchOperator> searchOperator { get; set; }
public string searchColumnDefaultValue { get; set; }
public string AppColumnType { get; set; }
public int pageColumnID { get; set; }
}
public class searchOperator
{
public string @operator { get; set; }
public string operatorDesc { get; set; }
public string operatorIcon { get; set; }
}
public class TableColumn1
{
public string PageSettingQueryId { get; set; }
@ -140,7 +147,7 @@ public class TableColumn1
public string isHidden { get; set; }
public string isSearched { get; set; }
public int SortNo { get; set; }
public string searchCanOperator { get; set; }
public string searchOperator1 { get; set; }
public string searchColumnDefaultValue { get; set; }
public string AppColumnType { get; set; }
public int pageColumnID { get; set; }

@ -785,7 +785,7 @@ public class BaseServices<TEntity, TEntityDto, TInsertDto, TEditDto> : IBaseServ
{
var data = await BaseDal.QueryFilterPage(filter);
return new ServicePageResult<TEntityDto>(filter.PageIndex, data.TotalCount, filter.PageSize, Mapper.Map(data.Data).ToANew<List<TEntityDto>>());
return new ServicePageResult<TEntityDto>(filter.PageIndex, data.result.DT_TablePageInfoT1.TotalCount, filter.PageSize, Mapper.Map(data.result.DT_TableDataT1).ToANew<List<TEntityDto>>());
}

@ -1,13 +1,16 @@
using System.Data;
using AgileObjects.AgileMapper;
using AgileObjects.AgileMapper.Extensions;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using SqlSugar;
using Tiobon.Core.Common;
using Tiobon.Core.Common.DB.Dapper;
using Tiobon.Core.IServices;
using Tiobon.Core.Model;
using Tiobon.Core.Model.Models;
using Tiobon.Core.Services.BASE;
namespace Tiobon.Core.Services;
@ -797,7 +800,7 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
and ParaDetailNo in (select Value from dbo.Fs1_GHR30_SplitString2(searchOperator,','))
order by (select positon from dbo.Fs1_GHR30_SplitString2(searchOperator,',')
where value= ParaDetailNo)
FOR JSON Path ) searchOperator ,
FOR JSON Path ) searchOperator1 ,
iif(ISJSON(searchColumnDefaultValue)=1,JSON_QUERY(searchColumnDefaultValue),null) searchColumnDefaultValue ,
AppColumnType
from [dbo].[#TmpInitPageSettingQuery]
@ -805,6 +808,12 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
sql = string.Format(sql, param.menuName, App.User.ID, param.langId);
var TableColumn = Db.Ado.SqlQuery<TableColumn1>(sql);
result.JM_TableColumnT1.TableColumn = Mapper.Map(TableColumn).ToANew<List<TableColumn>>();
result.JM_TableColumnT1.TableColumn.ForEach(x =>
{
if (!string.IsNullOrWhiteSpace(x.searchOperator1))
x.searchOperator = JsonConvert.DeserializeObject<List<searchOperator>>(x.searchOperator1);
x.searchOperator1 = null;
});
Db.Ado.CommitTran();
sql = @"SELECT Langkey field,

@ -721,7 +721,7 @@
课程Ids
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_QuestionBase.QuestionINo">
<member name="P:Tiobon.Core.Model.Models.Ghre_QuestionBase.QuestionNo">
<summary>
题目编号
</summary>
@ -2079,7 +2079,7 @@
课程Ids
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_Question.QuestionINo">
<member name="P:Tiobon.Core.Model.Models.Ghre_Question.QuestionNo">
<summary>
题目编号
</summary>
@ -3695,14 +3695,14 @@
<param name="status"></param>
<returns></returns>
</member>
<member name="T:Tiobon.Core.Model.ServicePageResult`1">
<member name="P:Tiobon.Core.Model.DT_TableDataT`1.DT_TableDataT1">
<summary>
服务层分页响应实体(泛型)
返回数据
</summary>
</member>
<member name="P:Tiobon.Core.Model.ServicePageResult`1.Status">
<member name="T:Tiobon.Core.Model.ServicePageResult`1">
<summary>
状态码
服务层分页响应实体(泛型)
</summary>
</member>
<member name="P:Tiobon.Core.Model.ServicePageResult`1.Success">
@ -3710,36 +3710,11 @@
操作是否成功
</summary>
</member>
<member name="P:Tiobon.Core.Model.ServicePageResult`1.Message">
<member name="P:Tiobon.Core.Model.ServicePageResult`1.message">
<summary>
返回信息
</summary>
</member>
<member name="P:Tiobon.Core.Model.ServicePageResult`1.Page">
<summary>
当前页标
</summary>
</member>
<member name="P:Tiobon.Core.Model.ServicePageResult`1.PageCount">
<summary>
总页数
</summary>
</member>
<member name="P:Tiobon.Core.Model.ServicePageResult`1.TotalCount">
<summary>
数据总数
</summary>
</member>
<member name="P:Tiobon.Core.Model.ServicePageResult`1.PageSize">
<summary>
每页大小
</summary>
</member>
<member name="P:Tiobon.Core.Model.ServicePageResult`1.Data">
<summary>
返回数据
</summary>
</member>
<member name="T:Tiobon.Core.Model.Systems.DataBase.DataBaseReadType">
<summary>
数据库读取类型

@ -232,7 +232,7 @@
</member>
<member name="M:Tiobon.Core.Controllers.CommonController.GetModuleInfoAsync(Tiobon.Core.Model.ModuleParam)">
<summary>
获取菜单
获取模块信息接口
</summary>
<param name="param"></param>
<returns></returns>

Loading…
Cancel
Save