1

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

@@ -12,6 +12,7 @@ using GxPress.Result.App.GroupUser;
 using GxPress.Result.App.Topic;
 using GxPress.Result.Web;
 using GxPress.Service.Interface.Group;
+using GxPress.Service.Interface.GroupCategroy;
 using GxPress.Service.Interface.Topic;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -34,10 +35,11 @@ namespace GxPress.Api.WebControllers
         private readonly ITopicRepository _topicRepository;
         private readonly ITopicService _topicService;
         private readonly IGroupCategroyRepository groupCategroyRepository;
-
+        private readonly IUserGroupCategoryRepository userGroupCategoryRepository;
+        private readonly IGroupCategroyService groupCategroyService;
         public WebGroupController(IGroupRepository groupRepository,
             IGroupFolderRepository groupFolderRepository, IGroupUserRepository groupUserRepository,
-            ILoginContext loginContext, IGroupService groupService, ITopicRepository topicRepository, ITopicService topicService, IGroupCategroyRepository groupCategroyRepository)
+            ILoginContext loginContext, IGroupService groupService, ITopicRepository topicRepository, ITopicService topicService, IGroupCategroyRepository groupCategroyRepository, IUserGroupCategoryRepository userGroupCategoryRepository, IGroupCategroyService groupCategroyService)
         {
             _groupFolderRepository = groupFolderRepository;
             _groupRepository = groupRepository;
@@ -47,6 +49,8 @@ namespace GxPress.Api.WebControllers
             _topicRepository = topicRepository;
             _topicService = topicService;
             this.groupCategroyRepository = groupCategroyRepository;
+            this.userGroupCategoryRepository = userGroupCategoryRepository;
+            this.groupCategroyService = groupCategroyService;
         }
         /// <summary>
         /// 新建小组
@@ -90,7 +94,7 @@ namespace GxPress.Api.WebControllers
         [AllowAnonymous]
         public async Task<IEnumerable<GroupCategoryResult>> GetGroupCategoryAsync(int parentId)
         {
-            return await groupCategroyRepository.GetAllAsync(parentId);
+            return await groupCategroyService.GetGroupCategoryAsync(parentId, _loginContext.AccountId);
         }
 
         /// <summary>
@@ -277,5 +281,15 @@ namespace GxPress.Api.WebControllers
         {
             return await _groupRepository.GetUserGroupListAsync(_loginContext.AccountId);
         }
+        /// <summary>
+        /// 添加小组广场用户排序
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpPost("user-group-category")]
+        public async Task<bool> InsertAsync(IEnumerable<Entity.tede2.Group.UserGroupCategory> request)
+        {
+            return await userGroupCategoryRepository.InsertAsync(request, _loginContext.AccountId);
+        }
     }
 }

gx_api/GxPress/Model/GxPress.Entity/tede2/Group/UserGroupCategory.cs

@@ -0,0 +1,25 @@
+using Datory.Annotations;
+
+namespace GxPress.Entity.tede2.Group
+{
+    /// <summary>
+    /// 小组广场用户
+    /// </summary>
+    [DataTable("tede_user_group_category")]
+    public class UserGroupCategory : Datory.Entity
+    {
+        /// <summary>
+        /// 小组广场ID
+        /// </summary>
+        /// <value></value>
+        [DataColumn]
+        public int GroupCategroyId { get; set; }
+        /// <summary>
+        /// 用户ID
+        /// </summary>
+        /// <value></value>
+        [DataColumn]
+        public int UserId { get; set; }
+
+    }
+}

gx_api/GxPress/Repository/GxPress.Repository.Implement/Group/GroupCategroyRepository.cs

@@ -9,6 +9,8 @@ using GxPress.Result.Web;
 using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Options;
 using System.Transactions;
