Merge branch 'master' of http://110.188.24.182:10023/Fengwo/hotline

src/Hotline.Api/Controllers/KnowledgeController.cs

@@ -258,6 +258,22 @@ namespace Hotline.Api.Controllers
 			await _knowledgeRepository.UpdateAsync(knowledge, HttpContext.RequestAborted);
 		}
 
+		/// <summary>
+		/// 搜索量列表
+		/// </summary>
+		/// <param name="dto"></param>
+		/// <returns></returns>
+		[Permission(EPermission.KnowledgeCommentList)]
+		[HttpGet("search_num/list")]
+		public async Task<PagedDto<KnowledgeDto>> SearchNumList([FromQuery] KnowledgeCollectListDto dto)
+		{
+			var (total, items) = await _knowledgeRepository.Queryable()
+				.Where(x=>x.Status == EKnowledgeStatus.OnShelf)
+				.OrderByDescending(x => x.SearchNum)
+				.ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
+			return new PagedDto<KnowledgeDto>(total, _mapper.Map<IReadOnlyList<KnowledgeDto>>(items));
+		}
+
 		/// <summary>
 		/// 知识库-知识修改-查询详情
 		/// </summary>
@@ -994,6 +1010,23 @@ namespace Hotline.Api.Controllers
 		#endregion
 
 		#region 知识收藏
+		/// <summary>
+		/// 知识收藏列表
+		/// </summary>
+		/// <param name="dto"></param>
+		/// <returns></returns>
+		[Permission(EPermission.KnowledgeCollectList)]
+		[HttpGet("knowledge_collect/list")]
+		public async Task<PagedDto<KnowledgeCollectDto>> List([FromQuery] KnowledgeCollectListDto dto)
+		{
+			var (total, items) = await _knowledgeCollectRepository.Queryable()
+				.Includes(x=>x.Knowledge)
+				.WhereIF(!string.IsNullOrEmpty(dto.Keyword),x=>x.Knowledge.Title.Contains(dto.Keyword!)||( x.Knowledge.Summary != null &&  x.Knowledge.Summary.Contains(dto.Keyword!)))
+				.OrderByDescending(x => x.CreationTime)
+				.ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
+			return new PagedDto<KnowledgeCollectDto>(total,_mapper.Map<IReadOnlyList<KnowledgeCollectDto>>(items));
+		}
+
 		/// <summary>
 		/// 新增知识收藏
 		/// </summary>

src/Hotline.Share/Dtos/Knowledge/KnowledgeCollectDto.cs

@@ -94,4 +94,8 @@ namespace Hotline.Share.Dtos.Knowledge
 
 		public string? CreatorName { get; set; }
 	}
+
+	public record KnowledgeCollectListDto : PagedKeywordRequest
+	{
+	}
 }

src/Hotline/Permissions/EPermission.cs

@@ -939,6 +939,12 @@ namespace Hotline.Permissions
 
 		#region 知识收藏
 
+		/// <summary>
+		/// 知识收藏列表
+		/// </summary>
+		[Display(GroupName = "KnowledgeCollect", Name = "知识收藏列表", Description = "知识收藏列表")]
+		KnowledgeCollectList = 400900,
+
 		/// <summary>
 		/// 知识收藏
 		/// </summary>