1

gx_api/GxPress/Api/GxPress.Api/AdminControllers/AdminGroupCategroyController.cs

@@ -0,0 +1,74 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using GxPress.Repository.Interface.Group;
+using GxPress.Result.Web;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+
+namespace GxPress.Api.AdminControllers
+{
+    /// <summary>
+    /// 小组广场
+    /// </summary>
+    [Route("api/admin/group-categroy")]
+    [ApiController]
+    [Authorize]
+    public class AdminGroupCategroyController : Controller
+    {
+        private readonly IGroupCategroyRepository groupCategroyRepository;
+        public AdminGroupCategroyController(IGroupCategroyRepository groupCategroyRepository)
+        {
+            this.groupCategroyRepository = groupCategroyRepository;
+        }
+        /// <summary>
+        /// 添加小组广场
+        /// </summary>
+        /// <param name="groupCategroy"></param>
+        /// <returns></returns>
+        [HttpPost("add")]
+        public async Task<bool> InsertAsync(Entity.tede2.Group.GroupCategroy groupCategroy)
+        {
+            return await groupCategroyRepository.InsertAsync(groupCategroy) > 0;
+        }
+        /// <summary>
+        /// 修改
+        /// </summary>
+        /// <param name="groupCategroy"></param>
+        /// <returns></returns>
+        [HttpPut]
+        public async Task<bool> UpdateAsync(Entity.tede2.Group.GroupCategroy groupCategroy)
+        {
+            return await groupCategroyRepository.UpdateAsync(groupCategroy);
+        }
+        /// <summary>
+        /// 根据ID查询详情
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [HttpGet("{id}")]
+        public async Task<Entity.tede2.Group.GroupCategroy> GetAsync(int id)
+        {
+            return await groupCategroyRepository.GetAsync(id);
+        }
+        /// <summary>
+        /// 删除
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [HttpDelete]
+        public async Task<bool> DeleteAsync(int id)
+        {
+            return await groupCategroyRepository.DeleteAsync(id);
+        }
+        /// <summary>
+        /// 根据parendId获取
+        /// </summary>
+        /// <param name="parentId"></param>
+        /// <returns></returns>
+        [HttpGet("list/{parentId}")]
+        public async Task<IEnumerable<GroupCategoryResult>> GetAllAsync(int parentId)
+        {
+            return await groupCategroyRepository.GetAllAsync(parentId);
+        }
+    }
+}

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

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
 using System.Data;
-using System.Text;
-using Datory;
 using Datory.Annotations;
 
 namespace GxPress.Entity

gx_api/GxPress/Model/GxPress.Entity/GroupChatUser.cs

@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Datory;
 using Datory.Annotations;
 
 namespace GxPress.Entity

gx_api/GxPress/Model/GxPress.Entity/GroupFolder.cs

@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Datory;
 using Datory.Annotations;
 
 namespace GxPress.Entity

gx_api/GxPress/Model/GxPress.Entity/GroupUser.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
 using GxPress.EnumConst;
-using Datory;
 using Datory.Annotations;
 
 namespace GxPress.Entity

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

@@ -0,0 +1,26 @@
+using Datory.Annotations;
+
+namespace GxPress.Entity.tede2.Group
+{
+    /// <summary>
+    /// 小组广场
+    /// </summary>
+    [DataTable("tede_group_piazza")]
+    public class GroupCategroy : Datory.Entity
+    {
+        /// <summary>
+        /// 广场名称
+        /// </summary>
+        /// <value></value>
+        [DataColumn]
+        public string PiazzaName { get; set; }
+        /// <summary>
+        /// 父级ID
+        /// </summary>
+        /// <value></value>
+        [DataColumn]
+        public int ParentId { get; set; }
+
+
+    }
+}

gx_api/GxPress/Model/GxPress.Mappings/GroupCategroyMapping.cs

@@ -0,0 +1,13 @@
+using AutoMapper;
+using GxPress.Result.Web;
+
+namespace GxPress.Mappings
+{
+    public class GroupCategroyMapping : Profile
+    {
+        public GroupCategroyMapping()
+        {
+            CreateMap<Entity.tede2.Group.GroupCategroy, GroupCategoryResult>();
+        }
+    }
+}

gx_api/GxPress/Model/GxPress.Result/Web/GroupCategoryResult.cs

@@ -0,0 +1,29 @@
+namespace GxPress.Result.Web
+{
+    /// <summary>
+    /// 小组广场
+    /// </summary>
+    public class GroupCategoryResult
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <value></value>
+        public int Id { get; set; }
+        /// <summary>
+        /// 广场名称
+        /// </summary>
+        /// <value></value>
+        public string PiazzaName { get; set; }
+        /// <summary>
+        /// 父级ID
+        /// </summary>
+        /// <value></value>
+        public int ParentId { get; set; }
+        /// <summary>
+        /// 是否存在子集
+        /// </summary>
+        /// <value></value>
+        public bool IsChildren { get; set; }
+    }
+}

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

