glz/QYZH.InteractiveMagazine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 完成多模块功能迭代与代码重构

Browse Source 
本次提交包含多方面更新：
1. 新增消息类型枚举、杂志标题字段与AI提示词状态管理
2. 重构杂志服务，新增创建杂志接口并统一OSS路径命名规范
3. 调整题库任务结构，将答案解析迁移至独立表并优化关联查询
4. 新增AI提示词无分页查询与状态切换接口
5. 精简任务添加输入DTO，移除冗余字段
6. 修复控制器路由命名大小写不一致问题
This commit is contained in:
glz
2026-06-16 16:54:02 +08:00
parent dbf77c7d50
commit f2f7ec9100
17 changed files with 493 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
QYZH.InteractiveMagazine.Models/Dto/Ai/AiBasePromptDto.cs
View File

@ -78,6 +78,11 @@ public class AiBasePromptOutput
/// </summary>
public bool IsDefault { get; set; }
/// <summary>
/// 状态（1=启用, 0=禁用）
/// </summary>
public int Status { get; set; }
/// <summary>
/// 创建人
/// </summary>

40
QYZH.InteractiveMagazine.Models/Dto/Journal/JournalDto.cs
View File

@ -21,6 +21,11 @@ namespace QYZH.InteractiveMagazine.Models.Dto.Journal
/// </summary>
public string Name { get; set; }
/// <summary>
/// Desc:标题
/// </summary>
public string? Title { get; set; }
/// <summary>
/// Desc:总页数
/// </summary>
@ -31,7 +36,6 @@ namespace QYZH.InteractiveMagazine.Models.Dto.Journal
/// </summary>
public int VerifyPage { get; set; }
/// <summary>
/// Desc:状态
@ -105,41 +109,19 @@ namespace QYZH.InteractiveMagazine.Models.Dto.Journal
set => _pdfPreviewUrl = value;
}
/// <summary>
/// Desc:结论json
/// </summary>
public object? Conclusion { get; set; }
/// <summary>
/// Desc:思路导读
/// Desc:
/// </summary>
public string? Guide { get; set; }
/// <summary>
/// Desc:家长指导
/// </summary>
public string? Tutelage { get; set; }
/// <summary>
/// Desc:所属机构列表
/// </summary>
public Dictionary<long, string>? Organization { get; set; }
//public List<Dictionary<long, string>> Organizations => Organization.Select(c => new Dictionary<long, string>() { { c.Key, c.Value } }).ToList();
/// <summary>
/// Desc:副标题
/// </summary>
public string? Title { get; set; }
/// <summary>
/// 年级
/// </summary>
public int Grade { get; set; }
public string? Description { get; set; }
/// <summary>
/// Desc:下载书籍页码点阵码PDF文件名称
/// </summary>
public string? DownloadJournalPagePdfName { get; set; }
public string CreatedBy { get; set; }
public DateTime CreatedAt { get; set; }
}
}

64
QYZH.InteractiveMagazine.Models/Dto/Journal/JournalEditDto.cs
View File

@ -8,28 +8,24 @@ using System.Threading.Tasks;
namespace QYZH.InteractiveMagazine.Models.Dto.Journal
{
public partial class JournalEditDto
public partial class JournalAddDto
{
/// <summary>
/// Desc:主键id
/// </summary>
public long Id { get; set; }
/// <summary>
/// Desc:书籍名称
/// </summary>
public string Name { get; set; }
/// <summary>
/// Desc:标题
/// </summary>
public string? Title { get; set; }
/// <summary>
/// Desc:总页数
/// </summary>
public int TotalPage { get; set; }
/// <summary>
/// Desc:校验页数
/// </summary>
public int VerifyPage { get; set; }
/// <summary>
/// Desc:状态
@ -57,10 +53,6 @@ namespace QYZH.InteractiveMagazine.Models.Dto.Journal
[JsonIgnore]
public int Revision { get; set; }
/// <summary>
/// Desc:审查结果(默认0 1通过 -1驳回)
/// </summary>
public int Result { get; set; }
/// <summary>
/// Desc:封面
@ -75,42 +67,20 @@ namespace QYZH.InteractiveMagazine.Models.Dto.Journal
/// <summary>
/// Desc:pdf预览地址
/// </summary>
public string PdfPreviewUrl { get; set; }
public string? PdfPreviewUrl { get; set; }
}
public partial class JournalEditDto: JournalAddDto
{
/// <summary>
/// Desc:主键id
/// </summary>
public long Id { get; set; }
/// <summary>
/// Desc:结论json
/// Desc:状态
/// </summary>
public object Conclusion { get; set; }
public JournalStatusEnum Status { get; set; }
/// <summary>
/// Desc:思路导读
/// </summary>
public string Guide { get; set; }
/// <summary>
/// Desc:家长指导
/// </summary>
[JsonIgnore]
public string Tutelage { get; set; }
/// <summary>
/// Desc:所属机构
/// </summary>
public long[] OrganizationIds { get; set; }
///// <summary>
///// Desc:所属机构
///// </summary>
//public string OrganizationName { get; set; }
/// <summary>
/// Desc:副标题
/// </summary>
public string Title { get; set; }
/// <summary>
/// 年级
/// </summary>
public int Grade { get; set; }
}
}

29
QYZH.InteractiveMagazine.Models/Dto/Journal/JournalPageTaskAddInput.cs
View File

@ -29,34 +29,5 @@ namespace QYZH.InteractiveMagazine.Models.Dto.Journal
/// </summary>
public TaskBankTypeEnum Type { get; set; }
/// <summary>
/// 学科Id
/// </summary>
public long SubjectId { get; set; }
/// <summary>
/// 分数
/// </summary>
public float Score { get; set; }
/// <summary>
/// 回答时间(秒)
/// </summary>
public int AnswerTime { get; set; }
/// <summary>
/// 关联的知识点ids
/// </summary>
public string KnowledgePointIds { get; set; }
/// <summary>
/// 关键解析
/// </summary>
public string KeywordAnalysis { get; set; }
/// <summary>
/// 问题内容
/// </summary>
public string Task { get; set; }
}
}