+using Dapper;
+
 namespace GxPress.Repository.Implement.Group
 {
     /// <summary>
@@ -17,15 +19,21 @@ namespace GxPress.Repository.Implement.Group
     public class GroupCategroyRepository : IGroupCategroyRepository
     {
         private readonly Repository<Entity.tede2.Group.GroupCategroy> _repository;
+        private readonly Repository<Entity.tede2.Group.UserGroupCategory> userGroupCategoryRepository;
         private readonly IMapper _mapper;
         private readonly IDistributedCache _cache;
+        private readonly string _connectionString;
+        private readonly string _databaseTypestr;
         public GroupCategroyRepository(IOptionsMonitor<DatabaseOptions> dbOptionsAccessor, IMapper mapper, IDistributedCache cache)
         {
+            _databaseTypestr = dbOptionsAccessor.CurrentValue.DatabaseType;
+            _connectionString = dbOptionsAccessor.CurrentValue.ConnectionString;
             var databaseType = StringUtils.ToEnum<DatabaseType>(dbOptionsAccessor.CurrentValue.DatabaseType, DatabaseType.MySql);
             var database = new Database(databaseType, dbOptionsAccessor.CurrentValue.ConnectionString);
             _mapper = mapper;
             _cache = cache;
             _repository = new Repository<Entity.tede2.Group.GroupCategroy>(database);
+            userGroupCategoryRepository = new Repository<Entity.tede2.Group.UserGroupCategory>(database);
         }
 
         public IDatabase Database => _repository.Database;
@@ -43,6 +51,7 @@ namespace GxPress.Repository.Implement.Group
             return await _repository.InsertAsync(groupCategroy);
         }
 
+
         public async Task<bool> UpdateAsync(Entity.tede2.Group.GroupCategroy groupCategroy)
         {
             if (groupCategroy.Id > 0)
@@ -89,10 +98,32 @@ namespace GxPress.Repository.Implement.Group
         {
             var result = await _repository.GetAllAsync<GroupCategoryResult>(Q.Where(nameof(Entity.tede2.Group.GroupCategroy.ParentId), parentId));
             foreach (var item in result)
+            {
                 item.IsChildren = await _repository.ExistsAsync(Q.Where(nameof(Entity.tede2.Group.GroupCategroy.ParentId), item.Id));
+                item.ImageUrls = StringUtils.AddDomain(item.ImageUrls);
+            }
+            return result;
+        }
+
+        public async Task<IEnumerable<GroupCategoryResult>> GetUserGroupCategroyResult(int userId)
+        {
+            string sql = $@"SELECT 
+                                a.*
+                            FROM
+                                tede_group_piazza a
+                                    INNER JOIN
+                                tede_user_group_category b ON a.id = b.GroupCategroyId
+                            WHERE
+                                b.UserId = {userId}
+                            ORDER BY b.CreatedDate";
+            var databaseType = _databaseTypestr.ToEnum<DatabaseType>(DatabaseType.MySql);
+            var database = new Database(databaseType, _connectionString);
+            var connection = database.GetConnection();
+            var result = await connection.QueryAsync<GroupCategoryResult>(sql);
             foreach (var item in result)
             {
-                item.ImageUrls = StringUtils.AddDomain(item.ImageUrls);
+                item.ImageUrls = StringUtils.AddDomainMin(item.ImageUrls);
+                item.IsChildren = await _repository.ExistsAsync(Q.Where(nameof(Entity.tede2.Group.GroupCategroy.ParentId), item.Id));
             }
             return result;
         }

gx_api/GxPress/Repository/GxPress.Repository.Implement/Group/UserGroupCategoryRepository.cs

@@ -0,0 +1,88 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using AutoMapper;
+using Datory;
+using GxPress.Common.AppOptions;
+using GxPress.Common.Tools;
+using GxPress.Repository.Interface.Group;
+using Microsoft.Extensions.Caching.Distributed;
+using Microsoft.Extensions.Options;
+using System.Transactions;
+using System;
+using System.Linq;
+using Dapper;
+
+namespace GxPress.Repository.Implement.Group
+{
+    public class UserGroupCategoryRepository : IUserGroupCategoryRepository
+    {
+        private readonly Repository<Entity.tede2.Group.UserGroupCategory> _repository;
+        private readonly IMapper _mapper;
+        private readonly IDistributedCache _cache;
+        private readonly string _connectionString;
+        private readonly string _databaseTypestr;
+        public UserGroupCategoryRepository(IOptionsMonitor<DatabaseOptions> dbOptionsAccessor, IMapper mapper, IDistributedCache cache)
+        {
+            _databaseTypestr = dbOptionsAccessor.CurrentValue.DatabaseType;
+            _connectionString = dbOptionsAccessor.CurrentValue.ConnectionString;
+            var databaseType = StringUtils.ToEnum<DatabaseType>(dbOptionsAccessor.CurrentValue.DatabaseType, DatabaseType.MySql);
+            var database = new Database(databaseType, dbOptionsAccessor.CurrentValue.ConnectionString);
+            _mapper = mapper;
+            _cache = cache;
+            _repository = new Repository<Entity.tede2.Group.UserGroupCategory>(database);
+        }
+
+        public IDatabase Database => _repository.Database;
+        public string TableName => _repository.TableName;
+        public List<TableColumn> TableColumns => _repository.TableColumns;
+        /// <summary>
+        /// 添加
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public async Task<bool> InsertAsync(IEnumerable<Entity.tede2.Group.UserGroupCategory> request, int userId)
+        {
+            if (request == null || request.Count() == 0)
+                return true;
+            try
+            {
+                using (var tran = new TransactionScope())
+                {
+                    await _repository.DeleteAsync(Q.Where(nameof(Entity.tede2.Group.UserGroupCategory.UserId), userId));
+                    string sql = $@"INSERT INTO `tede_user_group_category`
+                                                                (`Id`,
+                                                                `Guid`,
+                                                                `CreatedDate`,
+                                                                `GroupCategroyId`,
+                                                                `UserId`,
+                                                                `LastModifiedDate`)
+                                                                 VALUES";
+                    foreach (var item in request)
+                    {
+                        var guid = System.Guid.NewGuid().ToString();
+                        var createdDateValue = DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss");
+                        sql += $@"('{guid}','{createdDateValue}',{item.GroupCategroyId},{item.UserId},'{createdDateValue}'),";
+                    }
+                    sql = sql.Remove(sql.Length - 1, 1);
+                    var databaseType = _databaseTypestr.ToEnum<DatabaseType>(DatabaseType.MySql);
+                    var database = new Database(databaseType, _connectionString);
+                    var connection = database.GetConnection();
+                    var result = await connection.ExecuteAsync(sql);
+                    tran.Complete();
+                }
+            }
+            catch
+            {
+                return false;
+            }
+            return true;
+        }
+
+        public async Task<bool> IsExistsAsync(int userId)
+        {
+            return await _repository.ExistsAsync(Q.Where(nameof(Entity.tede2.Group.UserGroupCategory.UserId), userId));
+        }
+
+    
+    }
+}

gx_api/GxPress/Repository/GxPress.Repository.Interface/Group/IGroupCategroyRepository.cs

@@ -25,5 +25,6 @@ namespace GxPress.Repository.Interface.Group
         /// <param name="parentId"></param>
         /// <returns></returns>
         Task<IEnumerable<GroupCategoryResult>> GetAllAsync(int parentId);
+        Task<IEnumerable<GroupCategoryResult>> GetUserGroupCategroyResult(int userId);
     }
 }

