From 14fbe6397a89b6c88a5e42f7c7d7902f22804d8c Mon Sep 17 00:00:00 2001 From: SpecialX <47072643+wangxiner55@users.noreply.github.com> Date: Wed, 25 Jun 2025 17:25:13 +0800 Subject: [PATCH] CleanExamDto --- Entities/DTO/ExamDto.cs | 68 ------------------- TechHelper.Client/Exam/ExamStruct.cs | 19 ++---- TechHelper.Client/Pages/Exam/ExamCheck.razor | 34 +++++----- .../Context/AutoMapperProFile.cs | 32 ++------- .../Repositories/ExamRepository.cs | 9 --- TechHelper.Server/Services/ClassService.cs | 5 ++ 6 files changed, 32 insertions(+), 135 deletions(-) diff --git a/Entities/DTO/ExamDto.cs b/Entities/DTO/ExamDto.cs index 537f59e..1c675dd 100644 --- a/Entities/DTO/ExamDto.cs +++ b/Entities/DTO/ExamDto.cs @@ -38,77 +38,9 @@ namespace Entities.DTO public string Description { get; set; } = string.Empty; } - - - - - public class ExamDto - { - public Guid? AssignmentId { get; set; } - public string CreaterEmail { get; set; } - public string AssignmentTitle { get; set; } = string.Empty; - public string Description { get; set; } - public string SubjectArea { get; set; } - public QuestionGroupDto ExamStruct { get; set; } = new QuestionGroupDto(); - } - - public class QuestionGroupDto - { - public byte Index { get; set; } - - public string? Title { get; set; } - - public float Score { get; set; } - - public string? Descript { get; set; } - public List SubQuestions { get; set; } = new List(); - public List SubQuestionGroups { get; set; } = new List(); - - public bool ValidQuestionGroup { get; set; } = false; - } - - public class SubQuestionDto - { - - public byte Index { get; set; } - - public string? Stem { get; set; } - - public float Score { get; set; } - - public List Options { get; set; } = new List(); - - public string? SampleAnswer { get; set; } - - public string? QuestionType { get; set; } - public string? DifficultyLevel { get; set; } - - public bool ValidQuestion { get; set; } = false; - - } - public class OptionDto { public string? Value { get; set; } = string.Empty; } - - public static class ExamDtoExtension - { - public static void Convert(this ExamDto examDto) - { - var qg = examDto.ExamStruct; - - } - - public static void Convert(this QuestionGroupDto examDto) - { - if (examDto.ValidQuestionGroup) - { - - } - - } - } - } diff --git a/TechHelper.Client/Exam/ExamStruct.cs b/TechHelper.Client/Exam/ExamStruct.cs index 9e36b90..f6b1627 100644 --- a/TechHelper.Client/Exam/ExamStruct.cs +++ b/TechHelper.Client/Exam/ExamStruct.cs @@ -40,7 +40,7 @@ namespace TechHelper.Client.Exam public static class ExamStructExtensions { - public static ExamStruct GetStruct(this ExamDto dto) + public static ExamStruct GetStruct(this AssignmentDto dto) { if (dto == null) { @@ -49,7 +49,7 @@ namespace TechHelper.Client.Exam var examStruct = new ExamStruct { - Title = dto.AssignmentTitle + Title = dto.Title }; GetSeqRecursive(dto.ExamStruct, null, examStruct.Questions); @@ -64,7 +64,7 @@ namespace TechHelper.Client.Exam /// 当前题目组的父级序号（例如："1", "2.1"）。如果为空，则表示顶级题目组。 /// 用于收集所有生成题目项的列表。 private static void GetSeqRecursive( - QuestionGroupDto currentGroup, + AssignmentQuestionDto currentGroup, string? parentSequence, List allQuestions) { @@ -72,18 +72,7 @@ namespace TechHelper.Client.Exam ? $"{parentSequence}.{currentGroup.Index}" : currentGroup.Index.ToString(); - foreach (var subQuestion in currentGroup.SubQuestions) - { - string fullSequence = $"{currentGroupSequence}.{subQuestion.Index}"; - allQuestions.Add(new ExamStruct.QuestionItem - { - Sequence = fullSequence, - QuestionText = subQuestion.Stem ?? string.Empty, - Score = subQuestion.Score - }); - } - - foreach (var subGroup in currentGroup.SubQuestionGroups) + foreach (var subGroup in currentGroup.ChildrenAssignmentQuestion) { GetSeqRecursive(subGroup, currentGroupSequence, allQuestions); } diff --git a/TechHelper.Client/Pages/Exam/ExamCheck.razor b/TechHelper.Client/Pages/Exam/ExamCheck.razor index d4b7c90..0314b32 100644 --- a/TechHelper.Client/Pages/Exam/ExamCheck.razor +++ b/TechHelper.Client/Pages/Exam/ExamCheck.razor @@ -4,7 +4,7 @@ @page "/exam/check/{ExamID}" -试卷批改预览: @ExamDto.AssignmentTitle +试卷批改预览: @Assignment.Title @if (_isLoading) @@ -74,36 +74,36 @@ else @code { [Parameter] - public string ExamId { get; set; } // 从路由获取的试卷ID + public string ExamId { get; set; } [Inject] - public IExamService ExamService { get; set; } // 注入试卷服务 + public IExamService ExamService { get; set; } [Inject] - private ISnackbar Snackbar { get; set; } // 注入 Snackbar 用于消息提示 + private ISnackbar Snackbar { get; set; } [Inject] - private NavigationManager Navigation { get; set; } // 注入导航管理器 + private NavigationManager Navigation { get; set; } - private MudTable _table = new(); // MudTable 实例引用 - private ExamDto ExamDto { get; set; } = new ExamDto(); // 原始试卷数据 - private ExamStruct _examStruct = new ExamStruct(); // 处理后的试卷结构，包含带序号的题目 + private MudTable _table = new(); + private AssignmentDto Assignment { get; set; } = new AssignmentDto(); + private ExamStruct _examStruct = new ExamStruct(); - private List _students = new List(); // 临时生成的学生列表 - private List _questionsForTable = new List(); // 用于 MudTable 的数据源 + private List _students = new List(); + private List _questionsForTable = new List(); + + private bool _isLoading = true; - private bool _isLoading = true; // 加载状态 - // 在组件初始化时加载数据 protected override async Task OnInitializedAsync() { _isLoading = true; await LoadExamData(); - GenerateTemporaryStudentsAndAnswers(); // 生成学生和初始作答数据 + GenerateTemporaryStudentsAndAnswers(); _isLoading = false; } - // 加载试卷数据的方法 + private async Task LoadExamData() { if (Guid.TryParse(ExamId, out Guid parsedExamId)) @@ -113,13 +113,13 @@ else var result = await ExamService.GetExam(parsedExamId); if (result.Status) { - ExamDto = result.Result as ExamDto ?? new ExamDto(); - _examStruct = ExamDto.GetStruct(); // 将 ExamDto 转换为 ExamStruct + Assignment = result.Result as AssignmentDto ?? new AssignmentDto(); + _examStruct = Assignment.GetStruct(); } else { Snackbar?.Add($"获取试卷失败: {result.Message}", Severity.Error); - Navigation.NavigateTo("/exam/manager"); // 导航回管理页 + Navigation.NavigateTo("/exam/manager"); } } catch (Exception ex) diff --git a/TechHelper.Server/Context/AutoMapperProFile.cs b/TechHelper.Server/Context/AutoMapperProFile.cs index 5d8a88b..60c799c 100644 --- a/TechHelper.Server/Context/AutoMapperProFile.cs +++ b/TechHelper.Server/Context/AutoMapperProFile.cs @@ -23,50 +23,30 @@ namespace TechHelper.Context public AutoMapperProFile() { CreateMap() - .ForMember(dest => dest.Id, opt => opt.Ignore()) // ID由IdentityUser生成 - .ForMember(dest => dest.UserName, opt => opt.MapFrom(src => src.Name)) // 或者 MapFrom(src => src.Name) + .ForMember(dest => dest.Id, opt => opt.Ignore()) + .ForMember(dest => dest.UserName, opt => opt.MapFrom(src => src.Name)) .ForMember(dest => dest.Email, opt => opt.MapFrom(src => src.Email)) .ForMember(dest => dest.PhoneNumber, opt => opt.MapFrom(src => src.PhoneNumber)) - .ForMember(dest => dest.Address, opt => opt.MapFrom(src => src.HomeAddress)) // 映射到 IdentityUser 的 Address 属性 - .ForMember(dest => dest.PasswordHash, opt => opt.Ignore()) // 密码哈希由 UserManager 处理 - .ForMember(dest => dest.EmailConfirmed, opt => opt.Ignore()); // 邮箱确认状态由服务层处理 + .ForMember(dest => dest.Address, opt => opt.MapFrom(src => src.HomeAddress)) + .ForMember(dest => dest.PasswordHash, opt => opt.Ignore()) + .ForMember(dest => dest.EmailConfirmed, opt => opt.Ignore()); CreateMap() .ForMember(d => d.Number, o => o.MapFrom(src => src.Class)).ReverseMap(); - CreateMap() - .ForMember(dest => dest.Id, opt => opt.Ignore()) - .ForMember(dest => dest.Title, opt => opt.MapFrom(src => src.Stem)) - .ForMember(dest => dest.Answer, opt => opt.MapFrom(src => src.SampleAnswer)) - .ForMember(dest => dest.Type, opt => opt.MapFrom(src => EnumMappingHelpers.ParseEnumSafe(src.QuestionType, QuestionType.Unknown))) - .ForMember(dest => dest.DifficultyLevel, opt => opt.MapFrom(src => EnumMappingHelpers.ParseEnumSafe(src.DifficultyLevel, DifficultyLevel.easy))) - .ForMember(dest => dest.SubjectArea, opt => opt.MapFrom(src => EnumMappingHelpers.ParseEnumSafe(src.DifficultyLevel, SubjectAreaEnum.Unknown))) - .ForMember(dest => dest.CreatorId, opt => opt.Ignore()) - .ForMember(dest => dest.CreatedAt, opt => opt.Ignore()) - .ForMember(dest => dest.UpdatedAt, opt => opt.Ignore()) - .ForMember(dest => dest.IsDeleted, opt => opt.Ignore()); - // ============================================================= - // ENTITY -> DTO Mappings (用于读取/查询) - // ============================================================= + CreateMap(); CreateMap().ReverseMap(); - - - // 新增！从实体到新的 DTO 的映射 CreateMap(); CreateMap(); - // ================================================================= - // DTO -> ENTITY Mappings (用于创建/更新) - 现在变得极其简单！ - // ================================================================= CreateMap(); - // 新增！从新的 DTO 到实体的映射 CreateMap(); CreateMap(); diff --git a/TechHelper.Server/Repositories/ExamRepository.cs b/TechHelper.Server/Repositories/ExamRepository.cs index bb61ecd..eae6f33 100644 --- a/TechHelper.Server/Repositories/ExamRepository.cs +++ b/TechHelper.Server/Repositories/ExamRepository.cs @@ -79,15 +79,6 @@ namespace TechHelper.Server.Repositories await _assignmentRepo.InsertAsync(assignment); } - - public async Task AddAsync(QuestionGroupDto qg) - { - if (qg.ValidQuestionGroup) - { - - } - } - public async Task AddAsync(AssignmentQuestion assignment) { } diff --git a/TechHelper.Server/Services/ClassService.cs b/TechHelper.Server/Services/ClassService.cs index 6f95de8..c209980 100644 --- a/TechHelper.Server/Services/ClassService.cs +++ b/TechHelper.Server/Services/ClassService.cs @@ -127,6 +127,11 @@ namespace TechHelper.Services } } + public Task GetClassStudents(ClassDto classDto) + { + throw new NotImplementedException(); + } + public async Task GetUserClass(Guid id) { var tch = await _work.GetRepository().GetAllAsync(predicate: user => user.TeacherId == id, include: i => i