7
QYZH.InteractiveMagazine.Models/Entity/Journal.cs
View File

@ -20,6 +20,13 @@ namespace QYZH.InteractiveMagazine.Models.Entity
/// </summary>
public string Name { get; set; }
/// <summary>
/// Desc:标题
/// Default:
/// Nullable:True
/// </summary>
public string Title { get; set; }
/// <summary>
/// Desc:总页数
/// Default:

79
QYZH.InteractiveMagazine.Models/Entity/JournalPageTask.cs
View File

@ -52,21 +52,6 @@ namespace QYZH.InteractiveMagazine.Models.Entity
/// </summary>
public string Task {get;set;}
/// <summary>
/// Desc:答案
/// Default:
/// Nullable:True
/// </summary>
public string Answer {get;set;}
/// <summary>
/// Desc:解析
/// Default:
/// Nullable:True
/// </summary>
public string Analysis {get;set;}
/// <summary>
/// Desc:分组
/// Default:
@ -88,13 +73,6 @@ namespace QYZH.InteractiveMagazine.Models.Entity
/// </summary>
public string TaskUrl {get;set;}
/// <summary>
/// Desc:任务分数
/// Default:0
/// Nullable:False
/// </summary>
public float Score {get;set;}
/// <summary>
/// Desc:选项
/// Default:
@ -102,35 +80,6 @@ namespace QYZH.InteractiveMagazine.Models.Entity
/// </summary>
public string Options {get;set;}
/// <summary>
/// Desc:回答时间(秒)
/// Default:0
/// Nullable:False
/// </summary>
public int AnswerTime {get;set;}
/// <summary>
/// Desc:关键解析json
/// Default:
/// Nullable:True
/// </summary>
public string KeywordAnalysis {get;set;}
/// <summary>
/// Desc:成长值设置
/// Default:0
/// Nullable:True
/// </summary>
public int? GrowthPoint {get;set;}
/// <summary>
/// Desc:积分设置
/// Default:0
/// Nullable:True
/// </summary>
public int? Points {get;set;}
/// <summary>
/// Desc:是否需要AI处理
/// Default:true
@ -152,33 +101,5 @@ namespace QYZH.InteractiveMagazine.Models.Entity
/// </summary>
public string CustomPrompt {get;set;}
/// <summary>
/// Desc:理解力评分
/// Default:0
/// Nullable:False
/// </summary>
public float Comprehension {get;set;}
/// <summary>
/// Desc:判断力评分
/// Default:0
/// Nullable:False
/// </summary>
public float Judgment {get;set;}
/// <summary>
/// Desc:表达力评分
/// Default:0
/// Nullable:False
/// </summary>
public float Expression {get;set;}
/// <summary>
/// Desc:说服力评分
/// Default:0
/// Nullable:False
/// </summary>
public float Persuasiveness {get;set;}
}
}

104
QYZH.InteractiveMagazine.Models/Entity/JournalPageTaskAnswer.cs Normal file
View File

@ -0,0 +1,104 @@
using SqlSugar;
using System;
using System.Linq;
using System.Text;
namespace QYZH.InteractiveMagazine.Models.Entity
{
///<summary>
///杂志任务答案表;
///</summary>
[SugarTable("JournalPageTaskAnswer")]
public partial class JournalPageTaskAnswer : SqlSugarBaseEntity
{
public JournalPageTaskAnswer(){
}
/// <summary>
/// Desc:任务id
/// Default:
/// Nullable:False
/// </summary>
public long JournalPageTaskId {get;set;}
/// <summary>
/// Desc:答案
/// Default:
/// Nullable:True
/// </summary>
public string Answer {get;set;}
/// <summary>
/// Desc:解析
/// Default:
/// Nullable:True
/// </summary>
public string Analysis {get;set;}
/// <summary>
/// Desc:回答时间(秒)
/// Default:0
/// Nullable:False
/// </summary>
public int AnswerTime {get;set;}
/// <summary>
/// Desc:任务分数
/// Default:0
/// Nullable:False
/// </summary>
public float Score {get;set;}
/// <summary>
/// Desc:关键解析json
/// Default:
/// Nullable:True
/// </summary>
public string KeywordAnalysis {get;set;}
/// <summary>
/// Desc:成长值设置
/// Default:0
/// Nullable:True
/// </summary>
public int? GrowthPoint {get;set;}
/// <summary>
/// Desc:积分设置
/// Default:0
/// Nullable:True
/// </summary>
public int? Points {get;set;}
/// <summary>
/// Desc:理解力评分
/// Default:0
/// Nullable:False
/// </summary>
public float Comprehension {get;set;}
/// <summary>
/// Desc:判断力评分
/// Default:0
/// Nullable:False
/// </summary>
public float Judgment {get;set;}
/// <summary>
/// Desc:表达力评分
/// Default:0
/// Nullable:False
/// </summary>
public float Expression {get;set;}
/// <summary>
/// Desc:说服力评分
/// Default:0
/// Nullable:False
/// </summary>
public float Persuasiveness {get;set;}
}
}

5
QYZH.InteractiveMagazine.Models/Enum/MessageTypeEnum.cs
View File

@ -7,6 +7,11 @@ namespace QYZH.InteractiveMagazine.Models.Enum;
/// </summary>
public enum MessageTypeEnum
{
/// <summary>
/// 消息
/// </summary>
[Description("消息")]
Message = 0,
/// <summary>
/// 文章
/// </summary>