refactor,feat: 批量代码重构与新增业务模块
1. 重命名枚举项与实体字段,修正类型引用 2. 新增IsNull扩展方法与多项字符串处理扩展 3. 新增大量业务DTO、服务接口与枚举定义 4. 重构RabbitMQ服务实现,替换旧版消息队列组件 5. 优化签到服务的宠物喂养事务逻辑 6. 移除冗余的项目引用与旧版消息队列代码 7. 新增Excel导出、导入模板相关工具方法
This commit is contained in:
@ -1,81 +1,145 @@
|
||||
using QYZH.InteractiveMagazine.Common.Extensions;
|
||||
using QYZH.InteractiveMagazine.Common.Helpers;
|
||||
using QYZH.InteractiveMagazine.Models.Enum;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace QYZH.InteractiveMagazine.Models.Dto;
|
||||
|
||||
/// <summary>
|
||||
/// 绑定期刊输入DTO
|
||||
/// </summary>
|
||||
public class BindJournalInput
|
||||
namespace QYZH.InteractiveMagazine.Models.Dto.Journal
|
||||
{
|
||||
/// <summary>
|
||||
/// 期刊模板Id(扫码解析的期刊定义Id)
|
||||
/// </summary>
|
||||
public long JournalId { get; set; }
|
||||
public class JournalDto
|
||||
{
|
||||
/// <summary>
|
||||
/// Desc:主键id
|
||||
/// </summary>
|
||||
public long Id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 实例化期刊Id(扫码解析的具体期刊实例Id,可选)
|
||||
/// </summary>
|
||||
public long Id { get; set; }
|
||||
/// <summary>
|
||||
/// Desc:书籍名称
|
||||
/// </summary>
|
||||
public string Name { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 关联类型: Read(已读), Favorite(收藏), Subscribe(订阅),默认 Subscribe
|
||||
/// </summary>
|
||||
public string Type { get; set; } = UserJournalTypeEnum.Subscribe.ToString();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 绑定期刊输出DTO
|
||||
/// </summary>
|
||||
public class BindJournalOutput
|
||||
{
|
||||
/// <summary>
|
||||
/// 绑定记录Id
|
||||
/// </summary>
|
||||
public long Id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 用户Id
|
||||
/// </summary>
|
||||
public long UserId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 期刊模板Id
|
||||
/// </summary>
|
||||
public long JournalId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 关联类型
|
||||
/// </summary>
|
||||
public string Type { get; set; } = string.Empty;
|
||||
|
||||
/// <summary>
|
||||
/// 状态
|
||||
/// </summary>
|
||||
public string Status { get; set; } = string.Empty;
|
||||
|
||||
/// <summary>
|
||||
/// 绑定时间
|
||||
/// </summary>
|
||||
public DateTime CreatedAt { get; set; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 用户期刊关联查询输入DTO
|
||||
/// </summary>
|
||||
public class UserJournalQueryInput : PageQueryModel
|
||||
{
|
||||
/// <summary>
|
||||
/// 期刊模板Id
|
||||
/// </summary>
|
||||
public long? JournalId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 实例化期刊Id
|
||||
/// </summary>
|
||||
public long Id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 关联类型: Read, Favorite, Subscribe
|
||||
/// </summary>
|
||||
public string? Type { get; set; }
|
||||
/// <summary>
|
||||
/// Desc:总页数
|
||||
/// </summary>
|
||||
public int TotalPage { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Desc:校验页数
|
||||
/// </summary>
|
||||
public int VerifyPage { get; set; }
|
||||
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Desc:状态
|
||||
/// </summary>
|
||||
public JournalStatusEnum Status { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 状态
|
||||
/// </summary>
|
||||
public string ShowStatus => Status.GetDescription();
|
||||
|
||||
private string _pdfUrl;
|
||||
/// <summary>
|
||||
/// pdf预览地址
|
||||
/// </summary>
|
||||
public string PdfUrl
|
||||
{
|
||||
get => DomainHelper.OssFullUrl(_pdfUrl);
|
||||
set => _pdfUrl = value;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Desc:宽度
|
||||
/// </summary>
|
||||
public float Width { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Desc:高度
|
||||
/// </summary>
|
||||
public float Height { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Desc:乐观锁
|
||||
/// </summary>
|
||||
public int Revision { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Desc:审查结果(默认0 1通过 -1驳回)
|
||||
/// </summary>
|
||||
public int Result { get; set; }
|
||||
|
||||
private string _cover;
|
||||
/// <summary>
|
||||
/// 封面
|
||||
/// </summary>
|
||||
public string Cover
|
||||
{
|
||||
get => DomainHelper.OssFullUrl(_cover);
|
||||
set => _cover = value;
|
||||
}
|
||||
|
||||
private string _backCover;
|
||||
/// <summary>
|
||||
/// 封底
|
||||
/// </summary>
|
||||
public string BackCover
|
||||
{
|
||||
get => DomainHelper.OssFullUrl(_backCover);
|
||||
set => _backCover = value;
|
||||
}
|
||||
|
||||
|
||||
private string _pdfPreviewUrl;
|
||||
|
||||
/// <summary>
|
||||
/// pdf预览地址
|
||||
/// </summary>
|
||||
public string PdfPreviewUrl
|
||||
{
|
||||
get => DomainHelper.OssFullUrl(_pdfPreviewUrl);
|
||||
set => _pdfPreviewUrl = value;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Desc:结论json
|
||||
/// </summary>
|
||||
public object? Conclusion { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 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; }
|
||||
|
||||
/// <summary>
|
||||
/// Desc:下载书籍页码点阵码PDF文件名称
|
||||
/// </summary>
|
||||
public string? DownloadJournalPagePdfName { get; set; }
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user