@@ -0,0 +1,93 @@
+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 GxPress.Result.Web;
+using Microsoft.Extensions.Caching.Distributed;
+using Microsoft.Extensions.Options;
+using System.Transactions;
+namespace GxPress.Repository.Implement.Group
+{
+    /// <summary>
+    /// 小组广场
+    /// </summary>
+    public class GroupCategroyRepository : IGroupCategroyRepository
+    {
+        private readonly Repository<Entity.tede2.Group.GroupCategroy> _repository;
+        private readonly IMapper _mapper;
+        private readonly IDistributedCache _cache;
+        public GroupCategroyRepository(IOptionsMonitor<DatabaseOptions> dbOptionsAccessor, IMapper mapper, IDistributedCache cache)
+        {
+            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);
+        }
+
+        public IDatabase Database => _repository.Database;
+        public string TableName => _repository.TableName;
+        public List<TableColumn> TableColumns => _repository.TableColumns;
+
+        /// <summary>
+        /// 添加小组广场
+        /// </summary>
+        /// <param name="groupCategroy"></param>
+        /// <returns></returns>
+        public async Task<int> InsertAsync(Entity.tede2.Group.GroupCategroy groupCategroy)
+        {
+            return await _repository.InsertAsync(groupCategroy);
+        }
+
+        public async Task<bool> UpdateAsync(Entity.tede2.Group.GroupCategroy groupCategroy)
+        {
+            if (groupCategroy.Id > 0)
+            {
+                var model = await GetAsync(groupCategroy.Id);
+                if (!string.IsNullOrEmpty(groupCategroy.PiazzaName))
+                    model.PiazzaName = groupCategroy.PiazzaName;
+                if (groupCategroy.ParentId > 0)
+                    model.ParentId = groupCategroy.ParentId;
+                return await _repository.UpdateAsync(groupCategroy);
+            }
+            return false;
+        }
+
+        public async Task<Entity.tede2.Group.GroupCategroy> GetAsync(int id)
+        {
+            return await _repository.GetAsync(id);
+        }
+
+        public async Task<bool> DeleteAsync(int id)
+        {
+            try
+            {
+                using (var transactionScope = new TransactionScope())
+                {
+                    await _repository.DeleteAsync(id);
+                    transactionScope.Complete();
+                }
+            }
+            catch
+            {
+                return false;
+            }
+            return true;
+        }
+        /// <summary>
+        /// 根据parendId获取
+        /// </summary>
+        /// <param name="parentId"></param>
+        /// <returns></returns>
+        public async Task<IEnumerable<GroupCategoryResult>> GetAllAsync(int parentId)
+        {
+            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));
+            return result;
+        }
+    }
+}

gx_api/GxPress/Repository/GxPress.Repository.Implement/Navigation/MiddleLableNexusRepository.cs

@@ -66,12 +66,10 @@ namespace GxPress.Repository.Implement.Navigation
             query.OrderByDesc(nameof(Entity.Navigations.MiddleLableNexus.Sort));
             return await _repository.GetAllAsync(query);
         }
-
         public async Task<bool> DeleteByMiddleLableIdAsync(int middleLableId)
         {
             return await _repository.DeleteAsync(Q.Where(nameof(Entity.Navigations.MiddleLableNexus.MiddleLableId), middleLableId)) > 0;
         }
-
         public async Task<bool> UpdateAsync(int middleLableId, List<MiddleLableNexusUpRequest> middleLableNexusUpRequests)
         {
             try

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

@@ -0,0 +1,29 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Datory;
+using GxPress.Result.Web;
+
+namespace GxPress.Repository.Interface.Group
+{
+    public interface IGroupCategroyRepository : IRepository
+    {
+        /// <summary>
+        /// 添加小组广场
+        /// </summary>
+        /// <param name="groupCategroy"></param>
+        /// <returns></returns>
+        Task<int> InsertAsync(Entity.tede2.Group.GroupCategroy groupCategroy);
+
+        Task<bool> UpdateAsync(Entity.tede2.Group.GroupCategroy groupCategroy);
+
+        Task<Entity.tede2.Group.GroupCategroy> GetAsync(int id);
+
+        Task<bool> DeleteAsync(int id);
+        /// <summary>
+        /// 根据parendId获取
+        /// </summary>
+        /// <param name="parentId"></param>
+        /// <returns></returns>
+        Task<IEnumerable<GroupCategoryResult>> GetAllAsync(int parentId);
+    }
+}