11

gx_api/GxPress/Api/GxPress.Api/AppControllers/TopicController.cs

@@ -31,10 +31,10 @@ namespace GxPress.Api.AppControllers
         private readonly ITopicGroupRepository _topicGroupRepository;
         private readonly ITopicGroupUserRepository _topicGroupUserRepository;
         private readonly IMiddleService _middleService;
-
+        private readonly ITopicGroupService topicGroupService;
         public TopicController(ILogger<TopicController> logger, ITopicRepository repository, ILoginContext loginContext,
             ITopicService topicService, ITopicGroupRepository topicGroupRepository,
-            ITopicGroupUserRepository topicGroupUserRepository, IMiddleService middleService)
+            ITopicGroupUserRepository topicGroupUserRepository, IMiddleService middleService, ITopicGroupService topicGroupService)
         {
             _logger = logger;
             _topicRepository = repository;
@@ -43,6 +43,7 @@ namespace GxPress.Api.AppControllers
             _topicGroupRepository = topicGroupRepository;
             _topicGroupUserRepository = topicGroupUserRepository;
             _middleService = middleService;
+            this.topicGroupService = topicGroupService;
         }
 
         /// <summary>
@@ -100,12 +101,20 @@ namespace GxPress.Api.AppControllers
         /// 获取用户话题分组
         /// </summary>
         /// <returns></returns>
-        [HttpPost("group")]
+        [HttpGet("group")]
         public async Task<IEnumerable<TopicGroup>> GetTopicGroups()
         {
-            return await _topicGroupRepository.GetTopicGroupsAsync(_loginContext.AccountId);
+            return await topicGroupService.GetTopicGroupsAsync(_loginContext.AccountId);
+        }
+        /// <summary>
+        /// 获取用户话题分组集合
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("list-group")]
+        public async Task<IEnumerable<TopicGroup>> GetListTopicGroupsAsync()
+        {
+            return await topicGroupService.GetListTopicGroupsAsync(_loginContext.AccountId);
         }
-
         /// <summary>
         /// 添加话题分组
         /// </summary>

gx_api/GxPress/Repository/GxPress.Repository.Implement/Topic/TopicGroupRepository.cs

@@ -69,14 +69,8 @@ namespace GxPress.Repository.Implement.Topic
         /// <returns></returns>
         public async Task<IEnumerable<TopicGroup>> GetTopicGroupsAsync(int userId)
         {
-            var result = new List<TopicGroup>() {
-                new TopicGroup {
-                Id=-1,Name="我的"
-            }, new TopicGroup { Id=-2,Name="同单位"},
-            new TopicGroup {Id=-3,Name="推荐" } ,
-            new TopicGroup {Id=0,Name="全部" }};
-            result.AddRange(await _repository.GetAllAsync(Q.Where(nameof(TopicGroup.UserId), userId)
-                .OrderByDesc(nameof(TopicGroup.Sort))));
+            var result = await _repository.GetAllAsync(Q.Where(nameof(TopicGroup.UserId), userId)
+                 .OrderByDesc(nameof(TopicGroup.Sort)));
             return result;
         }
         /// <summary>

gx_api/GxPress/Service/GxPress.Service.Implement/Topic/TopicGroupService.cs

@@ -0,0 +1,43 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using GxPress.Entity.Topic;
+using GxPress.Repository.Interface.Topic;
+using GxPress.Service.Interface.Topic;
+
+namespace GxPress.Service.Implement.Topic
+{
+    public class TopicGroupService : ITopicGroupService
+    {
+        private readonly ITopicGroupRepository topicGroupRepository;
+        public TopicGroupService(ITopicGroupRepository topicGroupRepository)
+        {
+            this.topicGroupRepository = topicGroupRepository;
+        }
+
+        /// <summary>
+        /// 根据用户ID获取分组
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        public async Task<IEnumerable<TopicGroup>> GetTopicGroupsAsync(int userId)
+        {
+            var result = new List<TopicGroup>() {
+            new TopicGroup {Id=-1,Name="我的"},
+            new TopicGroup {Id=-2,Name="同单位"},
+            new TopicGroup {Id=-3,Name="推荐" } ,
+            new TopicGroup {Id=0,Name="全部" }};
+            result.AddRange(await topicGroupRepository.GetTopicGroupsAsync(userId));
+            return result;
+        }
+        /// <summary>
+        /// 根据用户ID获取分组
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        public async Task<IEnumerable<TopicGroup>> GetListTopicGroupsAsync(int userId)
+        {
+            var result = await topicGroupRepository.GetTopicGroupsAsync(userId);
+            return result;
+        }
+    }
+}

gx_api/GxPress/Service/GxPress.Service.Interface/Topic/ITopicGroupService.cs

@@ -0,0 +1,22 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using GxPress.Entity.Topic;
+
+namespace GxPress.Service.Interface.Topic
+{
+    public interface ITopicGroupService : IService
+    {
+        /// <summary>
+        /// 根据用户ID获取分组
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        Task<IEnumerable<TopicGroup>> GetTopicGroupsAsync(int userId);
+        /// <summary>
+        /// 根据用户ID获取分组
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        Task<IEnumerable<TopicGroup>> GetListTopicGroupsAsync(int userId);
+    }
+}