1

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

@@ -25,7 +25,7 @@ namespace GxPress.Repository.Implement
 {
     public class GroupRepository : IGroupRepository
     {
-        private readonly Repository<Group> _repository;
+        private readonly Repository<Entity.Group> _repository;
         private readonly IMapper _mapper;
         private readonly IWebHostEnvironment _environment;
         private readonly string _connectionString;
@@ -40,7 +40,7 @@ namespace GxPress.Repository.Implement
             var databaseType =
                 StringUtils.ToEnum<DatabaseType>(dbOptionsAccessor.CurrentValue.DatabaseType, DatabaseType.MySql);
             var database = new Database(databaseType, dbOptionsAccessor.CurrentValue.ConnectionString);
-            _repository = new Repository<Group>(database);
+            _repository = new Repository<Entity.Group>(database);
             _groupUserRepository = new Repository<GroupUser>(database);
             _environment = environment;
             _mapper = mapper;
@@ -55,7 +55,7 @@ namespace GxPress.Repository.Implement
             if (string.IsNullOrEmpty(request.Name))
                 throw new BusinessException("小组名称不能为空");
 
-            var group = new Group
+            var group = new Entity.Group
             {
                 Name = request.Name,
                 AvatarUrl = request.AvatarUrl,
@@ -164,7 +164,7 @@ namespace GxPress.Repository.Implement
             var connection = database.GetConnection();
             var result =
                 await connection
-                    .QueryAsync<GroupUserFindResult, Group, GroupUserFindResult>(sql,
+                    .QueryAsync<GroupUserFindResult, Entity.Group, GroupUserFindResult>(sql,
                         (groupUserFindResult, group) =>
                         {
                             groupUserFindResult.GroupName = group == null ? "" : group.Name;
@@ -285,7 +285,7 @@ namespace GxPress.Repository.Implement
         /// <returns></returns>
         public async Task<GroupDetailResult> GroupDetailByGuIdAsync(string guId, int userId)
         {
-            var groupDetail = await _repository.GetAsync(Q.Where(nameof(Group.Guid), guId));
+            var groupDetail = await _repository.GetAsync(Q.Where(nameof(Entity.Group.Guid), guId));
             if (groupDetail == null)
                 throw new BusinessException("小组不存在");
             if (!string.IsNullOrEmpty(groupDetail.AvatarUrl))
@@ -351,7 +351,7 @@ namespace GxPress.Repository.Implement
             return result;
         }
 
-        public async Task<Group> GetAsync(int id)
+        public async Task<Entity.Group> GetAsync(int id)
         {
             return await _repository.GetAsync(id);
         }
@@ -364,8 +364,8 @@ namespace GxPress.Repository.Implement
         public async Task<bool> SetGroupIsAdminAsync(int groupId)
         {
             var group = await GetAsync(groupId);
-            return await _repository.UpdateAsync(Q.Set(nameof(Group.IsAdmin), !group.IsAdmin)
-                       .Where(nameof(Group.Id), groupId)) > 0;
+            return await _repository.UpdateAsync(Q.Set(nameof(Entity.Group.IsAdmin), !group.IsAdmin)
+                       .Where(nameof(Entity.Group.Id), groupId)) > 0;
         }
         /// <summary>
         /// 是否禁言
@@ -375,8 +375,8 @@ namespace GxPress.Repository.Implement
         public async Task<bool> SetGroupIsWordsAsync(int groupId)
         {
             var group = await GetAsync(groupId);
-            return await _repository.UpdateAsync(Q.Set(nameof(Group.IsWords), !group.IsWords)
-                       .Where(nameof(Group.Id), groupId)) > 0;
+            return await _repository.UpdateAsync(Q.Set(nameof(Entity.Group.IsWords), !group.IsWords)
+                       .Where(nameof(Entity.Group.Id), groupId)) > 0;
         }
 
         public async Task<List<JobGroupResult>> ElasticSearchGroup()
@@ -386,7 +386,7 @@ namespace GxPress.Repository.Implement
             var database = new Database(databaseType, _connectionString);
             var connection = database.GetConnection();
             var items = await connection
-                .QueryAsync<JobGroupResult, Group, User, JobGroupResult>(sql,
+                .QueryAsync<JobGroupResult, Entity.Group, User, JobGroupResult>(sql,
                     (jobGroupResult, group, user) =>
                     {
                         jobGroupResult.MiddleId = jobGroupResult.Id;

gx_api/GxPress/Repository/GxPress.Repository.Implement/GroupUserRepository.cs

@@ -25,7 +25,7 @@ namespace GxPress.Repository.Implement
         private readonly Repository<GroupUser> _repository;
         private readonly IMapper _mapper;
         private readonly IWebHostEnvironment _environment;
-        private readonly Repository<Group> _groupRepository;
+        private readonly Repository<Entity.Group> _groupRepository;
         private readonly string _connectionString;
         private readonly string _databaseTypeStr;
         public GroupUserRepository(IOptionsMonitor<DatabaseOptions> dbOptionsAccessor, IMapper mapper,
@@ -37,7 +37,7 @@ namespace GxPress.Repository.Implement
                 StringUtils.ToEnum<DatabaseType>(dbOptionsAccessor.CurrentValue.DatabaseType, DatabaseType.MySql);
             var database = new Database(databaseType, dbOptionsAccessor.CurrentValue.ConnectionString);
             _repository = new Repository<GroupUser>(database);
-            _groupRepository = new Repository<Group>(database);
+            _groupRepository = new Repository<Entity.Group>(database);
             _environment = environment;
             _mapper = mapper;
         }