From 76e13adeafae3e5dc1a47090744c1625a8486057 Mon Sep 17 00:00:00 2001 From: zpc Date: Sat, 3 Aug 2024 07:11:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Category/CategoryBLL.cs | 107 +++++++++--------- .../Category/CategoryPageRegionExtend.cs | 4 +- .../DbSqlServer/Db_MiaoYu/MiaoYuContext.cs | 6 +- .../Db_MiaoYu/T_Category_Child_Menu.cs | 11 +- 4 files changed, 71 insertions(+), 57 deletions(-) diff --git a/src/0-core/HuanMeng.MiaoYu.Code/Category/CategoryBLL.cs b/src/0-core/HuanMeng.MiaoYu.Code/Category/CategoryBLL.cs index 9348ffc..96db245 100644 --- a/src/0-core/HuanMeng.MiaoYu.Code/Category/CategoryBLL.cs +++ b/src/0-core/HuanMeng.MiaoYu.Code/Category/CategoryBLL.cs @@ -73,70 +73,71 @@ namespace HuanMeng.MiaoYu.Code.Category var node = DictionaryInfo.GetDictionariesChildNode(T_Sys_DictionaryEnum.categorymenu); node.ForEach(_node => { - var menu = menuList.Where(it => it.Type == _node.ExtendValue).OrderBy(it => it.OrderById).ToList(); + var menu = menuList.Where(it => it.Type == _node.Code).OrderBy(it => it.OrderById).ToList(); if (menu?.Count > 0) { RecommendDto banner = new RecommendDto(); banner.Title = _node.Name; banner.Type = _node.Value;//动作Id - var categoryPageRegion = CategoryPageRegionExtend.GetCategoryPageRegion(RecommendTypeEnum.banner, menu, this.MiaoYuCache); + var e = Enum.Parse(banner.Type); + var categoryPageRegion = CategoryPageRegionExtend.GetCategoryPageRegion(e, menu, this.MiaoYuCache); banner.Data = categoryPageRegion.GetRecommendData(); - + recommendDtos.Add(banner); } }); - #region 假数据 - RecommendDto banner = new RecommendDto(); - banner.Title = "Banner"; - banner.Type = RecommendTypeEnum.banner.ToString(); - banner.Data = new List(); - banner.Data.Add(new CommonRecommendData - { - ActionId = "1", - ActionType = RecommendActionTypeEnum.Mall.ToString(), - ImageUrl = "https://cos.shhuanmeng.com/banner/20240717214627.png", - }); - banner.Data.Add(new CommonRecommendData - { - ActionId = "2", - ActionType = RecommendActionTypeEnum.Page.ToString(), - ImageUrl = "https://cos.shhuanmeng.com/banner/202407172146272.png", - }); - banner.Data.Add(new CommonRecommendData - { - ActionId = "3", - ActionType = RecommendActionTypeEnum.Chat.ToString(), - ImageUrl = "https://cos.shhuanmeng.com/banner/20240717214735.png", - }); - recommendDtos.Add(banner); - RecommendDto tuijian = new RecommendDto(); - tuijian.Title = "推荐"; - tuijian.Type = RecommendTypeEnum.tuijian.ToString(); - tuijian.Data = new List(); + //#region 假数据 + //RecommendDto banner = new RecommendDto(); + //banner.Title = "Banner"; + //banner.Type = RecommendTypeEnum.banner.ToString(); + //banner.Data = new List(); + //banner.Data.Add(new CommonRecommendData + //{ + // ActionId = "1", + // ActionType = RecommendActionTypeEnum.Mall.ToString(), + // ImageUrl = "https://cos.shhuanmeng.com/banner/20240717214627.png", + //}); + //banner.Data.Add(new CommonRecommendData + //{ + // ActionId = "2", + // ActionType = RecommendActionTypeEnum.Page.ToString(), + // ImageUrl = "https://cos.shhuanmeng.com/banner/202407172146272.png", + //}); + //banner.Data.Add(new CommonRecommendData + //{ + // ActionId = "3", + // ActionType = RecommendActionTypeEnum.Chat.ToString(), + // ImageUrl = "https://cos.shhuanmeng.com/banner/20240717214735.png", + //}); + //recommendDtos.Add(banner); + //RecommendDto tuijian = new RecommendDto(); + //tuijian.Title = "推荐"; + //tuijian.Type = RecommendTypeEnum.tuijian.ToString(); + //tuijian.Data = new List(); - RecommendDto xiaoshuo = new RecommendDto(); - xiaoshuo.Data = new List(); - xiaoshuo.Title = "小说"; - xiaoshuo.Type = RecommendTypeEnum.xiaoshuo.ToString(); - int index = 0; - MiaoYuCache.CharacterList.ForEach(x => - { - if (index > 5) - { - return; - } - var data = Mapper.Map(x); - data.ActionType = RecommendActionTypeEnum.Chat.ToString(); - data.ActionId = data.Id.ToString(); - data.ImageUrl = x.BgImage;//data.BgImage; + //RecommendDto xiaoshuo = new RecommendDto(); + //xiaoshuo.Data = new List(); + //xiaoshuo.Title = "小说"; + //xiaoshuo.Type = RecommendTypeEnum.xiaoshuo.ToString(); + //int index = 0; + //MiaoYuCache.CharacterList.ForEach(x => + //{ + // if (index > 5) + // { + // return; + // } + // var data = Mapper.Map(x); + // data.ActionType = RecommendActionTypeEnum.Chat.ToString(); + // data.ActionId = data.Id.ToString(); + // data.ImageUrl = x.BgImage;//data.BgImage; - tuijian.Data.Add(data); - xiaoshuo.Data.Add(data); - index++; - }); - recommendDtos.Add(tuijian); - recommendDtos.Add(xiaoshuo); - #endregion + // tuijian.Data.Add(data); + // xiaoshuo.Data.Add(data); + // index++; + //}); + //recommendDtos.Add(tuijian); + //recommendDtos.Add(xiaoshuo); + //#endregion return new BaseResponse>>(ResonseCode.Success, "", recommendDtos); } } diff --git a/src/0-core/HuanMeng.MiaoYu.Code/Category/CategoryPageRegionExtend.cs b/src/0-core/HuanMeng.MiaoYu.Code/Category/CategoryPageRegionExtend.cs index aba58c0..db6ea48 100644 --- a/src/0-core/HuanMeng.MiaoYu.Code/Category/CategoryPageRegionExtend.cs +++ b/src/0-core/HuanMeng.MiaoYu.Code/Category/CategoryPageRegionExtend.cs @@ -32,7 +32,7 @@ namespace HuanMeng.MiaoYu.Code.Category { if (recommend == RecommendTypeEnum.tuijian || recommend == RecommendTypeEnum.xiaoshuo) { - return new CategoryPageRegionBanner(menu, miaoYuCache); + return new CategoryPageRegionChat(menu, miaoYuCache); } if (recommend == RecommendTypeEnum.banner) { @@ -96,7 +96,7 @@ namespace HuanMeng.MiaoYu.Code.Category { d.ImageUrl = character.BgImage; } - d.Name = character.Name; + d.Name = string.IsNullOrEmpty(m.Name) ? character.Name : m.Name; d.Biography = character.Biography; d.Label = character.Label; d.Gender = character.Gender; 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 3dedf0a..3fabff0 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 @@ -184,12 +184,16 @@ public partial class MiaoYuContext : MultiTenantDbContext//DbContext entity.Property(e => e.ImageUrl) .HasMaxLength(300) .HasComment("图片补位"); + entity.Property(e => e.IsEnabled).HasComment("是否启用"); entity.Property(e => e.Name) .HasMaxLength(100) .HasComment("名称"); entity.Property(e => e.OrderById).HasComment("排序"); + entity.Property(e => e.SubTitle) + .HasMaxLength(100) + .HasComment("副标题"); entity.Property(e => e.Type) - .HasMaxLength(20) + .HasMaxLength(64) .HasComment("菜单类型（banner,热门推荐，热门小说）"); //添加全局筛选器 if (this.TenantInfo != null) diff --git a/src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_Category_Child_Menu.cs b/src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_Category_Child_Menu.cs index e36a506..ee5fbcc 100644 --- a/src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_Category_Child_Menu.cs +++ b/src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_Category_Child_Menu.cs @@ -16,7 +16,7 @@ public partial class T_Category_Child_Menu: MultiTenantEntity /// /// 名称 /// - public string Name { get; set; } = null!; + public string? Name { get; set; } /// /// 动作Id @@ -43,5 +43,14 @@ public partial class T_Category_Child_Menu: MultiTenantEntity /// public string? ImageUrl { get; set; } + /// + /// 是否启用 + /// public bool IsEnabled { get; set; } + + /// + /// 副标题 + /// + public string? SubTitle { get; set; } + }