From 54ea3036f59b2a0eb561ac718c9e69bd35def70f Mon Sep 17 00:00:00 2001 From: zpc Date: Wed, 6 Nov 2024 11:31:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Model/CloudGaming.DtoModel/Epg/EpgEnum.cs | 30 ++--- .../Db_Phone/CloudGamingPhoneContext.cs | 71 ++++-------- .../DbSqlServer/Db_Phone/T_Epg_CategoryCfg.cs | 2 +- .../DbSqlServer/Db_Phone/T_Epg_Cfg.cs | 7 +- .../DbSqlServer/Db_Phone/T_GameCBT.cs | 49 ++++----- .../DbSqlServer/Db_Phone/T_Popup.cs | 103 ++++++++---------- 6 files changed, 92 insertions(+), 170 deletions(-) diff --git a/src/CloudGaming/Model/CloudGaming.DtoModel/Epg/EpgEnum.cs b/src/CloudGaming/Model/CloudGaming.DtoModel/Epg/EpgEnum.cs index 9158dd1..3b6f58d 100644 --- a/src/CloudGaming/Model/CloudGaming.DtoModel/Epg/EpgEnum.cs +++ b/src/CloudGaming/Model/CloudGaming.DtoModel/Epg/EpgEnum.cs @@ -19,7 +19,7 @@ namespace CloudGaming.DtoModel.Epg public const string 大厅首页 = "Home"; public const string 热门游戏 = "HotIndex"; public const string 尊享推荐 = "HotTagIndex"; - + public const string banner滚动栏 = "Banner"; public const string 金刚位 = "HallFour"; @@ -74,33 +74,19 @@ namespace CloudGaming.DtoModel.Epg /// /// 对应游戏Id /// - 游戏 = 4, - 充值界面 = 7, - 产品充值 = 8, + 游戏 = 1, /// - /// 对应H5地址 + /// app页面 /// - H5页面 = 9, + app页面 = 2, /// - /// 对应浏览器地址（IOS专用） + /// h5 /// - 外部浏览器 = 10, + h5 = 3, /// - /// 对应游戏id, 跳到游戏房间界面，为空则进联机大厅 + /// webH5 /// - 对战专区游戏 = 11, - /// - /// 对应H5地址——原生地址 - /// - H5页面_原生 = 12, - /// - /// 对应栏目标识：如SubjectIndex，Task，Activity，History等 - /// - 栏目界面 = 21, - /// - /// 对应弹窗Id，显示对应的弹窗 - /// - 弹窗 = 101, + webH5 = 4 } diff --git a/src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_Phone/CloudGamingPhoneContext.cs b/src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_Phone/CloudGamingPhoneContext.cs index 8006955..bb20490 100644 --- a/src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_Phone/CloudGamingPhoneContext.cs +++ b/src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_Phone/CloudGamingPhoneContext.cs @@ -222,11 +222,11 @@ public partial class CloudGamingPhoneContext : MultiTenantDbContext//DbContext modelBuilder.Entity(entity => { - entity.HasKey(e => e.EpgId).HasName("PK_T_VL_UI_EPG_CFG"); + entity.HasKey(e => e.Id).HasName("PK_T_VL_UI_EPG_CFG"); entity.ToTable(tb => tb.HasComment("Epg配置表")); - entity.Property(e => e.EpgId).HasComment("标识"); + entity.Property(e => e.Id).HasComment("标识"); entity.Property(e => e.Channel) .HasMaxLength(50) .IsUnicode(false) @@ -279,11 +279,6 @@ public partial class CloudGamingPhoneContext : MultiTenantDbContext//DbContext entity.Property(e => e.StartEnableTime) .HasComment("启用时间") .HasColumnType("datetime"); - entity.Property(e => e.StyleType) - .HasMaxLength(50) - .IsUnicode(false) - .HasComment("展示样式：more") - .UseCollation("Chinese_PRC_CI_AS"); entity.Property(e => e.Title) .HasMaxLength(50) .HasComment("标题") @@ -347,7 +342,9 @@ public partial class CloudGamingPhoneContext : MultiTenantDbContext//DbContext entity.Property(e => e.ConsumeDiamondNumHour).HasComment("每小时钻石费用"); entity.Property(e => e.ConsumeDiamondNumHourVip).HasComment("每小时VIP钻石费用"); - entity.Property(e => e.CreateTime).HasColumnType("datetime"); + entity.Property(e => e.CreateTime) + .HasComment("创建时间") + .HasColumnType("datetime"); entity.Property(e => e.Desc) .HasMaxLength(200) .HasComment("备注") @@ -355,13 +352,13 @@ public partial class CloudGamingPhoneContext : MultiTenantDbContext//DbContext entity.Property(e => e.FriendlyTips) .HasMaxLength(50) .HasComment("启动提示"); - entity.Property(e => e.GameBgImgId).HasComment("游戏详情也配置背景"); + entity.Property(e => e.GameBgImgId).HasComment("游戏详情背景"); entity.Property(e => e.GameGroup).HasComment("游戏分组：0单机，1steam，2网游"); entity.Property(e => e.GameId) .HasMaxLength(100) .HasComment("游戏Id") .UseCollation("Chinese_PRC_CI_AS"); - entity.Property(e => e.GameImageId).HasComment("游戏Icon"); + entity.Property(e => e.GameImageId).HasComment("游戏库Icon图"); entity.Property(e => e.GameLoadBgImageId).HasComment("游戏加载图"); entity.Property(e => e.GameLoadTime).HasComment("Loading时间"); entity.Property(e => e.GameName) @@ -390,27 +387,14 @@ public partial class CloudGamingPhoneContext : MultiTenantDbContext//DbContext .HasMaxLength(30) .HasComment("评分") .UseCollation("Chinese_PRC_CI_AS"); + entity.Property(e => e.TenantId).HasComment("租户"); entity.Property(e => e.Title2) .HasMaxLength(200) + .HasComment("副标题") .UseCollation("Chinese_PRC_CI_AS"); - entity.Property(e => e.UpdateTime).HasColumnType("datetime"); - entity.Property(e => e.VideoIdentification) - .HasMaxLength(200) - .HasComment("视频标识") - .UseCollation("Chinese_PRC_CI_AS"); - entity.Property(e => e.VideoUrl) - .HasMaxLength(500) - .IsUnicode(false) - .HasComment("视频地址") - .UseCollation("Chinese_PRC_CI_AS"); - entity.Property(e => e.VipContinent) - .HasMaxLength(1000) - .HasComment("洲") - .UseCollation("Chinese_PRC_CI_AS"); - entity.Property(e => e.VipCountryName) - .HasMaxLength(1000) - .HasComment("vip国家") - .UseCollation("Chinese_PRC_CI_AS"); + entity.Property(e => e.UpdateTime) + .HasComment("修改时间") + .HasColumnType("datetime"); entity.Property(e => e.VipTypeLimit) .HasDefaultValue(1) .HasComment("会员等级限制"); @@ -705,46 +689,31 @@ public partial class CloudGamingPhoneContext : MultiTenantDbContext//DbContext entity.ToTable(tb => tb.HasComment("通用弹框配置")); - entity.Property(e => e.BossId) - .HasMaxLength(20) + entity.Property(e => e.BgImageId).HasComment("弹框背景图"); + entity.Property(e => e.Btn_Close).HasComment("关闭按钮"); + entity.Property(e => e.Btn_OK).HasComment("确认按钮"); + entity.Property(e => e.Channel) + .HasMaxLength(50) .HasComment("上线渠道号") .UseCollation("Chinese_PRC_CI_AS"); - entity.Property(e => e.Btn_Bg).HasComment("弹框背景图"); - entity.Property(e => e.Btn_Close) - .HasDefaultValue(0) - .HasComment("关闭按钮图片"); - entity.Property(e => e.Btn_OK) - .HasDefaultValue(0) - .HasComment("确认按钮图片"); entity.Property(e => e.CreateTime) .HasComment("创建时间") .HasColumnType("datetime"); entity.Property(e => e.Desc) .HasMaxLength(100) + .HasComment("备注") .UseCollation("Chinese_PRC_CI_AS"); - entity.Property(e => e.EndTime) - .HasComment("结束时间") - .HasColumnType("datetime"); - entity.Property(e => e.Extend1) - .HasMaxLength(200) - .HasComment("扩展参数1") - .UseCollation("Chinese_PRC_CI_AS"); - entity.Property(e => e.ImageId_Text) - .HasDefaultValue(0) - .HasComment("内容图片Id"); entity.Property(e => e.IsOnline).HasComment("是否启用"); entity.Property(e => e.Name) .HasMaxLength(100) - .HasComment("弹框名字") + .HasComment("弹框名称") .UseCollation("Chinese_PRC_CI_AS"); entity.Property(e => e.OrderId).HasComment("排序"); entity.Property(e => e.PlatformId) .HasMaxLength(20) .HasComment("上线平台") .UseCollation("Chinese_PRC_CI_AS"); - entity.Property(e => e.StartTime) - .HasComment("开始时间") - .HasColumnType("datetime"); + entity.Property(e => e.TenantId).HasComment("租户"); entity.Property(e => e.Text) .HasComment("弹窗显示文字") .UseCollation("Chinese_PRC_CI_AS"); diff --git a/src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_Phone/T_Epg_CategoryCfg.cs b/src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_Phone/T_Epg_CategoryCfg.cs index 30511ee..8aef8b6 100644 --- a/src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_Phone/T_Epg_CategoryCfg.cs +++ b/src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_Phone/T_Epg_CategoryCfg.cs @@ -1,4 +1,4 @@ -using System; +using System; namespace CloudGaming.Model.DbSqlServer.Db_Phone; diff --git a/src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_Phone/T_Epg_Cfg.cs b/src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_Phone/T_Epg_Cfg.cs index 5928656..07aa1b4 100644 --- a/src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_Phone/T_Epg_Cfg.cs +++ b/src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_Phone/T_Epg_Cfg.cs @@ -12,7 +12,7 @@ public partial class T_Epg_Cfg: MultiTenantEntity /// /// 标识 /// - public virtual int EpgId { get; set; } + public virtual int Id { get; set; } /// /// epg分组 @@ -69,11 +69,6 @@ public partial class T_Epg_Cfg: MultiTenantEntity /// public virtual int CornerIconId { get; set; } - /// - /// 展示样式：more - /// - public virtual string? StyleType { get; set; } - /// /// 更新时间 /// diff --git a/src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_Phone/T_GameCBT.cs b/src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_Phone/T_GameCBT.cs index 8852e03..d66d7f5 100644 --- a/src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_Phone/T_GameCBT.cs +++ b/src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_Phone/T_GameCBT.cs @@ -14,22 +14,22 @@ public partial class T_GameCBT: MultiTenantEntity /// /// 游戏Id /// - public virtual string? GameId { get; set; } + public virtual string GameId { get; set; } = null!; /// - /// 游戏详情也配置背景 + /// 游戏详情背景 /// - public virtual int? GameBgImgId { get; set; } + public virtual int GameBgImgId { get; set; } /// - /// 游戏Icon + /// 游戏库Icon图 /// - public virtual int? GameImageId { get; set; } + public virtual int GameImageId { get; set; } /// /// 是否启用 /// - public virtual bool? IsOnline { get; set; } + public virtual bool IsOnline { get; set; } /// /// 评分 @@ -39,10 +39,16 @@ public partial class T_GameCBT: MultiTenantEntity /// /// 排序 /// - public virtual int? OrderId { get; set; } + public virtual int OrderId { get; set; } + /// + /// 修改时间 + /// public virtual DateTime? UpdateTime { get; set; } + /// + /// 创建时间 + /// public virtual DateTime? CreateTime { get; set; } /// @@ -53,17 +59,17 @@ public partial class T_GameCBT: MultiTenantEntity /// /// 游戏加载图 /// - public virtual int? GameLoadBgImageId { get; set; } + public virtual int GameLoadBgImageId { get; set; } /// /// 游戏icon /// - public virtual int? ImageIconId { get; set; } + public virtual int ImageIconId { get; set; } /// /// 是否测试游戏 /// - public virtual bool? IsTest { get; set; } + public virtual bool IsTest { get; set; } /// /// VIP专属 @@ -90,6 +96,9 @@ public partial class T_GameCBT: MultiTenantEntity /// public virtual int ImageId_TJ { get; set; } + /// + /// 副标题 + /// public virtual string? Title2 { get; set; } /// @@ -107,11 +116,6 @@ public partial class T_GameCBT: MultiTenantEntity /// public virtual int ImageId_Banner { get; set; } - /// - /// 视频地址 - /// - public virtual string? VideoUrl { get; set; } - /// /// 每小时钻石费用 /// @@ -147,21 +151,6 @@ public partial class T_GameCBT: MultiTenantEntity /// public virtual string OnlinePlatform { get; set; } = null!; - /// - /// 视频标识 - /// - public virtual string? VideoIdentification { get; set; } - - /// - /// vip国家 - /// - public virtual string? VipCountryName { get; set; } - - /// - /// 洲 - /// - public virtual string? VipContinent { get; set; } - /// /// 启动提示 /// diff --git a/src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_Phone/T_Popup.cs b/src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_Phone/T_Popup.cs index 06b5dfd..db10ba9 100644 --- a/src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_Phone/T_Popup.cs +++ b/src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_Phone/T_Popup.cs @@ -11,35 +11,65 @@ public partial class T_Popup: MultiTenantEntity public virtual int Id { get; set; } + /// + /// 所属租户 + /// + public override Guid TenantId { get; set; } + /// /// 弹框类型 /// public virtual int Type { get; set; } /// - /// 弹框名字 + /// 弹框名称 /// public virtual string? Name { get; set; } - /// - /// 弹框背景图 - /// - public virtual int? Btn_Bg { get; set; } - /// /// 弹窗显示文字 /// public virtual string? Text { get; set; } - /// - /// 是否启用 - /// - public virtual bool? IsOnline { get; set; } - /// /// 排序 /// - public virtual int? OrderId { get; set; } + public virtual int OrderId { get; set; } + + /// + /// 弹框背景图 + /// + public virtual int BgImageId { get; set; } + + /// + /// 确认按钮 + /// + public virtual int Btn_OK { get; set; } + + /// + /// 关闭按钮 + /// + public virtual int Btn_Close { get; set; } + + /// + /// 备注 + /// + public virtual string? Desc { get; set; } + + /// + /// 上线渠道号 + /// + public virtual string? Channel { get; set; } + + /// + /// 上线平台 + /// + public virtual string? PlatformId { get; set; } + + /// + /// 是否启用 + /// + public virtual bool IsOnline { get; set; } /// /// 创建时间 @@ -50,51 +80,4 @@ public partial class T_Popup: MultiTenantEntity /// 修改时间 /// public virtual DateTime? UpdateTime { get; set; } - - public virtual string? Desc { get; set; } - - /// - /// 开始时间 - /// - public virtual DateTime? StartTime { get; set; } - - /// - /// 结束时间 - /// - public virtual DateTime? EndTime { get; set; } - - /// - /// 上线渠道号 - /// - public virtual string? BossId { get; set; } - - /// - /// 上线平台 - /// - public virtual string? PlatformId { get; set; } - - /// - /// 确认按钮图片 - /// - public virtual int? Btn_OK { get; set; } - - /// - /// 关闭按钮图片 - /// - public virtual int? Btn_Close { get; set; } - - /// - /// 内容图片Id - /// - public virtual int? ImageId_Text { get; set; } - - /// - /// 扩展参数1 - /// - public virtual string? Extend1 { get; set; } - - /// - /// 所属租户 - /// - public override Guid TenantId { get; set; } - } +}