1

gx_api/GxPress/Api/GxPress.Api/AppControllers/CollectionController.cs

@@ -7,6 +7,7 @@ using GxPress.Service.Interface.Collection;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
+using GxPress.Repository.Interface.Collection;
 
 namespace GxPress.Api.AppControllers
 {
@@ -21,13 +22,14 @@ namespace GxPress.Api.AppControllers
         private readonly ILogger<CollectionController> _logger;
         private readonly ICollectionService _collectionService;
         private readonly ILoginContext _loginContext;
+        private readonly ICollectionRepository collectionRepository;
 
-
-        public CollectionController(ILogger<CollectionController> logger, ICollectionService collectionService, ILoginContext loginContext)
+        public CollectionController(ILogger<CollectionController> logger, ICollectionService collectionService, ILoginContext loginContext, ICollectionRepository collectionRepository)
         {
             _logger = logger;
             _collectionService = collectionService;
             _loginContext = loginContext;
+            this.collectionRepository = collectionRepository;
         }
         /// <summary>
         /// 添加收藏
@@ -74,5 +76,15 @@ namespace GxPress.Api.AppControllers
             request.UserId = _loginContext.AccountId;
             return await _collectionService.GetCollectionNoFolderPageListAsync(request);
         }
+        /// <summary>
+        /// 设置收藏置顶
+        /// </summary>
+        /// <param name="id"></param>
+        /// <return></returns>
+        [HttpPut("{id}")]
+        public async Task<bool> SetTopAsync(int id)
+        {
+            return await collectionRepository.SetTopAsync(id);
+        }
     }
 }

gx_api/GxPress/Model/GxPress.Entity/Collection.cs

@@ -58,5 +58,11 @@ namespace GxPress.Entity
         /// </summary>
         [DataColumn]
         public int SourceUserId { get; set; }
+        /// <summary>
+        /// 是否置顶
+        /// </summary>
+        /// <value></value>
+        [DataColumn]
+        public bool IsTop { get; set; }
     }
 }

gx_api/GxPress/Model/GxPress.Result/App/Collection/CollectionListPageResult.cs

@@ -132,5 +132,10 @@ namespace GxPress.Result.App.Collection
         /// </summary>
         /// <value></value>
         public int SourceUserId { get; set; }
+        /// <summary>
+        /// 是否置顶
+        /// </summary>
+        /// <value></value>
+        public bool IsTop { get; set; }
     }
 }

gx_api/GxPress/Model/GxPress.Result/App/Note/NoteResult.cs

@@ -209,5 +209,10 @@ namespace GxPress.Result.App.Note
         /// 文件夹Id
         /// </summary>
         public int FolderId { get; set; }
+        /// <summary>
+        /// 是否置顶
+        /// </summary>
+        /// <value></value>
+        public bool IsTop { get; set; }
     }
 }

gx_api/GxPress/Repository/GxPress.Repository.Implement/Collection/CollectionRepository.cs

@@ -47,7 +47,17 @@ namespace GxPress.Repository.Implement.Collection
         {
             return await _repository.InsertAsync(collection);
         }
-
+        /// <summary>
+        /// 设置收藏置顶
+        /// </summary>
+        /// <param name="collection"></param>
+        /// <returns></returns>
+        public async Task<bool> SetTopAsync(int id)
+        {
+            var collction = await _repository.GetAsync(id);
+            collction.IsTop = !collction.IsTop;
+            return await _repository.UpdateAsync(collction);
+        }
         /// <summary>
         /// 查询结果
         /// </summary>
@@ -276,19 +286,20 @@ namespace GxPress.Repository.Implement.Collection
             if (!string.IsNullOrEmpty(request.SearchKey))
                 sqlStr += $" and a.Title like '%{request.SearchKey}%' ";
             var sql = $@"SELECT 
-                            a.Id,a.UserId,a.Title,a.CollectionType,a.CollectionDataId,a.SourceUserId,(select FolderName from tede_middle where id=b.ParentId) as FolderName,b.ParentId
+                            a.Id,a.UserId,a.Title,a.CollectionType,a.CollectionDataId,a.SourceUserId,a.IsTop,(select FolderName from tede_middle where id=b.ParentId) as FolderName,b.Id,b.Middle, b.ParentId
                         FROM
                             tede_collection a
                                 INNER JOIN
                             tede_middle b ON a.Id = b.MiddleId AND b.FolderType ={collectionContsValue} {sqlStr}
-                                AND a.UserId ={request.UserId} and b.IsDelete=0 order by a.CreatedDate desc limit {(request.Page - 1) * request.PerPage},{request.PerPage} ";
+                                AND a.UserId ={request.UserId} and b.IsDelete=0 order by a.IsTop desc ,a.CreatedDate desc limit {(request.Page - 1) * request.PerPage},{request.PerPage} ";
             var databaseType = StringUtils.ToEnum<DatabaseType>(_databaseTypestr, DatabaseType.MySql);
             var database = new Database(databaseType, _connectionString);
             var connection = database.GetConnection();
             result.Items = await connection.QueryAsync<CollectionNoFolderResult, Entity.Middle.Middle, CollectionNoFolderResult>(sql,
                     (result, middle) =>
                     {
-                        result.MiddleId = result.Id;
+                        result.MiddleId = middle.Id;
+                        result.Id = middle.Id;
                         result.FolderId = middle != null ? middle.ParentId : 0;
                         return result;
                     },

gx_api/GxPress/Repository/GxPress.Repository.Implement/Note/NoteRepository.cs

@@ -605,6 +605,7 @@ namespace GxPress.Repository.Implement.Note
                                 a.CreatedDate,
                                 a.MediaId,
                                 a.ReadCount,
+                                a.IsTop,
                                 (SELECT 
                                         FolderName
                                     FROM

gx_api/GxPress/Repository/GxPress.Repository.Interface/Collection/ICollectionRepository.cs

@@ -37,21 +37,27 @@ namespace GxPress.Repository.Interface.Collection
         Task<bool> DeleteAsync(SqlKata.Query query);
 
         Task<bool> DeleteAsync(int id);
-        
+
         Task<IEnumerable<Entity.Collection>> GetAllAsync(SqlKata.Query query);
-         /// <summary>
+        /// <summary>
         /// 递归删除收藏包括文件夹下面的数据
         /// </summary>
         /// <param name="middleIds"></param>
         /// <returns></returns>
-         Task<bool> RecursionDeleteAsync(List<int> middleIds);
+        Task<bool> RecursionDeleteAsync(List<int> middleIds);
 
-           /// <summary>
+        /// <summary>
         /// 收藏无文件夹分页列表
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
-      Task<PagedList<CollectionNoFolderResult>> GetCollectionNoFolderPageListAsync(CollectionPageSearchRequest request);
+        Task<PagedList<CollectionNoFolderResult>> GetCollectionNoFolderPageListAsync(CollectionPageSearchRequest request);
+        /// <summary>
+        /// 设置收藏置顶
+        /// </summary>
+        /// <param name="collection"></param>
+        /// <returns></returns>
+        Task<bool> SetTopAsync(int id);
     }
 
 }