gx_api/GxPress/Repository/GxPress.Repository.Interface/Group/IUserGroupCategoryRepository.cs

@@ -0,0 +1,12 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Datory;
+
+namespace GxPress.Repository.Interface.Group
+{
+    public interface IUserGroupCategoryRepository : IRepository
+    {
+        Task<bool> InsertAsync(IEnumerable<Entity.tede2.Group.UserGroupCategory> request,int userId);
+        Task<bool> IsExistsAsync(int userId);
+    }
+}

gx_api/GxPress/Service/GxPress.Service.Implement/GroupCategroy/GroupCategroyService.cs

@@ -0,0 +1,30 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using GxPress.Repository.Interface.Group;
+using GxPress.Result.Web;
+using GxPress.Service.Interface.GroupCategroy;
+
+namespace GxPress.Service.Implement.GroupCategroy
+{
+    public class GroupCategroyService : IGroupCategroyService
+    {
+        private readonly IGroupCategroyRepository groupCategroyRepository;
+        private readonly IUserGroupCategoryRepository userGroupCategoryRepository;
+        public GroupCategroyService(IGroupCategroyRepository groupCategroyRepository, IUserGroupCategoryRepository userGroupCategoryRepository)
+        {
+            this.groupCategroyRepository = groupCategroyRepository;
+            this.userGroupCategoryRepository = userGroupCategoryRepository;
+        }
+        public async Task<IEnumerable<GroupCategoryResult>> GetGroupCategoryAsync(int parentId, int userId)
+        {
+            if (userId > 0)
+            {
+                if (await userGroupCategoryRepository.IsExistsAsync(userId))
+                {
+                    return await groupCategroyRepository.GetUserGroupCategroyResult(userId);
+                }
+            }
+            return await groupCategroyRepository.GetAllAsync(parentId);
+        }
+    }
+}

gx_api/GxPress/Service/GxPress.Service.Interface/GroupCategroy/IGroupCategroyService.cs

@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using GxPress.Result.Web;
+
+namespace GxPress.Service.Interface.GroupCategroy
+{
+    public interface IGroupCategroyService:IService
+    {
+          Task<IEnumerable<GroupCategoryResult>> GetGroupCategoryAsync(int parentId, int userId);
+    }
+}