1

gx_api/GxPress/Api/GxPress.Api/AppControllers/GroupController.cs

@@ -3,12 +3,14 @@ using System.Threading.Tasks;
 using GxPress.Auth;
 using GxPress.Common.Page;
 using GxPress.Repository.Interface;
+using GxPress.Repository.Interface.Group;
 using GxPress.Request.App.Group;
 using GxPress.Request.App.GroupUser;
 using GxPress.Request.App.Topic;
 using GxPress.Result.App.Group;
 using GxPress.Result.App.GroupUser;
 using GxPress.Result.App.Topic;
+using GxPress.Result.Web;
 using GxPress.Service.Interface.Group;
 using GxPress.Service.Interface.Topic;
 using Microsoft.AspNetCore.Authorization;
@@ -33,10 +35,10 @@ namespace GxPress.Api.AppControllers
         private readonly ILoginContext _loginContext;
         private readonly ITopicRepository _topicRepository;
         private readonly ITopicService _topicService;
-
+        private readonly IGroupCategroyRepository groupCategroyRepository;
         public GroupController(ILogger<GroupController> logger, IGroupRepository groupRepository,
             IGroupFolderRepository groupFolderRepository, IGroupUserRepository groupUserRepository,
-            ILoginContext loginContext, IGroupService groupService, ITopicRepository topicRepository, ITopicService topicService)
+            ILoginContext loginContext, IGroupService groupService, ITopicRepository topicRepository, ITopicService topicService, IGroupCategroyRepository groupCategroyRepository)
         {
             _logger = logger;
             _groupFolderRepository = groupFolderRepository;
@@ -46,6 +48,7 @@ namespace GxPress.Api.AppControllers
             _groupService = groupService;
             _topicRepository = topicRepository;
             _topicService = topicService;
+            this.groupCategroyRepository = groupCategroyRepository;
         }
 
         /// <summary>
@@ -219,5 +222,26 @@ namespace GxPress.Api.AppControllers
         {
             return await _groupRepository.SearchGroupUserAsync(request);
         }
+        /// <summary>
+        /// 根据广场类别查询小组
+        /// </summary>
+        /// <param name="categoryId"></param>
+        /// <returns></returns>
+        [HttpGet("category-list/{categoryId}")]
+        public async Task<IEnumerable<Entity.Group>> GetAllAsync(int categoryId)
+        {
+            return await _groupService.GetAllAsync(categoryId);
+        }
+        /// <summary>
+        /// 根据parendId获取小组广场
+        /// </summary>
+        /// <param name="parentId"></param>
+        /// <returns></returns>
+        [HttpGet("group-category/{parentId}")]
+        [AllowAnonymous]
+        public async Task<IEnumerable<GroupCategoryResult>> GetGroupCategoryAsync(int parentId)
+        {
+            return await groupCategroyRepository.GetAllAsync(parentId);
+        }
     }
 }

gx_api/GxPress/Api/GxPress.Api/WebControllers/WebGroupController.cs

@@ -81,7 +81,7 @@ namespace GxPress.Api.WebControllers
             return await _groupService.GetAllAsync(categoryId);
         }
         /// <summary>
-        /// 根据parendId获取
+        /// 根据parendId获取小组广场
         /// </summary>
         /// <param name="parentId"></param>
         /// <returns></returns>