From 8418cfa56e0adcf033a7916fc42ffd3f1d3303e0 Mon Sep 17 00:00:00 2001 From: zpc Date: Sun, 14 Jul 2024 15:42:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9E=E4=BD=93=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DbSqlServer/Db_MiaoYu/MiaoYuContext.cs | 30 ++++++++++++++++++- .../DbSqlServer/Db_MiaoYu/T_Character.cs | 10 +++++++ .../DbSqlServer/Db_MiaoYu/T_Image_Config.cs | 26 ++++++++++++++++ .../DbSqlServer/Db_MiaoYu/T_User_Char.cs | 10 +++---- .../Dto/Character/CharacterCache.cs | 2 +- 5 files changed, 71 insertions(+), 7 deletions(-) create mode 100644 src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_Image_Config.cs diff --git a/src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/MiaoYuContext.cs b/src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/MiaoYuContext.cs index 2cc9ab4..70593d5 100644 --- a/src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/MiaoYuContext.cs +++ b/src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/MiaoYuContext.cs @@ -68,6 +68,11 @@ public partial class MiaoYuContext : MultiTenantDbContext//DbContext /// public virtual DbSet T_Chat { get; set; } + /// + /// 图片表 + /// + public virtual DbSet T_Image_Config { get; set; } + /// /// /// @@ -112,6 +117,7 @@ public partial class MiaoYuContext : MultiTenantDbContext//DbContext entity.Property(e => e.Id) .ValueGeneratedNever() .HasComment("人物id"); + entity.Property(e => e.BgImg).HasComment("背景图片"); entity.Property(e => e.Biography) .HasMaxLength(500) .HasComment("人物简介"); @@ -119,6 +125,7 @@ public partial class MiaoYuContext : MultiTenantDbContext//DbContext .HasComment("创建时间") .HasColumnType("datetime"); entity.Property(e => e.Gender).HasComment("性别0男1女2其他"); + entity.Property(e => e.IconImg).HasComment("角色头像"); entity.Property(e => e.ModelConfigId).HasComment("模型Id"); entity.Property(e => e.Name) .HasMaxLength(50) @@ -290,6 +297,27 @@ public partial class MiaoYuContext : MultiTenantDbContext//DbContext } }); + modelBuilder.Entity(entity => + { + entity.HasKey(e => e.Id).HasName("PK__T_Image___3214EC072BCFE4E5"); + + entity.ToTable(tb => tb.HasComment("图片表")); + + entity.Property(e => e.ImageId).HasComment("图片Id"); + entity.Property(e => e.Name) + .HasMaxLength(50) + .HasComment("图片名称"); + entity.Property(e => e.TenantId).HasComment("租户"); + entity.Property(e => e.Url) + .HasMaxLength(500) + .HasComment("图片地址"); + //添加全局筛选器 + if (this.TenantInfo != null) + { + entity.HasQueryFilter(it => it.TenantId == this.TenantInfo.TenantId); + } + }); + modelBuilder.Entity(entity => { entity.HasKey(e => e.Id).HasName("PK__T_Model___3214EC074121E040"); @@ -373,7 +401,7 @@ public partial class MiaoYuContext : MultiTenantDbContext//DbContext entity.Property(e => e.CreateAt) .HasComment("创建时间") .HasColumnType("datetime"); - entity.Property(e => e.IsEnable).HasComment("是否启用"); + entity.Property(e => e.IsDelete).HasComment("是否删除"); entity.Property(e => e.ModelConfigId).HasComment("使用模型Id"); entity.Property(e => e.SessionId).HasComment("会话Id"); entity.Property(e => e.SessionName) diff --git a/src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_Character.cs b/src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_Character.cs index cac01e1..35313c9 100644 --- a/src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_Character.cs +++ b/src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_Character.cs @@ -57,4 +57,14 @@ public partial class T_Character: MultiTenantEntity /// 人物初始设定 /// public string? System { get; set; } + + /// + /// 背景图片 + /// + public int? BgImg { get; set; } + + /// + /// 角色头像 + /// + public int? IconImg { get; set; } } diff --git a/src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_Image_Config.cs b/src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_Image_Config.cs new file mode 100644 index 0000000..a593bd1 --- /dev/null +++ b/src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_Image_Config.cs @@ -0,0 +1,26 @@ + +namespace HuanMeng.MiaoYu.Model.DbSqlServer.Db_MiaoYu; + +/// +/// 图片表 +/// +public partial class T_Image_Config: MultiTenantEntity +{ + public int Id { get; set; } + + + /// + /// 图片Id + /// + public int ImageId { get; set; } + + /// + /// 图片名称 + /// + public string Name { get; set; } = null!; + + /// + /// 图片地址 + /// + public string Url { get; set; } = null!; +} diff --git a/src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_User_Char.cs b/src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_User_Char.cs index db57fd2..002f84d 100644 --- a/src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_User_Char.cs +++ b/src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_User_Char.cs @@ -26,11 +26,6 @@ public partial class T_User_Char: MultiTenantEntity /// public int ModelConfigId { get; set; } - /// - /// 是否启用 - /// - public bool IsEnable { get; set; } - /// /// 用户Id @@ -46,4 +41,9 @@ public partial class T_User_Char: MultiTenantEntity /// 修改时间 /// public DateTime UpdateAt { get; set; } + + /// + /// 是否删除 + /// + public bool IsDelete { get; set; } } diff --git a/src/0-core/HuanMeng.MiaoYu.Model/Dto/Character/CharacterCache.cs b/src/0-core/HuanMeng.MiaoYu.Model/Dto/Character/CharacterCache.cs index 323a08c..e8e1996 100644 --- a/src/0-core/HuanMeng.MiaoYu.Model/Dto/Character/CharacterCache.cs +++ b/src/0-core/HuanMeng.MiaoYu.Model/Dto/Character/CharacterCache.cs @@ -24,6 +24,6 @@ namespace HuanMeng.MiaoYu.Model.Dto.Character /// /// 多少人聊天过 /// - public int UseChatCount { get; set; } + public int LookCount { get; set; } } }