merge master

ZR.Service/System/ArticleCategoryService.cs

@@ -15,9 +15,6 @@ namespace ZR.Service.System
     [AppService(ServiceType = typeof(IArticleCategoryService), ServiceLifetime = LifeTime.Transient)]
     public class ArticleCategoryService : BaseService<ArticleCategory>, IArticleCategoryService
     {
-        public ArticleCategoryService(ArticleCategoryRepository repository) : base(repository)
-        {
-        }
         /// <summary>
         /// 构建前端所需要树结构
         /// </summary>

ZR.Service/System/ArticleService.cs

@@ -12,8 +12,5 @@ namespace ZR.Service.System
     [AppService(ServiceType = typeof(IArticleService), ServiceLifetime = LifeTime.Transient)]
     public class ArticleService : BaseService<Article>, IArticleService
     {
-        public ArticleService(ArticleRepository repository) : base(repository)
-        {
-        }
     }
 }

ZR.Service/System/GenTableService.cs

@@ -21,7 +21,7 @@ namespace ZR.Service.System
     {
         private GenTableRepository GenTableRepository;
         private IGenTableColumnService GenTableColumnService;
-        public GenTableService(IGenTableColumnService genTableColumnService, GenTableRepository genTableRepository) : base(genTableRepository)
+        public GenTableService(IGenTableColumnService genTableColumnService, GenTableRepository genTableRepository)
         {
             GenTableColumnService = genTableColumnService;
             GenTableRepository = genTableRepository;
@@ -45,7 +45,7 @@ namespace ZR.Service.System
         /// <returns></returns>
         public int DeleteGenTableByTbName(string tableName)
         {
-            return GenTableRepository.Delete(f => f.TableName == tableName);
+            return GenTableRepository.Delete(f => f.TableName == tableName) ? 1: 0;
         }
 
         /// <summary>
@@ -180,7 +180,7 @@ namespace ZR.Service.System
     {
 
         private GenTableColumnRepository GetTableColumnRepository;
-        public GenTableColumnService(GenTableColumnRepository genTableColumnRepository) : base(genTableColumnRepository)
+        public GenTableColumnService(GenTableColumnRepository genTableColumnRepository)
         {
             GetTableColumnRepository = genTableColumnRepository;
         }

ZR.Service/System/IService/IGenTableService.cs

@@ -4,7 +4,7 @@ using ZR.Model.System.Generate;
 
 namespace ZR.Service.System.IService
 {
-    public interface IGenTableService: IBaseService<GenTable>
+    public interface IGenTableService : IBaseService<GenTable>
     {
         List<GenTable> SelectDbTableListByNamess(string[] tableNames);
 
@@ -19,8 +19,8 @@ namespace ZR.Service.System.IService
         int UpdateGenTable(GenTable genTable);
     }
 
-    public interface IGenTableColumnService: IBaseService<GenTableColumn>
-    {        
+    public interface IGenTableColumnService : IBaseService<GenTableColumn>
+    {
         int InsertGenTableColumn(List<GenTableColumn> tableColumn);
 
         int DeleteGenTableColumn(long tableId);

ZR.Service/System/IService/ISysConfigService.cs

@@ -9,7 +9,7 @@ namespace ZR.Service.System
     /// @author zhaorui
     /// @date 2021-09-29
     /// </summary>
-    public interface ISysConfigService: IBaseService<SysConfig>
+    public interface ISysConfigService : IBaseService<SysConfig>
     {
         SysConfig GetSysConfigByKey(string key);
     }

ZR.Service/System/IService/ISysDeptService.cs

@@ -19,7 +19,7 @@ namespace ZR.Service.System.IService
         List<SysRoleDept> SelectRoleDeptByRoleId(long roleId);
 
         List<long> SelectRoleDepts(long roleId);
-        int DeleteRoleDeptByRoleId(long roleId);
+        bool DeleteRoleDeptByRoleId(long roleId);
         int InsertRoleDepts(SysRole role);
     }
 }

ZR.Service/System/IService/ISysPostService.cs

@@ -10,5 +10,6 @@ namespace ZR.Service.System.IService
     {
         string CheckPostNameUnique(SysPost sysPost);
         string CheckPostCodeUnique(SysPost sysPost);
+        List<SysPost> GetAll();
     }
 }

ZR.Service/System/IService/ISysUserPostService.cs

@@ -10,6 +10,6 @@ namespace ZR.Service.System.IService
         public List<long> GetUserPostsByUserId(long userId);
 
         public string GetPostsStrByUserId(long userId);
-        int Delete(long userId);
+        bool Delete(long userId);
     }
 }

ZR.Service/System/IService/ISysUserService.cs

@@ -5,6 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using ZR.Model;
 using ZR.Model.System;
+using ZR.Repository;
 
 namespace ZR.Service.System.IService
 {

ZR.Service/System/SysConfigService.cs

@@ -11,7 +11,7 @@ namespace ZR.Service.System
     public class SysConfigService : BaseService<SysConfig>, ISysConfigService
     {
         private readonly SysConfigRepository _SysConfigrepository;
-        public SysConfigService(SysConfigRepository repository) : base(repository)
+        public SysConfigService(SysConfigRepository repository)
         {
             _SysConfigrepository = repository;
         }

ZR.Service/System/SysDeptService.cs

@@ -22,7 +22,7 @@ namespace ZR.Service.System
     {
         public SysDeptRepository DeptRepository;
         public SysRoleDeptRepository RoleDeptRepository;
-        public SysDeptService(SysDeptRepository deptRepository, SysRoleDeptRepository roleDeptRepository) : base(deptRepository)
+        public SysDeptService(SysDeptRepository deptRepository, SysRoleDeptRepository roleDeptRepository)
         {
             DeptRepository = deptRepository;
             RoleDeptRepository = roleDeptRepository;
@@ -256,7 +256,7 @@ namespace ZR.Service.System
         /// </summary>
         /// <param name="roleId"></param>
         /// <returns></returns>
-        public int DeleteRoleDeptByRoleId(long roleId)
+        public bool DeleteRoleDeptByRoleId(long roleId)
         {
             return RoleDeptRepository.Delete(f => f.RoleId == roleId);
         }

ZR.Service/System/SysDictDataService.cs

@@ -19,7 +19,7 @@ namespace ZR.Service.System
     {
 
         private readonly SysDictDataRepository SysDictDataRepository;
-        public SysDictDataService(SysDictDataRepository sysDictDataRepository) : base(sysDictDataRepository)
+        public SysDictDataService(SysDictDataRepository sysDictDataRepository)
         {
             SysDictDataRepository = sysDictDataRepository;
         }

ZR.Service/System/SysDictService.cs

@@ -18,7 +18,7 @@ namespace ZR.Service.System
         private SysDictRepository DictRepository;
         private SysDictDataRepository DictDataRepository;
 
-        public SysDictService(SysDictRepository sysDictRepository, SysDictDataRepository dictDataRepository) : base(sysDictRepository)
+        public SysDictService(SysDictRepository sysDictRepository, SysDictDataRepository dictDataRepository)
         {
             this.DictRepository = sysDictRepository;
             this.DictDataRepository = dictDataRepository;

ZR.Service/System/SysFileService.cs

@@ -11,7 +11,6 @@ using System.Net;
 using ZR.Model.System;
 using ZR.Repository.System;
 using Infrastructure.Extensions;
-using SqlSugar.DistributedSystem.Snowflake;
 
 namespace ZR.Service.System
 {
@@ -24,7 +23,7 @@ namespace ZR.Service.System
         private string domainUrl = AppSettings.GetConfig("ALIYUN_OSS:domainUrl");
         private readonly SysFileRepository SysFileRepository;
 
-        public SysFileService(SysFileRepository repository) : base(repository)
+        public SysFileService(SysFileRepository repository)
         {
             SysFileRepository = repository;
         }

ZR.Service/System/SysLoginService.cs

@@ -19,7 +19,7 @@ namespace ZR.Service.System
     {
         private SysLogininfoRepository SysLogininfoRepository;
 
-        public SysLoginService(SysLogininfoRepository sysLogininfo): base(sysLogininfo)
+        public SysLoginService(SysLogininfoRepository sysLogininfo)
         {
             SysLogininfoRepository = sysLogininfo;
         }

ZR.Service/System/SysMenuService.cs

@@ -21,7 +21,7 @@ namespace ZR.Service
 
         public SysMenuService(
             SysMenuRepository menuRepository,
-            ISysRoleService sysRoleService) : base(menuRepository)
+            ISysRoleService sysRoleService)
         {
             MenuRepository = menuRepository;
             SysRoleService = sysRoleService;

ZR.Service/System/SysNoticeService.cs

@@ -20,7 +20,7 @@ namespace ZR.Service.System
     public class SysNoticeService : BaseService<SysNotice>, ISysNoticeService
     {
         private readonly SysNoticeRepository _SysNoticerepository;
-        public SysNoticeService(SysNoticeRepository repository) : base(repository)
+        public SysNoticeService(SysNoticeRepository repository)
         {
             _SysNoticerepository = repository;
         }

ZR.Service/System/SysOperLogService.cs

@@ -1,12 +1,10 @@
-using Infrastructure.Attribute;
-using System.Collections.Generic;
+using Infrastructure;
+using Infrastructure.Attribute;
 using ZR.Model;
-using ZR.Model.System.Dto;
 using ZR.Model.System;
+using ZR.Model.System.Dto;
 using ZR.Repository.System;
 using ZR.Service.System.IService;
-using Infrastructure;
-using Infrastructure.Model;
 
 namespace ZR.Service.System
 {
@@ -18,7 +16,7 @@ namespace ZR.Service.System
     {
         public SysOperLogRepository sysOperLogRepository;
 
-        public SysOperLogService(SysOperLogRepository sysOperLog) : base(sysOperLog)
+        public SysOperLogService(SysOperLogRepository sysOperLog)
         {
             sysOperLogRepository = sysOperLog;
         }

ZR.Service/System/SysPostService.cs

@@ -16,7 +16,7 @@ namespace ZR.Service.System
     public class SysPostService : BaseService<SysPost>, ISysPostService
     {
         public SysPostRepository PostRepository;
-        public SysPostService(SysPostRepository postRepository): base(postRepository)
+        public SysPostService(SysPostRepository postRepository)
         {
             PostRepository = postRepository;
         }
@@ -50,5 +50,10 @@ namespace ZR.Service.System
             }
             return UserConstants.UNIQUE;
         }
+
+        public List<SysPost> GetAll()
+        {
+            return PostRepository.GetAll();
+        }
     }
 }

ZR.Service/System/SysRoleService.cs

@@ -26,7 +26,7 @@ namespace ZR.Service
         public SysRoleService(
             SysRoleRepository sysRoleRepository,
             ISysUserRoleService sysUserRoleService,
-            ISysDeptService deptService) : base(sysRoleRepository)
+            ISysDeptService deptService)
         {
             SysRoleRepository = sysRoleRepository;
             SysUserRoleService = sysUserRoleService;

ZR.Service/System/SysTasksQzService.cs

@@ -11,7 +11,7 @@ namespace ZR.Service.System
     [AppService(ServiceType = typeof(ISysTasksQzService), ServiceLifetime = LifeTime.Transient)]
     public class SysTasksQzService : BaseService<SysTasksQz>, ISysTasksQzService
     {
-        public SysTasksQzService(SysTasksQzRepository repository) : base(repository)
+        public SysTasksQzService(SysTasksQzRepository repository)
         {
         }
     }

ZR.Service/System/SysUserPostService.cs

@@ -59,7 +59,7 @@ namespace ZR.Service.System
             return string.Join(',', list.Select(x => x.PostName));
         }
 
-        public int Delete(long userId)
+        public bool Delete(long userId)
         {
             return UserPostRepository.Delete(x => x.UserId == userId);
         }

ZR.Service/System/SysUserService.cs

@@ -25,7 +25,7 @@ namespace ZR.Service
             SysUserRepository userRepository,
             ISysRoleService sysRoleService,
             ISysUserRoleService userRoleService,
-            ISysUserPostService userPostService) : base(userRepository)
+            ISysUserPostService userPostService)
         {
             UserRepository = userRepository;
             RoleService = sysRoleService;