1

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

@@ -77,7 +77,7 @@ namespace GxPress.Api.WebControllers
         /// </summary>
         /// <param name="categoryId"></param>
         /// <returns></returns>
-        [HttpGet("list/{categoryId}")]
+        [HttpGet("category-list/{categoryId}")]
         public async Task<IEnumerable<Entity.Group>> GetAllAsync(int categoryId)
         {
             return await _groupService.GetAllAsync(categoryId);
@@ -229,6 +229,15 @@ namespace GxPress.Api.WebControllers
         {
             return await _groupRepository.SearchGroupUserAsync(request);
         }
-
+        /// <summary>
+        /// 用户小组列表
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        [HttpGet("list/{userId}")]
+        public async Task<IEnumerable<UserGroupList>> GetAllByUserIdAsync(int userId)
+        {
+            return await _groupRepository.GetAllByUserIdAsync(userId);
+        }
     }
 }

gx_api/GxPress/Model/GxPress.Request/App/Topic/TopicInRequest.cs

@@ -1,6 +1,4 @@
-using System;
 using System.Collections.Generic;
-using System.Text;
 using GxPress.EnumConst;
 
 namespace GxPress.Request.App.Topic

gx_api/GxPress/Model/GxPress.Result/App/Group/GroupDetailResult.cs

@@ -10,7 +10,7 @@ namespace GxPress.Result.App.Group
     /// <summary>
     /// 小组详情
     /// </summary>
-   public class GroupDetailResult
+    public class GroupDetailResult
     {
         /// <summary>
         /// 小组ID
@@ -20,7 +20,7 @@ namespace GxPress.Result.App.Group
         /// <summary>
         /// 小组名称
         /// </summary>
-       
+
         public string Name { get; set; }
 
         /// <summary>
@@ -32,43 +32,43 @@ namespace GxPress.Result.App.Group
         /// <summary>
         /// 二维码
         /// </summary>
-      
+
         public string QRCoder { get; set; }
 
         /// <summary>
         /// 头像
         /// </summary>
-   
+
         public string AvatarUrl { get; set; }
 
         /// <summary>
         /// 介绍
         /// </summary>
-     
+
         public string Introduce { get; set; }
 
         /// <summary>
         ///是否管理用同意
         /// </summary>
-   
+
         public bool IsAdmin { get; set; }
 
         /// <summary>
         /// 是否禁言
         /// </summary>
-    
+
         public bool IsWords { get; set; }
 
         /// <summary>
         /// 是否免打扰
         /// </summary>
-    
+
         public bool IsUDisturb { get; set; }
 
         /// <summary>
         /// 小组文件夹ID
         /// </summary>
-     
+
         public int GroupFolderId { get; set; }
 
         /// <summary>
@@ -99,5 +99,31 @@ namespace GxPress.Result.App.Group
         /// </summary>
         public bool IsUser { get; set; }
     }
+    /// <summary>
+    /// 用户小组列表
+    /// </summary>
+    public class UserGroupList
+    {
+        /// <summary>
+        /// 小组ID
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 小组名称
+        /// </summary>
+
+        public string Name { get; set; }
+        /// <summary>
+        /// 头像
+        /// </summary>
+
+        public string AvatarUrl { get; set; }
+        /// <summary>
+        /// 共享用户数量
+        /// </summary>
+        /// <value></value>
+        public int UserCount { get; set; }
+    }
 
 }

gx_api/GxPress/Repository/GxPress.Repository.Implement/GroupRepository.cs

@@ -408,6 +408,43 @@ namespace GxPress.Repository.Implement
         {
             return await _repository.GetAllAsync(Q.Where(nameof(Entity.Group.GroupCategroyId), categoryId));
         }
+        /// <summary>
+        /// 用户小组列表
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        public async Task<IEnumerable<UserGroupList>> GetAllByUserIdAsync(int userId)
+        {
+            string sql = $@"SELECT 
+                                Id,
+                                Name,
+                                AvatarUrl,
+                                (SELECT 
+                                        COUNT(1)
+                                    FROM
+                                        tede_group_user
+                                    WHERE
+                                        GroupId = a.Id) AS UserCount
+                            FROM
+                                tede_group a
+                            WHERE
+                                a.id IN (SELECT 
+                                        GroupId
+                                    FROM
+                                        ccpph_tede.tede_group_user
+                                    WHERE
+                                        UserId = {userId})";
+            var databaseType = StringUtils.ToEnum<DatabaseType>(_databaseTypeStr, DatabaseType.MySql);
+            var database = new Database(databaseType, _connectionString);
+            var connection = database.GetConnection();
+            var items = await connection
+                .QueryAsync<UserGroupList>(sql);
+            foreach (var item in items)
+            {
+                item.AvatarUrl = StringUtils.AddDomain(item.AvatarUrl);
+            }
+            return items;
+        }
 
     }
 }

gx_api/GxPress/Repository/GxPress.Repository.Interface/IGroupRepository.cs

@@ -84,5 +84,11 @@ namespace GxPress.Repository.Interface
         /// <param name="categoryId"></param>
         /// <returns></returns>
         Task<IEnumerable<Entity.Group>> GetAllAsync(int categoryId);
+        /// <summary>
+        /// 用户小组列表
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        Task<IEnumerable<UserGroupList>> GetAllByUserIdAsync(int userId);
     }
 }

gx_api/GxPress/Service/GxPress.Service.Implement/Group/GroupService.RemoveUser.cs

@@ -29,6 +29,8 @@ namespace GxPress.Service.Implement.Group
                 .WhereIn(nameof(Entity.Middle.Middle.UserId), request.GroupUserIds));
         }
 
+        
+
         /// <summary>
         /// 退出小组
         /// </summary>