forked from gongxuegit/tiku-backend.net
feat: add scoreline dynamic records
This commit is contained in:
@@ -287,6 +287,75 @@ public sealed class DirectMajorDto
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class DirectScorelineFieldDto
|
||||
{
|
||||
public Guid? Id { get; set; }
|
||||
public Guid? RegionId { get; set; }
|
||||
public string? LegacyId { get; set; }
|
||||
public required string FieldKey { get; set; }
|
||||
public required string FieldName { get; set; }
|
||||
public string? FieldType { get; set; }
|
||||
public string? Unit { get; set; }
|
||||
public bool? IsFilter { get; set; }
|
||||
public bool? IsRequired { get; set; }
|
||||
public bool? IsVisible { get; set; }
|
||||
public bool? IsTrend { get; set; }
|
||||
public JsonElement Options { get; set; } = JsonDefaults.Array();
|
||||
public string? Placeholder { get; set; }
|
||||
public string? Description { get; set; }
|
||||
public int? Order { get; set; }
|
||||
|
||||
public ScorelineFieldCommand ToCommand()
|
||||
{
|
||||
return new ScorelineFieldCommand(
|
||||
Id,
|
||||
RegionId,
|
||||
LegacyId,
|
||||
FieldKey,
|
||||
FieldName,
|
||||
FieldType,
|
||||
Unit,
|
||||
IsFilter,
|
||||
IsRequired,
|
||||
IsVisible,
|
||||
IsTrend,
|
||||
Options,
|
||||
Placeholder,
|
||||
Description,
|
||||
Order);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class DirectScorelineRecordDto
|
||||
{
|
||||
public Guid? Id { get; set; }
|
||||
public Guid? RegionId { get; set; }
|
||||
public Guid? SchoolId { get; set; }
|
||||
public Guid? MajorId { get; set; }
|
||||
public string? LegacyId { get; set; }
|
||||
|
||||
[Range(1900, 3000)]
|
||||
public int Year { get; set; }
|
||||
|
||||
public string? SchoolName { get; set; }
|
||||
public string? MajorName { get; set; }
|
||||
public JsonElement FieldValues { get; set; } = JsonDefaults.Object();
|
||||
|
||||
public ScorelineRecordCommand ToCommand()
|
||||
{
|
||||
return new ScorelineRecordCommand(
|
||||
Id,
|
||||
RegionId,
|
||||
SchoolId,
|
||||
MajorId,
|
||||
LegacyId,
|
||||
Year,
|
||||
SchoolName,
|
||||
MajorName,
|
||||
FieldValues);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class DirectVideoDto
|
||||
{
|
||||
public Guid? Id { get; set; }
|
||||
|
||||
46
Tiku.Api/Contracts/ScorelineDtos.cs
Normal file
46
Tiku.Api/Contracts/ScorelineDtos.cs
Normal file
@@ -0,0 +1,46 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using Tiku.Application.Scoreline;
|
||||
|
||||
namespace Tiku.Api.Contracts;
|
||||
|
||||
public sealed class ScorelineQueryDto
|
||||
{
|
||||
[StringLength(100)]
|
||||
public string? TenantCode { get; set; }
|
||||
|
||||
public Guid? RegionId { get; set; }
|
||||
public Guid? SchoolId { get; set; }
|
||||
public Guid? MajorId { get; set; }
|
||||
|
||||
[StringLength(100)]
|
||||
public string? Keyword { get; set; }
|
||||
|
||||
[Range(1900, 3000)]
|
||||
public int? Year { get; set; }
|
||||
|
||||
[Range(1, 10000)]
|
||||
public int? Page { get; set; }
|
||||
|
||||
[Range(1, 200)]
|
||||
public int? PageSize { get; set; }
|
||||
|
||||
[Range(1, 2000)]
|
||||
public int? Limit { get; set; }
|
||||
|
||||
public ScorelineFilter ToFilter(
|
||||
Guid tenantId,
|
||||
IReadOnlyCollection<ScorelineDynamicFilter>? dynamicFilters = null)
|
||||
{
|
||||
return new ScorelineFilter(
|
||||
tenantId,
|
||||
RegionId,
|
||||
SchoolId,
|
||||
MajorId,
|
||||
Keyword,
|
||||
Year,
|
||||
Page,
|
||||
PageSize,
|
||||
Limit,
|
||||
dynamicFilters);
|
||||
}
|
||||
}
|
||||
126
Tiku.Api/Controllers/ScorelineController.cs
Normal file
126
Tiku.Api/Controllers/ScorelineController.cs
Normal file
@@ -0,0 +1,126 @@
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Tiku.Api.Contracts;
|
||||
using Tiku.Application.Catalog;
|
||||
using Tiku.Application.Scoreline;
|
||||
using Tiku.Application.Security;
|
||||
using Tiku.Domain.Tenancy;
|
||||
using Tiku.Infrastructure.Persistence;
|
||||
|
||||
namespace Tiku.Api.Controllers;
|
||||
|
||||
[ApiController]
|
||||
[AllowAnonymous]
|
||||
[Produces("application/json")]
|
||||
[Route("api/scoreline")]
|
||||
public sealed class ScorelineController(
|
||||
IScorelineQueryService scorelineQueryService,
|
||||
ICurrentTenant currentTenant,
|
||||
TikuDbContext dbContext) : ControllerBase
|
||||
{
|
||||
private static readonly string[] DynamicPrefixes = ["field.", "min.", "max."];
|
||||
|
||||
[HttpGet("fields")]
|
||||
[EndpointSummary("查询分数线字段配置")]
|
||||
[ProducesResponseType<CatalogList<ScorelineFieldItem>>(StatusCodes.Status200OK)]
|
||||
[ProducesResponseType<ProblemDetails>(StatusCodes.Status404NotFound)]
|
||||
public async Task<ActionResult<CatalogList<ScorelineFieldItem>>> GetFields(
|
||||
[FromQuery] ScorelineQueryDto query,
|
||||
CancellationToken cancellationToken)
|
||||
{
|
||||
return Ok(await scorelineQueryService.GetFieldsAsync(
|
||||
query.ToFilter(await ResolveTenantIdAsync(query, cancellationToken)),
|
||||
cancellationToken));
|
||||
}
|
||||
|
||||
[HttpGet("records")]
|
||||
[EndpointSummary("分页查询分数线记录")]
|
||||
[ProducesResponseType<ScorelineRecordPage>(StatusCodes.Status200OK)]
|
||||
[ProducesResponseType<ProblemDetails>(StatusCodes.Status404NotFound)]
|
||||
public async Task<ActionResult<ScorelineRecordPage>> GetRecords(
|
||||
[FromQuery] ScorelineQueryDto query,
|
||||
CancellationToken cancellationToken)
|
||||
{
|
||||
return Ok(await scorelineQueryService.GetRecordsAsync(
|
||||
query.ToFilter(await ResolveTenantIdAsync(query, cancellationToken), ResolveDynamicFilters()),
|
||||
cancellationToken));
|
||||
}
|
||||
|
||||
[HttpGet("trend")]
|
||||
[EndpointSummary("查询历年分数线趋势")]
|
||||
[ProducesResponseType<CatalogList<ScorelineRecordItem>>(StatusCodes.Status200OK)]
|
||||
[ProducesResponseType<ProblemDetails>(StatusCodes.Status404NotFound)]
|
||||
public async Task<ActionResult<CatalogList<ScorelineRecordItem>>> GetTrend(
|
||||
[FromQuery] ScorelineQueryDto query,
|
||||
CancellationToken cancellationToken)
|
||||
{
|
||||
return Ok(await scorelineQueryService.GetTrendAsync(
|
||||
query.ToFilter(await ResolveTenantIdAsync(query, cancellationToken), ResolveDynamicFilters()),
|
||||
cancellationToken));
|
||||
}
|
||||
|
||||
[HttpGet("years")]
|
||||
[EndpointSummary("查询分数线可用年份")]
|
||||
[ProducesResponseType<CatalogList<int>>(StatusCodes.Status200OK)]
|
||||
[ProducesResponseType<ProblemDetails>(StatusCodes.Status404NotFound)]
|
||||
public async Task<ActionResult<CatalogList<int>>> GetYears(
|
||||
[FromQuery] ScorelineQueryDto query,
|
||||
CancellationToken cancellationToken)
|
||||
{
|
||||
return Ok(await scorelineQueryService.GetYearsAsync(
|
||||
query.ToFilter(await ResolveTenantIdAsync(query, cancellationToken)),
|
||||
cancellationToken));
|
||||
}
|
||||
|
||||
private IReadOnlyCollection<ScorelineDynamicFilter> ResolveDynamicFilters()
|
||||
{
|
||||
var filters = new List<ScorelineDynamicFilter>();
|
||||
foreach (var (key, value) in Request.Query)
|
||||
{
|
||||
var prefix = DynamicPrefixes.FirstOrDefault(key.StartsWith);
|
||||
if (prefix is null)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
var raw = value.FirstOrDefault();
|
||||
if (string.IsNullOrWhiteSpace(raw))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
filters.Add(new ScorelineDynamicFilter(
|
||||
prefix.TrimEnd('.'),
|
||||
key[prefix.Length..],
|
||||
raw.Trim()));
|
||||
}
|
||||
|
||||
return filters;
|
||||
}
|
||||
|
||||
private async Task<Guid> ResolveTenantIdAsync(
|
||||
ScorelineQueryDto query,
|
||||
CancellationToken cancellationToken)
|
||||
{
|
||||
if (currentTenant.TenantId.HasValue)
|
||||
{
|
||||
return currentTenant.TenantId.Value;
|
||||
}
|
||||
|
||||
var tenantCode = query.TenantCode ?? Request.Headers["x-tenant-code"].FirstOrDefault();
|
||||
if (string.IsNullOrWhiteSpace(tenantCode))
|
||||
{
|
||||
throw new TenantNotFoundException();
|
||||
}
|
||||
|
||||
var tenantId = await dbContext.Tenants
|
||||
.Where(tenant =>
|
||||
tenant.Slug == tenantCode.Trim() &&
|
||||
tenant.Status == TenantStatus.Active)
|
||||
.Select(tenant => (Guid?)tenant.Id)
|
||||
.SingleOrDefaultAsync(cancellationToken);
|
||||
|
||||
return tenantId ?? throw new TenantNotFoundException();
|
||||
}
|
||||
}
|
||||
@@ -179,6 +179,46 @@ public sealed class TenantContentDirectController(
|
||||
return Ok(await directContentService.UpsertMajorAsync(ResolveActor(), request.ToCommand(), cancellationToken));
|
||||
}
|
||||
|
||||
[HttpGet("scoreline/fields")]
|
||||
[EndpointSummary("查询管理侧分数线字段")]
|
||||
[ProducesResponseType<CatalogList<ScorelineField>>(StatusCodes.Status200OK)]
|
||||
public async Task<ActionResult<CatalogList<ScorelineField>>> GetScorelineFields(
|
||||
[FromQuery] DirectContentQueryDto query,
|
||||
CancellationToken cancellationToken)
|
||||
{
|
||||
return Ok(await directContentService.GetScorelineFieldsAsync(ResolveActor(), query.ToFilter(), cancellationToken));
|
||||
}
|
||||
|
||||
[HttpPut("scoreline/fields")]
|
||||
[EndpointSummary("新增或更新动态分数线字段")]
|
||||
[ProducesResponseType<ContentManagementResult<ScorelineField>>(StatusCodes.Status200OK)]
|
||||
public async Task<ActionResult<ContentManagementResult<ScorelineField>>> UpsertScorelineField(
|
||||
DirectScorelineFieldDto request,
|
||||
CancellationToken cancellationToken)
|
||||
{
|
||||
return Ok(await directContentService.UpsertScorelineFieldAsync(ResolveActor(), request.ToCommand(), cancellationToken));
|
||||
}
|
||||
|
||||
[HttpGet("scoreline/records")]
|
||||
[EndpointSummary("查询管理侧分数线记录")]
|
||||
[ProducesResponseType<CatalogList<ScorelineRecord>>(StatusCodes.Status200OK)]
|
||||
public async Task<ActionResult<CatalogList<ScorelineRecord>>> GetScorelineRecords(
|
||||
[FromQuery] DirectContentQueryDto query,
|
||||
CancellationToken cancellationToken)
|
||||
{
|
||||
return Ok(await directContentService.GetScorelineRecordsAsync(ResolveActor(), query.ToFilter(), cancellationToken));
|
||||
}
|
||||
|
||||
[HttpPut("scoreline/records")]
|
||||
[EndpointSummary("新增或更新分数线记录")]
|
||||
[ProducesResponseType<ContentManagementResult<ScorelineRecord>>(StatusCodes.Status200OK)]
|
||||
public async Task<ActionResult<ContentManagementResult<ScorelineRecord>>> UpsertScorelineRecord(
|
||||
DirectScorelineRecordDto request,
|
||||
CancellationToken cancellationToken)
|
||||
{
|
||||
return Ok(await directContentService.UpsertScorelineRecordAsync(ResolveActor(), request.ToCommand(), cancellationToken));
|
||||
}
|
||||
|
||||
[HttpGet("scoreline/years")]
|
||||
[EndpointSummary("查询分数线年份")]
|
||||
[ProducesResponseType<CatalogList<int>>(StatusCodes.Status200OK)]
|
||||
|
||||
@@ -7,6 +7,7 @@ using Tiku.Application.Storage;
|
||||
using Tiku.Infrastructure.Content;
|
||||
using Tiku.Infrastructure.Learning;
|
||||
using Tiku.Infrastructure.QuestionBanks;
|
||||
using Tiku.Infrastructure.Scoreline;
|
||||
|
||||
namespace Tiku.Api.Middleware;
|
||||
|
||||
@@ -139,6 +140,16 @@ public sealed class ExceptionHandlingMiddleware(
|
||||
return;
|
||||
}
|
||||
|
||||
if (exception is ScorelineQueryException scorelineQueryException)
|
||||
{
|
||||
await WriteProblemAsync(
|
||||
context,
|
||||
scorelineQueryException.Message,
|
||||
StatusCodes.Status400BadRequest,
|
||||
scorelineQueryException.Code);
|
||||
return;
|
||||
}
|
||||
|
||||
if (exception is ObjectStorageException storageException)
|
||||
{
|
||||
await WriteProblemAsync(
|
||||
|
||||
Reference in New Issue
Block a user