biss/Academic-Affairs-System
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 9 Wiki Activity

课表查询中最明显的性能优化。

Browse Source 
将混合考场查询从“加载整个学期的考场、座位、教师、班级后在内存筛选”，改为在数据库中按班级、教师或教室直接筛选。
改为窄字段投影，避免创建大量 EF 实体和关系对象。
添加查询标签，便于后续在 MySQL 慢查询和链路追踪中定位。
保留现有 HybridCache/可选 Redis 缓存体系，无需新增依赖或数据库迁移。
增加教室、无关教室、监考教师三种回归场景。
This commit is contained in:
biss
2026-07-31 07:56:30 +08:00 Unverified
parent 7bcfa1a7a4
commit a369b4fe02
2 changed files with 103 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Jiaowu.Api/Infrastructure/Timetables/TimetableDataService.cs
+60 -76
View File
@@ -356,72 +356,49 @@ public sealed class TimetableDataService(AppDbContext db)
MapToEntryDto(x, slotLookup)));
// ── Mixed-room sessions (ExamRoomAssignment) ──
// Load all mixed rooms for this term into memory, then filter
var allMixedRooms = await db.ExamRooms.AsNoTracking()
.Where(room =>
room.ExamPlan!.AcademicTermId == academicTermId &&
room.ExamPlan.Status == ExamPlanStatus.Published)
.Include(room => room.ExamPlan)
.Include(room => room.Classroom)
.ThenInclude(c => c!.Building)
.ThenInclude(b => b!.Campus)
.Include(room => room.Invigilators)
.ThenInclude(i => i.Teacher)
.Include(room => room.SessionLinks)
.ThenInclude(link => link.ExamSession)
.ThenInclude(s => s!.TeachingTask)
.ThenInclude(t => t!.Course)
.Include(room => room.SessionLinks)
.ThenInclude(link => link.ExamSession)
.ThenInclude(s => s!.TeachingTask)
.ThenInclude(t => t!.Teachers)
.ThenInclude(tt => tt.Teacher)
.Include(room => room.SessionLinks)
.ThenInclude(link => link.ExamSession)
.ThenInclude(s => s!.TeachingTask)
.ThenInclude(t => t!.Classes)
.ThenInclude(tc => tc.AdministrativeClass)
.Include(room => room.Seats)
// Start from room/session links so the resource predicate stays in SQL.
// Loading every room, seat and roster for the term made a single
// timetable request scale with the entire exam plan.
var mixedQuery = db.ExamRoomSessions.AsNoTracking()
.Where(link =>
link.ExamRoom!.ExamPlan!.AcademicTermId == academicTermId &&
link.ExamRoom.ExamPlan.Status == ExamPlanStatus.Published);
mixedQuery = ApplyMixedResourceFilter(
mixedQuery, resourceType, resourceId, studentId);
var mixedSessions = await mixedQuery
.TagWith("Timetable.LoadMixedExamEntries")
.AsSplitQuery()
.OrderBy(link => link.ExamRoom!.ExamDate)
.ThenBy(link => link.ExamRoom!.StartPeriod)
.ThenBy(link => link.ExamSession!.TeachingTask!.Course!.Code)
.Select(link => new ExamSessionProjection(
link.ExamRoomId,
link.ExamSession!.TeachingTaskId,
link.ExamSession.TeachingTask!.TaskNumber,
link.ExamSession.TeachingTask.Name,
link.ExamSession.TeachingTask.Course!.Code,
link.ExamSession.TeachingTask.Course.Name,
link.ExamSession.TeachingTask.Teachers
.OrderByDescending(t => t.IsPrimary)
.Select(t => t.Teacher!.Name).ToList(),
link.ExamSession.TeachingTask.Classes
.Select(c => c.AdministrativeClass!.Name).ToList(),
link.ExamRoom!.Classroom!.Name,
link.ExamRoom.Classroom.Building!.Name,
link.ExamRoom.Classroom.Building.Campus!.Name,
link.ExamRoom.ExamDate,
link.ExamRoom.StartPeriod,
link.ExamRoom.PeriodCount,
link.ExamRoom.ExamPlan!.Name,
link.ExamRoom.Invigilators
.Select(i => i.Teacher!.Name).ToList(),
null,
link.ExamRoom.UpdatedAt))
.ToListAsync(cancellationToken);
foreach (var room in allMixedRooms)
{
foreach (var link in room.SessionLinks)
{
var session = link.ExamSession;
if (session == null || session.TeachingTask == null) continue;
// Apply resource filter in memory
if (!MatchesMixedResource(
room, session, resourceType, resourceId, studentId))
continue;
result.Add(MapToEntryDto(new ExamSessionProjection(
room.Id,
session.TeachingTaskId,
session.TeachingTask.TaskNumber,
session.TeachingTask.Name,
session.TeachingTask.Course!.Code,
session.TeachingTask.Course.Name,
session.TeachingTask.Teachers
.OrderByDescending(t => t.IsPrimary)
.Select(t => t.Teacher!.Name).ToList(),
session.TeachingTask.Classes
.Select(c => c.AdministrativeClass!.Name).ToList(),
room.Classroom!.Name,
room.Classroom.Building!.Name,
room.Classroom.Building.Campus!.Name,
room.ExamDate,
room.StartPeriod,
room.PeriodCount,
room.ExamPlan!.Name,
room.Invigilators
.Select(i => i.Teacher!.Name).ToList(),
null,
room.UpdatedAt), slotLookup));
}
}
result.AddRange(mixedSessions.Select(x =>
MapToEntryDto(x, slotLookup)));
return result;
}
@@ -535,9 +512,8 @@ public sealed class TimetableDataService(AppDbContext db)
return date.AddDays(1 - dayOfWeek);
}
private static bool MatchesMixedResource(
ExamRoomAssignment room,
ExamSession session,
private static IQueryable<ExamRoomSession> ApplyMixedResourceFilter(
IQueryable<ExamRoomSession> source,
TimetableResourceType resourceType,
Guid resourceId,
Guid? studentId)
@@ -545,20 +521,28 @@ public sealed class TimetableDataService(AppDbContext db)
switch (resourceType)
{
case TimetableResourceType.Classroom:
return room.ClassroomId == resourceId;
return source.Where(link =>
link.ExamRoom!.ClassroomId == resourceId);
case TimetableResourceType.Teacher:
return room.Invigilators.Any(i => i.TeacherId == resourceId) ||
session.TeachingTask!.Teachers.Any(
t => t.TeacherId == resourceId);
return source.Where(link =>
link.ExamRoom!.Invigilators.Any(i =>
i.TeacherId == resourceId) ||
link.ExamSession!.TeachingTask!.Teachers.Any(t =>
t.TeacherId == resourceId));
case TimetableResourceType.Class:
if (studentId.HasValue)
return session.TeachingTask!.Classes.Any(c =>
c.AdministrativeClassId == resourceId) ||
room.Seats.Any(s => s.StudentId == studentId.Value);
return session.TeachingTask!.Classes.Any(c =>
c.AdministrativeClassId == resourceId);
{
return source.Where(link =>
link.ExamSession!.TeachingTask!.Classes.Any(c =>
c.AdministrativeClassId == resourceId) ||
link.ExamRoom!.Seats.Any(s =>
s.StudentId == studentId.Value));
}
return source.Where(link =>
link.ExamSession!.TeachingTask!.Classes.Any(c =>
c.AdministrativeClassId == resourceId));
default:
return true;
return source;
}
}