xf 1 жил өмнө
parent
commit
adedd4fe14
74 өөрчлөгдсөн 111 нэмэгдсэн , 628 устгасан
  1. 2 2
      src/Hotline.Api/Controllers/HomeController.cs
  2. 3 2
      src/Hotline.Api/Controllers/HotSpotController.cs
  3. 3 3
      src/Hotline.Api/Controllers/KnowledgeApplyController.cs
  4. 5 4
      src/Hotline.Api/Controllers/KnowledgeCommonController.cs
  5. 7 7
      src/Hotline.Api/Controllers/KnowledgeController.cs
  6. 14 14
      src/Hotline.Api/Controllers/OrderController.cs
  7. 2 2
      src/Hotline.Api/Controllers/PbxController.cs
  8. 3 2
      src/Hotline.Api/Controllers/PushMessageController.cs
  9. 4 4
      src/Hotline.Api/Controllers/RoleController.cs
  10. 3 2
      src/Hotline.Api/Controllers/SettingController.cs
  11. 9 8
      src/Hotline.Api/Controllers/SysController.cs
  12. 3 2
      src/Hotline.Api/Controllers/TemplateDomainController.cs
  13. 2 2
      src/Hotline.Api/Controllers/TestController.cs
  14. 3 2
      src/Hotline.Application/Handlers/CallCenter/FlowControl/IncomingNotificationHandler.cs
  15. 4 3
      src/Hotline.Application/Handlers/Order/AddVisitNotifyHandler.cs
  16. 3 2
      src/Hotline.Application/Knowledge/KnowApplication.cs
  17. 1 1
      src/Hotline.Repository.SqlSugar/BaseRepositoryWorkflow.cs
  18. 3 0
      src/Hotline.Repository.SqlSugar/Hotline.Repository.SqlSugar.csproj
  19. 0 15
      src/Hotline.Repository.SqlSugar/Knowledge/KnowledgeApplyRepository.cs
  20. 0 15
      src/Hotline.Repository.SqlSugar/Knowledge/KnowledgePVRepository.cs
  21. 0 15
      src/Hotline.Repository.SqlSugar/Knowledge/KnowledgeStandardRepository.cs
  22. 0 17
      src/Hotline.Repository.SqlSugar/Knowledge/KnowledgeTypeRepository.cs
  23. 0 14
      src/Hotline.Repository.SqlSugar/Orders/OrderPublishRepository.cs
  24. 0 14
      src/Hotline.Repository.SqlSugar/Orders/OrderRedoRepository.cs
  25. 0 13
      src/Hotline.Repository.SqlSugar/Orders/OrderSuperviseRepository.cs
  26. 0 13
      src/Hotline.Repository.SqlSugar/Orders/OrderUrgeRepository.cs
  27. 0 19
      src/Hotline.Repository.SqlSugar/Orders/OrderVisitRepository.cs
  28. 0 14
      src/Hotline.Repository.SqlSugar/Orders/OrderVisitedDetailRepository.cs
  29. 0 16
      src/Hotline.Repository.SqlSugar/Push/FWMessage/MessageRepository.cs
  30. 0 15
      src/Hotline.Repository.SqlSugar/Push/MessageTemplateRepository.cs
  31. 0 15
      src/Hotline.Repository.SqlSugar/System/CommonOpinionRepository.cs
  32. 0 15
      src/Hotline.Repository.SqlSugar/System/HotspotTypeRepository.cs
  33. 0 14
      src/Hotline.Repository.SqlSugar/System/SysDicDataRepository.cs
  34. 0 19
      src/Hotline.Repository.SqlSugar/System/SysDicTypeRepository.cs
  35. 0 14
      src/Hotline.Repository.SqlSugar/System/SystemAreaRepository.cs
  36. 0 19
      src/Hotline.Repository.SqlSugar/System/SystemDataTableRepository.cs
  37. 0 14
      src/Hotline.Repository.SqlSugar/System/SystemSettingRepository.cs
  38. 0 19
      src/Hotline.Repository.SqlSugar/System/TableAccessLevelRepository.cs
  39. 0 21
      src/Hotline.Repository.SqlSugar/System/TrunkIvrManagerRepository.cs
  40. 0 14
      src/Hotline.Repository.SqlSugar/Users/UserFastMenuRepository.cs
  41. 3 2
      src/Hotline/Caching/Services/SysDicDataCacheManager.cs
  42. 3 2
      src/Hotline/Caching/Services/SystemSettingCacheManager.cs
  43. 3 2
      src/Hotline/Caching/Services/TableAccessLevelCacheManager.cs
  44. 3 2
      src/Hotline/CallCenter/Ivrs/IvrDomainService.cs
  45. 0 8
      src/Hotline/KnowledgeBase/IKnowledgeApplyRepository.cs.cs
  46. 0 9
      src/Hotline/KnowledgeBase/IKnowledgePVRepository.cs
  47. 0 8
      src/Hotline/KnowledgeBase/IKnowledgeStandardRepository.cs
  48. 0 9
      src/Hotline/KnowledgeBase/IKnowledgeTypeRepository.cs
  49. 3 2
      src/Hotline/KnowledgeBase/KnowledgeDomainService.cs
  50. 3 2
      src/Hotline/KnowledgeBase/KnowledgeTypeDomainService.cs
  51. 0 8
      src/Hotline/Orders/IOrderPublishRepository.cs
  52. 0 9
      src/Hotline/Orders/IOrderRedoRepository.cs
  53. 0 8
      src/Hotline/Orders/IOrderSuperviseRepository.cs
  54. 0 8
      src/Hotline/Orders/IOrderUrgeRepository.cs
  55. 0 8
      src/Hotline/Orders/IOrderVisitRepository.cs
  56. 0 13
      src/Hotline/Orders/IOrderVisitedDetailRepository.cs
  57. 7 6
      src/Hotline/Orders/OrderDomainService.cs
  58. 0 8
      src/Hotline/Push/FWMessage/IMessageRepository.cs
  59. 3 2
      src/Hotline/Push/FWMessage/PushDomainService.cs
  60. 0 8
      src/Hotline/Push/IMessageTemplateRepository.cs
  61. 3 2
      src/Hotline/Settings/CommonOpinions/CommonOpinionDomainService.cs
  62. 0 9
      src/Hotline/Settings/CommonOpinions/ICommonOpinionRepository.cs
  63. 0 9
      src/Hotline/Settings/Hotspots/IHotspotTypeRepository.cs
  64. 0 8
      src/Hotline/Settings/ISysDicDataRepository.cs
  65. 0 9
      src/Hotline/Settings/ISysDicTypeRepository.cs
  66. 0 8
      src/Hotline/Settings/ISystemAreaRepository.cs
  67. 0 9
      src/Hotline/Settings/ISystemButtonRepository.cs
  68. 0 8
      src/Hotline/Settings/ISystemDataTableRepository.cs
  69. 0 8
      src/Hotline/Settings/ISystemSettingRepository.cs
  70. 0 8
      src/Hotline/Settings/ITableAccessLevelRepository.cs
  71. 0 8
      src/Hotline/Settings/ITrunkIvrManagerRepository.cs
  72. 0 8
      src/Hotline/Settings/IUserFastMenuRepository.cs
  73. 3 2
      src/Hotline/Settings/SystemAreaDomainService.cs
  74. 3 2
      src/Hotline/Settings/SystemDomainService.cs

+ 2 - 2
src/Hotline.Api/Controllers/HomeController.cs

@@ -31,7 +31,7 @@ public class HomeController : BaseController
     private readonly ISystemAuthorityRepository _systemAuthorityRepository;
     private readonly ISystemMenuRepository _systemMenuRepository;
     private readonly IMapper _mapper;
-    private readonly IUserFastMenuRepository _userFastMenuRepository;
+    private readonly IRepository<UserFastMenu> _userFastMenuRepository;
     private readonly IRepository<User> _userRepository;
     private readonly ISystemSettingCacheManager _systemSettingCacheManager;
 
@@ -41,7 +41,7 @@ public class HomeController : BaseController
         ISystemAuthorityRepository systemAuthorityRepository,
         ISystemMenuRepository systemMenuRepository,
         IMapper mapper,
-        IUserFastMenuRepository userFastMenuRepository,
+        IRepository<UserFastMenu> userFastMenuRepository,
         IRepository<User> userRepository,
         ISystemSettingCacheManager systemSettingCacheManager)
     {

+ 3 - 2
src/Hotline.Api/Controllers/HotSpotController.cs

@@ -11,6 +11,7 @@ using MapsterMapper;
 using Microsoft.AspNetCore.Mvc;
 using StackExchange.Redis;
 using XF.Domain.Exceptions;
+using XF.Domain.Repository;
 using XF.Utility.EnumExtensions;
 
 namespace Hotline.Api.Controllers
@@ -20,13 +21,13 @@ namespace Hotline.Api.Controllers
     /// </summary>
     public class HotspotController : BaseController
     {
-        private readonly IHotspotTypeRepository _hotspotTypeRepository;
+        private readonly IRepository<Hotspot> _hotspotTypeRepository;
         private readonly IMapper _mapper;
         private readonly ITimeLimitDomainService _timeLimitDomainService;
         private readonly ITimeLimitRepository _timeLimitRepository;
         private readonly ISysDicDataCacheManager _sysDicDataCacheManager;
 
-        public HotspotController(IHotspotTypeRepository hotspotTypeRepository,IMapper mapper, ITimeLimitDomainService timeLimitDomainService, ITimeLimitRepository timeLimitRepository,ISysDicDataCacheManager sysDicDataCacheManager)
+        public HotspotController(IRepository<Hotspot> hotspotTypeRepository,IMapper mapper, ITimeLimitDomainService timeLimitDomainService, ITimeLimitRepository timeLimitRepository,ISysDicDataCacheManager sysDicDataCacheManager)
         {
             _hotspotTypeRepository = hotspotTypeRepository;
             _mapper = mapper;

+ 3 - 3
src/Hotline.Api/Controllers/KnowledgeApplyController.cs

@@ -21,8 +21,8 @@ namespace Hotline.Api.Controllers
     public class KnowledgeApplyController : BaseController
     {
         #region 注入
-        private readonly IKnowledgeRepository _knowledgeRepository;
-        private readonly IKnowledgeApplyRepository _knowledgeApplyRepository;
+        private readonly IRepositoryWorkflow<Knowledge> _knowledgeRepository;
+        private readonly IRepository<KnowledgeApply> _knowledgeApplyRepository;
         private readonly ISessionContext _sessionContext;
         private readonly IMapper _mapper;
         private readonly IKnowApplication _knowApplication;
@@ -41,7 +41,7 @@ namespace Hotline.Api.Controllers
         /// <param name="userRepository"></param>
         /// <param name="systemOrganizeRepository"></param>
         /// <param name="knowledgeDomainService"></param>
-        public KnowledgeApplyController(IKnowledgeRepository knowledgeRepository, IKnowledgeApplyRepository knowledgeApplyRepository, ISessionContext sessionContext
+        public KnowledgeApplyController(IRepositoryWorkflow<Knowledge> knowledgeRepository, IRepository<KnowledgeApply> knowledgeApplyRepository, ISessionContext sessionContext
             , IMapper mapper, IKnowApplication knowApplication, IRepository<User> userRepository, ISystemOrganizeRepository systemOrganizeRepository, IKnowledgeDomainService knowledgeDomainService)
         {
             _knowledgeRepository = knowledgeRepository;

+ 5 - 4
src/Hotline.Api/Controllers/KnowledgeCommonController.cs

@@ -4,6 +4,7 @@ using Hotline.Share.Dtos.Knowledge;
 using MapsterMapper;
 using Microsoft.AspNetCore.Mvc;
 using XF.Domain.Exceptions;
+using XF.Domain.Repository;
 
 namespace Hotline.Api.Controllers
 {
@@ -14,9 +15,9 @@ namespace Hotline.Api.Controllers
     {
 
         #region 注入
-        private readonly IKnowledgeTypeRepository _knowledgeTypeRepository;
+        private readonly IRepository<KnowledgeType> _knowledgeTypeRepository;
         private readonly IKnowledgeTypeDomainService _knowledgeTypeDomainService;
-        private readonly IKnowledgeStandardRepository _knowledgeStandardRepository;
+        private readonly IRepository<KnowledgeStandard> _knowledgeStandardRepository;
         private readonly IMapper _mapper;
 
         /// <summary>
@@ -26,8 +27,8 @@ namespace Hotline.Api.Controllers
         /// <param name="knowledgeTypeDomainService"></param>
         /// <param name="knowledgeStandardRepository"></param>
         /// <param name="mapper"></param>
-        public KnowledgeCommonController(IKnowledgeTypeRepository knowledgeTypeRepository, IKnowledgeTypeDomainService knowledgeTypeDomainService,
-            IKnowledgeStandardRepository knowledgeStandardRepository,
+        public KnowledgeCommonController(IRepository<KnowledgeType> knowledgeTypeRepository, IKnowledgeTypeDomainService knowledgeTypeDomainService,
+            IRepository<KnowledgeStandard> knowledgeStandardRepository,
             IMapper mapper)
         {
             _knowledgeTypeRepository = knowledgeTypeRepository;

+ 7 - 7
src/Hotline.Api/Controllers/KnowledgeController.cs

@@ -30,17 +30,17 @@ namespace Hotline.Api.Controllers
     {
 
         #region 注入
-        private readonly IKnowledgeRepository _knowledgeRepository;
+        private readonly IRepositoryWorkflow<Knowledge> _knowledgeRepository;
         private readonly ISessionContext _sessionContext;
         private readonly IKnowledgeDomainService _knowledgeDomainService;
         private readonly IMapper _mapper;
         private readonly IKnowApplication _knowApplication;
         private readonly IMediator _mediator;
         private readonly IWorkflowApplication _workflowApplication;
-        private readonly IKnowledgeWorkFlowRepository _knowledgeWorkFlowRepository;
+        private readonly IRepositoryWorkflow<KnowledgeWorkFlow> _knowledgeWorkFlowRepository;
         private readonly IRepository<User> _userRepository;
-        private readonly IKnowledgeTypeRepository _knowledgeTypeRepository;
-        private readonly IHotspotTypeRepository _hotspotTypeRepository;
+        private readonly IRepository<KnowledgeType> _knowledgeTypeRepository;
+        private readonly IRepository<Hotspot> _hotspotTypeRepository;
 
 
         /// <summary>
@@ -57,9 +57,9 @@ namespace Hotline.Api.Controllers
         /// <param name="userRepository"></param>
         /// <param name="knowledgeTypeRepository"></param>
         /// <param name="hotspotTypeRepository"></param>
-        public KnowledgeController(IKnowledgeRepository knowledgeRepository, ISessionContext sessionContext, IKnowledgeDomainService knowledgeDomainService, IMapper mapper, IKnowApplication knowApplication,
-           IMediator mediator, IWorkflowApplication workflowApplication, IKnowledgeWorkFlowRepository knowledgeWorkFlowRepository
-            , IRepository<User> userRepository, IKnowledgeTypeRepository knowledgeTypeRepository, IHotspotTypeRepository hotspotTypeRepository)
+        public KnowledgeController(IRepositoryWorkflow<Knowledge> knowledgeRepository, ISessionContext sessionContext, IKnowledgeDomainService knowledgeDomainService, IMapper mapper, IKnowApplication knowApplication,
+           IMediator mediator, IWorkflowApplication workflowApplication, IRepositoryWorkflow<KnowledgeWorkFlow> knowledgeWorkFlowRepository
+            , IRepository<User> userRepository, IRepository<KnowledgeType> knowledgeTypeRepository, IRepository<Hotspot> hotspotTypeRepository)
         {
             _knowledgeRepository = knowledgeRepository;
             _sessionContext = sessionContext;

+ 14 - 14
src/Hotline.Api/Controllers/OrderController.cs

@@ -42,7 +42,7 @@ public class OrderController : BaseController
     private readonly IOrderRepository _orderRepository;
     private readonly IWorkflowApplication _workflowApplication;
     private readonly IWorkflowDomainService _workflowDomainService;
-    private readonly IHotspotTypeRepository _hotspotTypeRepository;
+    private readonly IRepository<Hotspot> _hotspotTypeRepository;
     private readonly ISystemDomainService _systemDomainService;
     private readonly ISystemOrganizeRepository _organizeRepository;
     private readonly IDefinitionDomainService _definitionDomainService;
@@ -50,16 +50,16 @@ public class OrderController : BaseController
     private readonly ISessionContext _sessionContext;
     private readonly IMapper _mapper;
     private readonly IMediator _mediator;
-    private readonly IOrderPublishRepository _orderPublishRepository;
-    private readonly IOrderVisitRepository _orderVisitRepository;
-    private readonly IOrderVisitedDetailRepository _orderVisitedDetailRepository;
+    private readonly IRepository<OrderPublish> _orderPublishRepository;
+    private readonly IRepository<OrderVisit> _orderVisitRepository;
+    private readonly IRepository<OrderVisitDetail> _orderVisitedDetailRepository;
     private readonly ICapPublisher _capPublisher;
     private readonly IRepository<OrderDelay> _orderDelayRepository;
     private readonly ITimeLimitApplication _timeLimitApplication;
     private readonly ISystemSettingCacheManager _systemSettingCacheManager;
-    private readonly IOrderRedoRepository _orderRedoRepository;
-    private readonly IOrderSuperviseRepository _orderSuperviseRepository;
-    private readonly IOrderUrgeRepository _orderUrgeRepository;
+    private readonly IRepository<OrderRedo> _orderRedoRepository;
+    private readonly IRepository<OrderSupervise> _orderSuperviseRepository;
+    private readonly IRepository<OrderUrge> _orderUrgeRepository;
     private readonly IFileRepository _file;
 
 
@@ -68,7 +68,7 @@ public class OrderController : BaseController
         IOrderRepository orderRepository,
         IWorkflowApplication workflowApplication,
         IWorkflowDomainService workflowDomainService,
-        IHotspotTypeRepository hotspotTypeRepository,
+        IRepository<Hotspot> hotspotTypeRepository,
         ISystemDomainService systemDomainService,
         ISystemOrganizeRepository organizeRepository,
         IDefinitionDomainService definitionDomainService,
@@ -76,16 +76,16 @@ public class OrderController : BaseController
         ISessionContext sessionContext,
         IMapper mapper,
         IMediator mediator,
-        IOrderPublishRepository orderPublishRepository,
-        IOrderVisitRepository orderVisitRepository,
-        IOrderVisitedDetailRepository orderVisitedDetailRepository,
+        IRepository<OrderPublish> orderPublishRepository,
+        IRepository<OrderVisit> orderVisitRepository,
+        IRepository<OrderVisitDetail> orderVisitedDetailRepository,
         ICapPublisher capPublisher,
         IRepository<OrderDelay> orderDelayRepository,
         ITimeLimitApplication timeLimitApplication,
         ISystemSettingCacheManager systemSettingCacheManager,
-        IOrderRedoRepository orderRedoRepository,
-        IOrderSuperviseRepository orderSuperviseRepository,
-        IOrderUrgeRepository orderUrgeRepository,
+        IRepository<OrderRedo> orderRedoRepository,
+        IRepository<OrderSupervise> orderSuperviseRepository,
+        IRepository<OrderUrge> orderUrgeRepository,
         IFileRepository file
 		)
     {

+ 2 - 2
src/Hotline.Api/Controllers/PbxController.cs

@@ -47,7 +47,7 @@ namespace Hotline.Api.Controllers
         private readonly IUserCacheManager _userCacheManager;
         private readonly ISessionContext _sessionContext;
         private readonly ICallRepository _callRepository;
-        private readonly ITrunkIvrManagerRepository _trunkIvrManagerRepository;
+        private readonly IRepository<TrunkIvrManager> _trunkIvrManagerRepository;
         private readonly IIvrCategoryRepository _ivrCategoryRepository;
         private readonly IWorkflowApplication _workflowApplication;
         private readonly ISystemSettingCacheManager _systemSettingCacheManager;
@@ -72,7 +72,7 @@ namespace Hotline.Api.Controllers
             IUserCacheManager userCacheManager,
             ISessionContext sessionContext,
             ICallRepository callRepository,
-            ITrunkIvrManagerRepository trunkIvrManagerRepository,
+            IRepository<TrunkIvrManager> trunkIvrManagerRepository,
             IIvrCategoryRepository ivrCategoryRepository,
             IWorkflowApplication workflowApplication,
             ISystemSettingCacheManager systemSettingCacheManager,

+ 3 - 2
src/Hotline.Api/Controllers/PushMessageController.cs

@@ -7,13 +7,14 @@ using MapsterMapper;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using XF.Domain.Filters;
+using XF.Domain.Repository;
 
 namespace Hotline.Api.Controllers
 {
     public class PushMessageController : BaseController
     {
         #region 注入
-        private readonly IMessageRepository _messageRepository;
+        private readonly IRepository<Message> _messageRepository;
         private readonly IMapper _mapper;
         private readonly IPushDomainService _pushDomainService;
 
@@ -23,7 +24,7 @@ namespace Hotline.Api.Controllers
         /// <param name="messageRepository"></param>
         /// <param name="mapper"></param>
         /// <param name="pushDomainService"></param>
-        public PushMessageController(IMessageRepository messageRepository, IMapper mapper, IPushDomainService pushDomainService)
+        public PushMessageController(IRepository<Message> messageRepository, IMapper mapper, IPushDomainService pushDomainService)
         {
             _messageRepository = messageRepository;
             _mapper = mapper;

+ 4 - 4
src/Hotline.Api/Controllers/RoleController.cs

@@ -28,23 +28,23 @@ public class RoleController : BaseController
     private readonly IRepository<Role> _roleRepository;
     private readonly ISystemAuthorityRepository _systemAuthorityRepository;
     private readonly ISystemDataAuthorityRepository _systemDataAuthorityRepository;
-    private readonly ITableAccessLevelRepository _tableAccessLevelRepository;
+    private readonly IRepository<TableAccessLevel> _tableAccessLevelRepository;
     private readonly IMapper _mapper;
     private readonly ITableAccessLevelCacheManager _tableAccessLevelCacheManager;
     private readonly IRolePermissionsCacheManager _rolePermissionsCacheManager;
     private readonly IOptions<IdentityConfiguration> _identityConfigurationAccessor;
-    private readonly ISystemDataTableRepository _systemDataTableRepository;
+    private readonly IRepository<SystemDataTable> _systemDataTableRepository;
 
     public RoleController(
         IRepository<Role> roleRepository,
         ISystemAuthorityRepository systemAuthorityRepository,
         ISystemDataAuthorityRepository systemDataAuthorityRepository,
-        ITableAccessLevelRepository tableAccessLevelRepository,
+        IRepository<TableAccessLevel> tableAccessLevelRepository,
         ITableAccessLevelCacheManager tableAccessLevelCacheManager,
         IRolePermissionsCacheManager rolePermissionsCacheManager,
         IMapper mapper,
         IOptions<IdentityConfiguration> identityConfigurationAccessor,
-        ISystemDataTableRepository systemDataTableRepository)
+        IRepository<SystemDataTable> systemDataTableRepository)
     {
         _roleRepository = roleRepository;
         _systemAuthorityRepository = systemAuthorityRepository;

+ 3 - 2
src/Hotline.Api/Controllers/SettingController.cs

@@ -14,6 +14,7 @@ using Microsoft.AspNetCore.Mvc;
 using MongoDB.Bson;
 using MongoDB.Driver;
 using XF.Domain.Exceptions;
+using XF.Domain.Repository;
 
 namespace Hotline.Api.Controllers
 {
@@ -23,12 +24,12 @@ namespace Hotline.Api.Controllers
     public class SettingController : BaseController
     {
         private readonly IVoiceFileDomainService _voiceFileDomainService;
-        private readonly ISystemSettingRepository _systemSettingsRepository;
+        private readonly IRepository<SystemSetting> _systemSettingsRepository;
         private readonly ISystemSettingCacheManager _systemSettingCacheManager;
         private readonly IDaySettingRepository _daysettingRepository;
         private readonly IMapper _mapper;
 
-        public SettingController(IVoiceFileDomainService voiceFileDomainService, ISystemSettingRepository systemSettingsRepository, ISystemSettingCacheManager systemSettingCacheManager,IDaySettingRepository daySettingRepository, IMapper mapper)
+        public SettingController(IVoiceFileDomainService voiceFileDomainService, IRepository<SystemSetting> systemSettingsRepository, ISystemSettingCacheManager systemSettingCacheManager,IDaySettingRepository daySettingRepository, IMapper mapper)
         {
             _voiceFileDomainService = voiceFileDomainService;
             _systemSettingsRepository = systemSettingsRepository;

+ 9 - 8
src/Hotline.Api/Controllers/SysController.cs

@@ -12,6 +12,7 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using System.Diagnostics.CodeAnalysis;
 using XF.Domain.Exceptions;
+using XF.Domain.Repository;
 
 namespace Hotline.Api.Controllers
 {
@@ -21,12 +22,12 @@ namespace Hotline.Api.Controllers
     public class SysController : BaseController
     {
         private readonly IMapper _mapper;
-        private readonly ISystemSettingRepository _systemSettingsRepository;
+        private readonly IRepository<SystemSetting> _systemSettingsRepository;
         private readonly ISystemMenuRepository _systemMenuRepository;
-        private readonly ISysDicTypeRepository _sysDicTypeRepository;
-        private readonly ISysDicDataRepository _sysDicDataRepository;
+        private readonly IRepository<SysDicType> _sysDicTypeRepository;
+        private readonly IRepository<SysDicData> _sysDicDataRepository;
         private readonly ISystemAreaDomainService _systemAreaDomainService;
-        private readonly ISystemAreaRepository _systemAreaRepository;
+        private readonly IRepository<SystemArea> _systemAreaRepository;
 
 
         /// <summary>
@@ -39,12 +40,12 @@ namespace Hotline.Api.Controllers
         /// <param name="sysDicTypeRepository"></param>
         public SysController(
             IMapper mapper,
-            ISystemSettingRepository systemSettingsRepository,
+            IRepository<SystemSetting> systemSettingsRepository,
             ISystemMenuRepository systemMenuRepository,
-            ISysDicTypeRepository sysDicTypeRepository,
-            ISysDicDataRepository sysDicDataRepository,
+            IRepository<SysDicType> sysDicTypeRepository,
+            IRepository<SysDicData> sysDicDataRepository,
             ISystemAreaDomainService systemAreaDomainService,
-            ISystemAreaRepository systemAreaRepository
+            IRepository<SystemArea> systemAreaRepository
             )
         {
             _mapper = mapper;

+ 3 - 2
src/Hotline.Api/Controllers/TemplateDomainController.cs

@@ -6,12 +6,13 @@ using MapsterMapper;
 using Microsoft.AspNetCore.Mvc;
 using System.Text.RegularExpressions;
 using XF.Domain.Exceptions;
+using XF.Domain.Repository;
 
 namespace Hotline.Api.Controllers
 {
     public class TemplateDomainController : BaseController
     {
-        private readonly IMessageTemplateRepository _messageTemplateRepository;
+        private readonly IRepository<MessageTemplate> _messageTemplateRepository;
         private readonly IMapper _mapper;
 
         /// <summary>
@@ -19,7 +20,7 @@ namespace Hotline.Api.Controllers
         /// </summary>
         /// <param name="messageTemplateRepository"></param>
         /// <param name="mapper"></param>
-        public TemplateDomainController(IMessageTemplateRepository messageTemplateRepository, IMapper mapper)
+        public TemplateDomainController(IRepository<MessageTemplate> messageTemplateRepository, IMapper mapper)
         {
             _messageTemplateRepository = messageTemplateRepository;
             _mapper = mapper;

+ 2 - 2
src/Hotline.Api/Controllers/TestController.cs

@@ -57,7 +57,7 @@ public class TestController : BaseController
     private readonly IDistributedLock _distributedLock;
     private readonly IWexClient _wexClient;
     private readonly ISugarUnitOfWork<WexDbContext> _uowWex;
-    private readonly IOrderUrgeRepository _orderUrgeRepository;
+    private readonly IRepository<OrderUrge> _orderUrgeRepository;
     private readonly IRepositoryTextSearch<OrderTs> _repositoryts;
     private readonly IGroupManager _goupManager;
 
@@ -85,7 +85,7 @@ public class TestController : BaseController
         IDistributedLock distributedLock,
         IWexClient wexClient,
         ISugarUnitOfWork<WexDbContext> uowWex,
-        IOrderUrgeRepository orderUrgeRepository,
+        IRepository<OrderUrge> orderUrgeRepository,
         IRepositoryTextSearch<OrderTs> repositoryts)
     {
         _logger = logger;

+ 3 - 2
src/Hotline.Application/Handlers/CallCenter/FlowControl/IncomingNotificationHandler.cs

@@ -17,6 +17,7 @@ using Org.BouncyCastle.Utilities.IO;
 using XF.Domain.Cache;
 using XF.Domain.Constants;
 using XF.Domain.Exceptions;
+using XF.Domain.Repository;
 
 namespace Hotline.Application.Handlers.CallCenter.FlowControl
 {
@@ -30,7 +31,7 @@ namespace Hotline.Application.Handlers.CallCenter.FlowControl
         private readonly IOptionsSnapshot<CallCenterConfiguration> _options;
         private readonly ITypedCache<List<TrunkIvrManager>> _worktimeCache;
         private readonly ILogger<IncomingNotificationHandler> _logger;
-        private readonly ITrunkIvrManagerRepository _trunkIvrManagerRepository;
+        private readonly IRepository<TrunkIvrManager> _trunkIvrManagerRepository;
         private readonly ICallCacheManager _callCacheManager;
         private readonly IRealtimeService _realtimeService;
 
@@ -43,7 +44,7 @@ namespace Hotline.Application.Handlers.CallCenter.FlowControl
             IOptionsSnapshot<CallCenterConfiguration> options,
             ITypedCache<List<TrunkIvrManager>> worktimeCache,
             ILogger<IncomingNotificationHandler> logger,
-            ITrunkIvrManagerRepository trunkIvrManagerRepository,
+            IRepository<TrunkIvrManager> trunkIvrManagerRepository,
             ICallCacheManager callCacheManager,
             IRealtimeService realtimeService)
         {

+ 4 - 3
src/Hotline.Application/Handlers/Order/AddVisitNotifyHandler.cs

@@ -1,6 +1,7 @@
 using Hotline.Orders;
 using Hotline.Orders.Notifications;
 using MediatR;
+using XF.Domain.Repository;
 
 
 namespace Hotline.Application.Handlers.Order
@@ -9,9 +10,9 @@ namespace Hotline.Application.Handlers.Order
     {
 
 
-        private readonly IOrderVisitRepository _orderVisitRepository;
-        private readonly IOrderVisitedDetailRepository _orderVisitedDetailRepository;
-        public AddVisitNotifyHandler(IOrderVisitRepository orderVisitRepository,IOrderVisitedDetailRepository orderVisitedDetailRepository)
+        private readonly IRepository<OrderVisit> _orderVisitRepository;
+        private readonly IRepository<OrderVisitDetail> _orderVisitedDetailRepository;
+        public AddVisitNotifyHandler(IRepository<OrderVisit> orderVisitRepository, IRepository<OrderVisitDetail> orderVisitedDetailRepository)
         {
             _orderVisitRepository = orderVisitRepository;
             _orderVisitedDetailRepository = orderVisitedDetailRepository;

+ 3 - 2
src/Hotline.Application/Knowledge/KnowApplication.cs

@@ -10,13 +10,14 @@ using MapsterMapper;
 using SqlSugar;
 using XF.Domain.Authentications;
 using XF.Domain.Dependency;
+using XF.Domain.Repository;
 
 namespace Hotline.Application.Knowledge
 {
     public class KnowApplication : IKnowApplication, IScopeDependency
     {
         private readonly IKnowledgeRepository _knowledgeRepository;
-        private readonly IKnowledgeApplyRepository _knowledgeApplyRepository;
+        private readonly IRepository<KnowledgeApply> _knowledgeApplyRepository;
         private readonly ISessionContext _sessionContext;
         private readonly IMapper _mapper;
 
@@ -28,7 +29,7 @@ namespace Hotline.Application.Knowledge
         /// <param name="sessionContext"></param>
         /// <param name="knowledgeDomainService"></param>
         /// <param name="mapper"></param>
-        public KnowApplication(IKnowledgeRepository knowledgeRepository, IKnowledgeApplyRepository knowledgeApplyRepository, ISessionContext sessionContext, IMapper mapper)
+        public KnowApplication(IKnowledgeRepository knowledgeRepository, IRepository<KnowledgeApply> knowledgeApplyRepository, ISessionContext sessionContext, IMapper mapper)
         {
             _knowledgeRepository = knowledgeRepository;
             _knowledgeApplyRepository = knowledgeApplyRepository;

+ 1 - 1
src/Hotline.Repository.SqlSugar/BaseRepositoryWorkflow.cs

@@ -7,7 +7,7 @@ using XF.Domain.Repository;
 
 namespace Hotline.Repository.SqlSugar;
 
-public class BaseRepositoryWorkflow<TEntity> : BaseRepository<TEntity>, IRepositoryWorkflow<TEntity, string>
+public class BaseRepositoryWorkflow<TEntity> : BaseRepository<TEntity>, IRepositoryWorkflow<TEntity>
     where TEntity : class, IEntity<string>, IHasCreationTime, IDataPermission, IWorkflow, new()
 {
     private readonly IDataPermissionFilterBuilder _dataPermissionFilterBuilder;

+ 3 - 0
src/Hotline.Repository.SqlSugar/Hotline.Repository.SqlSugar.csproj

@@ -15,7 +15,10 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Folder Include="Knowledge\" />
+    <Folder Include="Push\FWMessage\" />
     <Folder Include="Ts\" />
+    <Folder Include="Users\" />
   </ItemGroup>
 
 </Project>

+ 0 - 15
src/Hotline.Repository.SqlSugar/Knowledge/KnowledgeApplyRepository.cs

@@ -1,15 +0,0 @@
-using Hotline.KnowledgeBase;
-using Hotline.Repository.SqlSugar.DataPermissions;
-using SqlSugar;
-using XF.Domain.Dependency;
-
-namespace Hotline.Repository.SqlSugar.Knowledge
-{
-    public class KnowledgeApplyRepository : BaseRepository<KnowledgeApply>, IKnowledgeApplyRepository, IScopeDependency
-    {
-        public KnowledgeApplyRepository(ISugarUnitOfWork<HotlineDbContext> uow, IDataPermissionFilterBuilder dataPermissionFilterBuilder) : base(uow, dataPermissionFilterBuilder)
-        {
-
-        }
-    }
-}

+ 0 - 15
src/Hotline.Repository.SqlSugar/Knowledge/KnowledgePVRepository.cs

@@ -1,15 +0,0 @@
-using Hotline.KnowledgeBase;
-using Hotline.Repository.SqlSugar.DataPermissions;
-using SqlSugar;
-using XF.Domain.Dependency;
-
-namespace Hotline.Repository.SqlSugar.Knowledge
-{
-    public class KnowledgePVRepository : BaseRepository<KnowledgePv>, IKnowledgePVRepository, IScopeDependency
-    {
-        public KnowledgePVRepository(ISugarUnitOfWork<HotlineDbContext> uow, IDataPermissionFilterBuilder dataPermissionFilterBuilder) : base(uow, dataPermissionFilterBuilder)
-        {
-
-        }
-    }
-}

+ 0 - 15
src/Hotline.Repository.SqlSugar/Knowledge/KnowledgeStandardRepository.cs

@@ -1,15 +0,0 @@
-using Hotline.KnowledgeBase;
-using Hotline.Repository.SqlSugar.DataPermissions;
-using SqlSugar;
-using XF.Domain.Dependency;
-
-namespace Hotline.Repository.SqlSugar.Knowledge
-{
-    public class KnowledgeStandardRepository : BaseRepository<KnowledgeStandard>, IKnowledgeStandardRepository, IScopeDependency
-    {
-        public KnowledgeStandardRepository(ISugarUnitOfWork<HotlineDbContext> uow, IDataPermissionFilterBuilder dataPermissionFilterBuilder) : base(uow, dataPermissionFilterBuilder)
-        {
-
-        }
-    }
-}

+ 0 - 17
src/Hotline.Repository.SqlSugar/Knowledge/KnowledgeTypeRepository.cs

@@ -1,17 +0,0 @@
-using Hotline.KnowledgeBase;
-using Hotline.Repository.SqlSugar.DataPermissions;
-using SqlSugar;
-using XF.Domain.Dependency;
-
-namespace Hotline.Repository.SqlSugar.Knowledge
-{
-    public class KnowledgeTypeRepository : BaseRepository<KnowledgeType>, IKnowledgeTypeRepository, IScopeDependency
-    {
-        public KnowledgeTypeRepository(ISugarUnitOfWork<HotlineDbContext> uow, IDataPermissionFilterBuilder dataPermissionFilterBuilder) : base(uow, dataPermissionFilterBuilder)
-        {
-
-        }
-
-    }
-
-}

+ 0 - 14
src/Hotline.Repository.SqlSugar/Orders/OrderPublishRepository.cs

@@ -1,14 +0,0 @@
-using Hotline.Orders;
-using Hotline.Repository.SqlSugar.DataPermissions;
-using SqlSugar;
-using XF.Domain.Dependency;
-
-namespace Hotline.Repository.SqlSugar.Orders
-{
-    public class OrderPublishRepository : BaseRepository<OrderPublish>, IOrderPublishRepository, IScopeDependency
-    {
-        public OrderPublishRepository(ISugarUnitOfWork<HotlineDbContext> uow, IDataPermissionFilterBuilder dataPermissionFilterBuilder) : base(uow, dataPermissionFilterBuilder)
-        {
-        }
-    }
-}

+ 0 - 14
src/Hotline.Repository.SqlSugar/Orders/OrderRedoRepository.cs

@@ -1,14 +0,0 @@
-using Hotline.Orders;
-using Hotline.Repository.SqlSugar.DataPermissions;
-using SqlSugar;
-using XF.Domain.Dependency;
-
-namespace Hotline.Repository.SqlSugar.Orders
-{
-    public class OrderRedoRepository : BaseRepository<OrderRedo>, IOrderRedoRepository, IScopeDependency
-    {
-        public OrderRedoRepository(ISugarUnitOfWork<HotlineDbContext> uow, IDataPermissionFilterBuilder dataPermissionFilterBuilder) : base(uow, dataPermissionFilterBuilder)
-        {
-        }
-    }
-}

+ 0 - 13
src/Hotline.Repository.SqlSugar/Orders/OrderSuperviseRepository.cs

@@ -1,13 +0,0 @@
-using Hotline.Orders;
-using Hotline.Repository.SqlSugar.DataPermissions;
-using SqlSugar;
-using XF.Domain.Dependency;
-
-namespace Hotline.Repository.SqlSugar.Orders;
-
-public class OrderSuperviseRepository : BaseRepository<OrderSupervise>, IOrderSuperviseRepository, IScopeDependency
-{
-    public OrderSuperviseRepository(ISugarUnitOfWork<HotlineDbContext> uow, IDataPermissionFilterBuilder dataPermissionFilterBuilder) : base(uow, dataPermissionFilterBuilder)
-    {
-    }
-}

+ 0 - 13
src/Hotline.Repository.SqlSugar/Orders/OrderUrgeRepository.cs

@@ -1,13 +0,0 @@
-using Hotline.Orders;
-using Hotline.Repository.SqlSugar.DataPermissions;
-using SqlSugar;
-using XF.Domain.Dependency;
-
-namespace Hotline.Repository.SqlSugar.Orders;
-
-public class OrderUrgeRepository : BaseRepository<OrderUrge>, IOrderUrgeRepository, IScopeDependency
-{
-    public OrderUrgeRepository(ISugarUnitOfWork<HotlineDbContext> uow, IDataPermissionFilterBuilder dataPermissionFilterBuilder) : base(uow, dataPermissionFilterBuilder)
-    {
-    }
-}

+ 0 - 19
src/Hotline.Repository.SqlSugar/Orders/OrderVisitRepository.cs

@@ -1,19 +0,0 @@
-using Hotline.Orders;
-using Hotline.Repository.SqlSugar.DataPermissions;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using XF.Domain.Dependency;
-
-namespace Hotline.Repository.SqlSugar.Orders
-{
-    public class OrderVisitRepository : BaseRepository<OrderVisit>, IOrderVisitRepository, IScopeDependency
-    {
-        public OrderVisitRepository(ISugarUnitOfWork<HotlineDbContext> uow, IDataPermissionFilterBuilder dataPermissionFilterBuilder) : base(uow, dataPermissionFilterBuilder)
-        {
-        }
-    }
-}

+ 0 - 14
src/Hotline.Repository.SqlSugar/Orders/OrderVisitedDetailRepository.cs

@@ -1,14 +0,0 @@
-using Hotline.Orders;
-using Hotline.Repository.SqlSugar.DataPermissions;
-using SqlSugar;
-using XF.Domain.Dependency;
-
-namespace Hotline.Repository.SqlSugar.Orders
-{
-    public class OrderVisitedDetailRepository : BaseRepository<OrderVisitDetail>, IOrderVisitedDetailRepository, IScopeDependency
-    {
-        public OrderVisitedDetailRepository(ISugarUnitOfWork<HotlineDbContext> uow, IDataPermissionFilterBuilder dataPermissionFilterBuilder) : base(uow, dataPermissionFilterBuilder)
-        {
-        }
-    }
-}

+ 0 - 16
src/Hotline.Repository.SqlSugar/Push/FWMessage/MessageRepository.cs

@@ -1,16 +0,0 @@
-using Hotline.KnowledgeBase;
-using Hotline.Push.FWMessage;
-using Hotline.Repository.SqlSugar.DataPermissions;
-using SqlSugar;
-using XF.Domain.Dependency;
-
-namespace Hotline.Repository.SqlSugar.Push.FWMessage
-{
-    public class MessageRepository : BaseRepository<Message>, IMessageRepository, IScopeDependency
-    {
-        public MessageRepository(ISugarUnitOfWork<HotlineDbContext> uow, IDataPermissionFilterBuilder dataPermissionFilterBuilder) : base(uow, dataPermissionFilterBuilder)
-        {
-
-        }
-    }
-}

+ 0 - 15
src/Hotline.Repository.SqlSugar/Push/MessageTemplateRepository.cs

@@ -1,15 +0,0 @@
-using Hotline.Push;
-using Hotline.Repository.SqlSugar.DataPermissions;
-using SqlSugar;
-using XF.Domain.Dependency;
-
-namespace Hotline.Repository.SqlSugar.Push
-{
-    public class MessageTemplateRepository : BaseRepository<MessageTemplate>, IMessageTemplateRepository, IScopeDependency
-    {
-        public MessageTemplateRepository(ISugarUnitOfWork<HotlineDbContext> uow, IDataPermissionFilterBuilder dataPermissionFilterBuilder) : base(uow, dataPermissionFilterBuilder)
-        {
-
-        }
-    }
-}

+ 0 - 15
src/Hotline.Repository.SqlSugar/System/CommonOpinionRepository.cs

@@ -1,15 +0,0 @@
-using Hotline.Repository.SqlSugar.DataPermissions;
-using Hotline.Settings.CommonOpinions;
-using SqlSugar;
-using XF.Domain.Dependency;
-
-namespace Hotline.Repository.SqlSugar.System
-{
-    public class CommonOpinionRepository : BaseRepository<CommonOpinion>, ICommonOpinionRepository, IScopeDependency
-    {
-        public CommonOpinionRepository(ISugarUnitOfWork<HotlineDbContext> uow, IDataPermissionFilterBuilder dataPermissionFilterBuilder) : base(uow, dataPermissionFilterBuilder)
-        {
-
-        }
-    }
-}

+ 0 - 15
src/Hotline.Repository.SqlSugar/System/HotspotTypeRepository.cs

@@ -1,15 +0,0 @@
-using Hotline.CallCenter.BlackLists;
-using Hotline.Repository.SqlSugar.DataPermissions;
-using Hotline.Settings.Hotspots;
-using SqlSugar;
-using XF.Domain.Dependency;
-
-namespace Hotline.Repository.SqlSugar.System
-{
-    public class HotspotTypeRepository : BaseRepository<Hotspot>, IHotspotTypeRepository, IScopeDependency
-    {
-        public HotspotTypeRepository(ISugarUnitOfWork<HotlineDbContext> uow, IDataPermissionFilterBuilder dataPermissionFilterBuilder) : base(uow, dataPermissionFilterBuilder)
-        {
-        }
-    }
-}

+ 0 - 14
src/Hotline.Repository.SqlSugar/System/SysDicDataRepository.cs

@@ -1,14 +0,0 @@
-using Hotline.Repository.SqlSugar.DataPermissions;
-using Hotline.Settings;
-using SqlSugar;
-using XF.Domain.Dependency;
-
-namespace Hotline.Repository.SqlSugar.System
-{
-    public class SysDicDataRepository : BaseRepository<SysDicData>, ISysDicDataRepository, IScopeDependency
-    {
-        public SysDicDataRepository(ISugarUnitOfWork<HotlineDbContext> uow, IDataPermissionFilterBuilder dataPermissionFilterBuilder) : base(uow, dataPermissionFilterBuilder)
-        {
-        }
-    }
-}

+ 0 - 19
src/Hotline.Repository.SqlSugar/System/SysDicTypeRepository.cs

@@ -1,19 +0,0 @@
-using Hotline.Repository.SqlSugar.DataPermissions;
-using Hotline.Settings;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using XF.Domain.Dependency;
-
-namespace Hotline.Repository.SqlSugar.System
-{
-    public class SysDicTypeRepository : BaseRepository<SysDicType>, ISysDicTypeRepository, IScopeDependency
-    {
-        public SysDicTypeRepository(ISugarUnitOfWork<HotlineDbContext> uow, IDataPermissionFilterBuilder dataPermissionFilterBuilder) : base(uow, dataPermissionFilterBuilder)
-        {
-        }
-    }
-}

+ 0 - 14
src/Hotline.Repository.SqlSugar/System/SystemAreaRepository.cs

@@ -1,14 +0,0 @@
-using Hotline.Repository.SqlSugar.DataPermissions;
-using Hotline.Settings;
-using SqlSugar;
-using XF.Domain.Dependency;
-
-namespace Hotline.Repository.SqlSugar.System
-{
-    public class SystemAreaRepository : BaseRepository<SystemArea>, ISystemAreaRepository, IScopeDependency
-    {
-        public SystemAreaRepository(ISugarUnitOfWork<HotlineDbContext> uow, IDataPermissionFilterBuilder dataPermissionFilterBuilder) : base(uow, dataPermissionFilterBuilder)
-        {
-        }
-    }
-}

+ 0 - 19
src/Hotline.Repository.SqlSugar/System/SystemDataTableRepository.cs

@@ -1,19 +0,0 @@
-using Hotline.Repository.SqlSugar.DataPermissions;
-using Hotline.Settings;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using XF.Domain.Dependency;
-
-namespace Hotline.Repository.SqlSugar.System
-{
-    public class SystemDataTableRepository : BaseRepository<SystemDataTable>, ISystemDataTableRepository, IScopeDependency
-    {
-        public SystemDataTableRepository(ISugarUnitOfWork<HotlineDbContext> uow, IDataPermissionFilterBuilder dataPermissionFilterBuilder) : base(uow, dataPermissionFilterBuilder)
-        {
-        }
-    }
-}

+ 0 - 14
src/Hotline.Repository.SqlSugar/System/SystemSettingRepository.cs

@@ -1,14 +0,0 @@
-using Hotline.Repository.SqlSugar.DataPermissions;
-using Hotline.Settings;
-using SqlSugar;
-using XF.Domain.Dependency;
-
-namespace Hotline.Repository.SqlSugar.System
-{
-    public class SystemSettingRepository : BaseRepository<SystemSetting>, ISystemSettingRepository, IScopeDependency
-    {
-        public SystemSettingRepository(ISugarUnitOfWork<HotlineDbContext> uow, IDataPermissionFilterBuilder dataPermissionFilterBuilder) : base(uow, dataPermissionFilterBuilder)
-        {
-        }
-    }
-}

+ 0 - 19
src/Hotline.Repository.SqlSugar/System/TableAccessLevelRepository.cs

@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Hotline.Repository.SqlSugar.DataPermissions;
-using Hotline.Settings;
-using SqlSugar;
-using XF.Domain.Dependency;
-
-namespace Hotline.Repository.SqlSugar.System
-{
-    public class TableAccessLevelRepository : BaseRepository<TableAccessLevel>, ITableAccessLevelRepository, IScopeDependency
-    {
-        public TableAccessLevelRepository(ISugarUnitOfWork<HotlineDbContext> uow, IDataPermissionFilterBuilder dataPermissionFilterBuilder) : base(uow, dataPermissionFilterBuilder)
-        {
-        }
-    }
-}

+ 0 - 21
src/Hotline.Repository.SqlSugar/System/TrunkIvrManagerRepository.cs

@@ -1,21 +0,0 @@
-using Hotline.Repository.SqlSugar.DataPermissions;
-using Hotline.Settings;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using XF.Domain.Dependency;
-
-namespace Hotline.Repository.SqlSugar.System
-{
-    public class TrunkIvrManagerRepository : BaseRepository<TrunkIvrManager>, ITrunkIvrManagerRepository, IScopeDependency
-    {
-        public TrunkIvrManagerRepository(ISugarUnitOfWork<HotlineDbContext> uow, IDataPermissionFilterBuilder dataPermissionFilterBuilder) : base(uow, dataPermissionFilterBuilder)
-        {
-        }
-
-
-    }
-}

+ 0 - 14
src/Hotline.Repository.SqlSugar/Users/UserFastMenuRepository.cs

@@ -1,14 +0,0 @@
-using Hotline.Repository.SqlSugar.DataPermissions;
-using Hotline.Settings;
-using SqlSugar;
-using XF.Domain.Dependency;
-
-namespace Hotline.Repository.SqlSugar.Users
-{
-    public class UserFastMenuRepository : BaseRepository<UserFastMenu>, IUserFastMenuRepository, IScopeDependency
-    {
-        public UserFastMenuRepository(ISugarUnitOfWork<HotlineDbContext> uow, IDataPermissionFilterBuilder dataPermissionFilterBuilder) : base(uow, dataPermissionFilterBuilder)
-        {
-        }
-    }
-}

+ 3 - 2
src/Hotline/Caching/Services/SysDicDataCacheManager.cs

@@ -2,15 +2,16 @@
 using Hotline.Settings;
 using XF.Domain.Cache;
 using XF.Domain.Dependency;
+using XF.Domain.Repository;
 
 namespace Hotline.Caching.Services
 {
     public class SysDicDataCacheManager : ISysDicDataCacheManager, IScopeDependency
     {
-        private readonly ISysDicDataRepository _sysDicDataRepository;
+        private readonly IRepository<SysDicData> _sysDicDataRepository;
         private readonly ITypedCache<IReadOnlyList<SysDicData>> _cacheSysDicData;
 
-        public SysDicDataCacheManager(ISysDicDataRepository sysDicDataRepository, ITypedCache<IReadOnlyList<SysDicData>> cacheSysDicData)
+        public SysDicDataCacheManager(IRepository<SysDicData> sysDicDataRepository, ITypedCache<IReadOnlyList<SysDicData>> cacheSysDicData)
         {
             _sysDicDataRepository = sysDicDataRepository;
             _cacheSysDicData = cacheSysDicData;

+ 3 - 2
src/Hotline/Caching/Services/SystemSettingCacheManager.cs

@@ -3,6 +3,7 @@ using Hotline.Settings;
 using XF.Domain.Cache;
 using XF.Domain.Dependency;
 using XF.Domain.Exceptions;
+using XF.Domain.Repository;
 
 namespace Hotline.Caching.Services
 {
@@ -10,9 +11,9 @@ namespace Hotline.Caching.Services
     {
 
         private readonly ITypedCache<SystemSetting> _cacheSystemSetting;
-        private readonly ISystemSettingRepository _systemSettingRepository;
+        private readonly IRepository<SystemSetting> _systemSettingRepository;
 
-        public SystemSettingCacheManager(ITypedCache<SystemSetting> cacheSystemSetting, ISystemSettingRepository systemSettingRepository)
+        public SystemSettingCacheManager(ITypedCache<SystemSetting> cacheSystemSetting, IRepository<SystemSetting> systemSettingRepository)
         {
             _cacheSystemSetting = cacheSystemSetting;
             _systemSettingRepository = systemSettingRepository;

+ 3 - 2
src/Hotline/Caching/Services/TableAccessLevelCacheManager.cs

@@ -2,6 +2,7 @@
 using Hotline.Settings;
 using XF.Domain.Cache;
 using XF.Domain.Dependency;
+using XF.Domain.Repository;
 
 namespace Hotline.Caching.Services
 {
@@ -9,9 +10,9 @@ namespace Hotline.Caching.Services
     {
         private const string TableAccessLevelCacheKey = "TableAccessLevel";
         private readonly ITypedCache<IReadOnlyList<TableAccessLevelCacheItem>> _cache;
-        private readonly ITableAccessLevelRepository _repository;
+        private readonly IRepository<TableAccessLevel> _repository;
 
-        public TableAccessLevelCacheManager(ITypedCache<IReadOnlyList<TableAccessLevelCacheItem>> cache, ITableAccessLevelRepository repository)
+        public TableAccessLevelCacheManager(ITypedCache<IReadOnlyList<TableAccessLevelCacheItem>> cache, IRepository<TableAccessLevel> repository)
         {
             _cache = cache;
             _repository = repository;

+ 3 - 2
src/Hotline/CallCenter/Ivrs/IvrDomainService.cs

@@ -8,6 +8,7 @@ using Microsoft.Extensions.Logging;
 using XF.Domain.Cache;
 using XF.Domain.Dependency;
 using XF.Domain.Exceptions;
+using XF.Domain.Repository;
 
 namespace Hotline.CallCenter.Ivrs;
 
@@ -22,7 +23,7 @@ public class IvrDomainService : IIvrDomainService, IScopeDependency
     private readonly IMapper _mapper;
     private readonly ILogger<IvrDomainService> _logger;
     private readonly ITypedCache<List<TrunkIvrManager>> _worktimeCache;
-    private readonly ITrunkIvrManagerRepository _trunkIvrManagerRepository;
+    private readonly IRepository<TrunkIvrManager> _trunkIvrManagerRepository;
 
     public IvrDomainService(
         IDeviceManager deviceManager,
@@ -34,7 +35,7 @@ public class IvrDomainService : IIvrDomainService, IScopeDependency
         IMapper mapper,
         ILogger<IvrDomainService> logger,
         ITypedCache<List<TrunkIvrManager>> worktimeCache,
-        ITrunkIvrManagerRepository trunkIvrManagerRepository)
+        IRepository<TrunkIvrManager> trunkIvrManagerRepository)
     {
         _deviceManager = deviceManager;
         _ivrRepository = ivrRepository;

+ 0 - 8
src/Hotline/KnowledgeBase/IKnowledgeApplyRepository.cs.cs

@@ -1,8 +0,0 @@
-using XF.Domain.Repository;
-
-namespace Hotline.KnowledgeBase
-{
-    public interface IKnowledgeApplyRepository : IRepository<KnowledgeApply>
-    {
-    }
-}

+ 0 - 9
src/Hotline/KnowledgeBase/IKnowledgePVRepository.cs

@@ -1,9 +0,0 @@
-using XF.Domain.Repository;
-
-namespace Hotline.KnowledgeBase
-{
-    public interface IKnowledgePVRepository : IRepository<KnowledgePv>
-    {
-
-    }
-}

+ 0 - 8
src/Hotline/KnowledgeBase/IKnowledgeStandardRepository.cs

@@ -1,8 +0,0 @@
-using XF.Domain.Repository;
-
-namespace Hotline.KnowledgeBase
-{
-    public interface IKnowledgeStandardRepository : IRepository<KnowledgeStandard>
-    {
-    }
-}

+ 0 - 9
src/Hotline/KnowledgeBase/IKnowledgeTypeRepository.cs

@@ -1,9 +0,0 @@
-using XF.Domain.Repository;
-
-namespace Hotline.KnowledgeBase
-{
-    public interface IKnowledgeTypeRepository : IRepository<KnowledgeType>
-    {
-
-    }
-}

+ 3 - 2
src/Hotline/KnowledgeBase/KnowledgeDomainService.cs

@@ -9,6 +9,7 @@ using MapsterMapper;
 using SqlSugar;
 using XF.Domain.Dependency;
 using XF.Domain.Exceptions;
+using XF.Domain.Repository;
 
 namespace Hotline.KnowledgeBase
 {
@@ -16,7 +17,7 @@ namespace Hotline.KnowledgeBase
     {
         private readonly IKnowledgeRepository _knowledgeRepository;
         private readonly IMapper _mapper;
-        private readonly IKnowledgePVRepository _knowledgePVRepository;
+        private readonly IRepository<KnowledgePv> _knowledgePVRepository;
         private readonly IKnowledgeWorkFlowRepository _knowledgeWorkFlowRepository;
         private readonly ICapPublisher _capPublisher;
 
@@ -28,7 +29,7 @@ namespace Hotline.KnowledgeBase
         /// <param name="knowledgePVRepository"></param>
         /// <param name="knowledgeWorkFlowRepository"></param>
         /// <param name="capPublisher"></param>
-        public KnowledgeDomainService(IKnowledgeRepository knowledgeRepository, IMapper mapper, IKnowledgePVRepository knowledgePVRepository
+        public KnowledgeDomainService(IKnowledgeRepository knowledgeRepository, IMapper mapper, IRepository<KnowledgePv> knowledgePVRepository
             , IKnowledgeWorkFlowRepository knowledgeWorkFlowRepository, ICapPublisher capPublisher)
         {
             _knowledgeRepository = knowledgeRepository;

+ 3 - 2
src/Hotline/KnowledgeBase/KnowledgeTypeDomainService.cs

@@ -3,6 +3,7 @@ using Hotline.Share.Enums.KnowledgeBase;
 using MapsterMapper;
 using XF.Domain.Dependency;
 using XF.Domain.Exceptions;
+using XF.Domain.Repository;
 
 namespace Hotline.KnowledgeBase
 {
@@ -11,7 +12,7 @@ namespace Hotline.KnowledgeBase
         /// <summary>
         /// 
         /// </summary>
-        private readonly IKnowledgeTypeRepository _knowledgeTypeRepository;
+        private readonly IRepository<KnowledgeType> _knowledgeTypeRepository;
         private readonly IKnowledgeRepository _knowledgeRepository;
         private readonly IMapper _mapper;
 
@@ -20,7 +21,7 @@ namespace Hotline.KnowledgeBase
         /// </summary>
         /// <param name="knowledgeTypeRepository"></param>
         /// <param name="mapper"></param>
-        public KnowledgeTypeDomainService(IKnowledgeTypeRepository knowledgeTypeRepository, IMapper mapper, IKnowledgeRepository knowledgeRepository)
+        public KnowledgeTypeDomainService(IRepository<KnowledgeType> knowledgeTypeRepository, IMapper mapper, IKnowledgeRepository knowledgeRepository)
         {
             _knowledgeTypeRepository = knowledgeTypeRepository;
             _mapper = mapper;

+ 0 - 8
src/Hotline/Orders/IOrderPublishRepository.cs

@@ -1,8 +0,0 @@
-using XF.Domain.Repository;
-
-namespace Hotline.Orders
-{
-    public interface IOrderPublishRepository: IRepository<OrderPublish>
-    {
-    }
-}

+ 0 - 9
src/Hotline/Orders/IOrderRedoRepository.cs

@@ -1,9 +0,0 @@
-using XF.Domain.Repository;
-
-namespace Hotline.Orders
-{
-    public interface IOrderRedoRepository : IRepository<OrderRedo>
-    {
-
-    }
-}

+ 0 - 8
src/Hotline/Orders/IOrderSuperviseRepository.cs

@@ -1,8 +0,0 @@
-using XF.Domain.Repository;
-
-namespace Hotline.Orders
-{
-	public interface IOrderSuperviseRepository : IRepository<OrderSupervise>
-	{
-	}
-}

+ 0 - 8
src/Hotline/Orders/IOrderUrgeRepository.cs

@@ -1,8 +0,0 @@
-using XF.Domain.Repository;
-
-namespace Hotline.Orders {
-	public interface IOrderUrgeRepository : IRepository<OrderUrge>
-	{
-
-	}
-}

+ 0 - 8
src/Hotline/Orders/IOrderVisitRepository.cs

@@ -1,8 +0,0 @@
-using XF.Domain.Repository;
-
-namespace Hotline.Orders
-{
-    public interface IOrderVisitRepository: IRepository<OrderVisit>
-    {
-    }
-}

+ 0 - 13
src/Hotline/Orders/IOrderVisitedDetailRepository.cs

@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using XF.Domain.Repository;
-
-namespace Hotline.Orders
-{
-    public interface IOrderVisitedDetailRepository: IRepository<OrderVisitDetail>
-    {
-    }
-}

+ 7 - 6
src/Hotline/Orders/OrderDomainService.cs

@@ -14,6 +14,7 @@ using XF.Domain.Dependency;
 using XF.Domain.Entities;
 using XF.Domain.Exceptions;
 using XF.Domain.Extensions;
+using XF.Domain.Repository;
 
 namespace Hotline.Orders;
 
@@ -21,9 +22,9 @@ public class OrderDomainService : IOrderDomainService, IScopeDependency
 {
     private const string OrderNoPrefix = "OrderNo:";
     private readonly IOrderRepository _orderRepository;
-    private readonly IOrderRedoRepository _orderRedoRepository;
-    private readonly IOrderPublishRepository _orderPublishRepository;
-    private readonly IOrderVisitRepository _orderVisitRepository;
+    private readonly IRepository<OrderRedo> _orderRedoRepository;
+    private readonly IRepository<OrderPublish> _orderPublishRepository;
+    private readonly IRepository<OrderVisit> _orderVisitRepository;
     private readonly ITypedCache<CacheOrderNO> _cacheOrderNo;
     private readonly ISessionContext _sessionContext;
     private readonly ICapPublisher _capPublisher;
@@ -32,9 +33,9 @@ public class OrderDomainService : IOrderDomainService, IScopeDependency
 
     public OrderDomainService(
         IOrderRepository orderRepository,
-        IOrderRedoRepository orderRedoRepository,
-        IOrderPublishRepository orderPublishRepository,
-        IOrderVisitRepository orderVisitRepository,
+        IRepository<OrderRedo> orderRedoRepository,
+        IRepository<OrderPublish> orderPublishRepository,
+        IRepository<OrderVisit> orderVisitRepository,
         ITypedCache<CacheOrderNO> cacheOrderNo,
         ISessionContext sessionContext,
         ICapPublisher capPublisher,

+ 0 - 8
src/Hotline/Push/FWMessage/IMessageRepository.cs

@@ -1,8 +0,0 @@
-using XF.Domain.Repository;
-
-namespace Hotline.Push.FWMessage
-{
-    public interface IMessageRepository : IRepository<Message>
-    {
-    }
-}

+ 3 - 2
src/Hotline/Push/FWMessage/PushDomainService.cs

@@ -16,6 +16,7 @@ using System.Xml;
 using XF.Domain.Cache;
 using XF.Domain.Dependency;
 using XF.Domain.Exceptions;
+using XF.Domain.Repository;
 using static System.Runtime.InteropServices.JavaScript.JSType;
 
 namespace Hotline.Push.FWMessage;
@@ -26,7 +27,7 @@ namespace Hotline.Push.FWMessage;
 public class PushDomainService : IPushDomainService, IScopeDependency
 {
     #region 注入
-    private readonly IMessageRepository _messageRepository;
+    private readonly IRepository<Message> _messageRepository;
     private readonly IMapper _mapper;
     private readonly IHttpClientFactory _httpClientFactory;
     private readonly IConfiguration _config;
@@ -43,7 +44,7 @@ public class PushDomainService : IPushDomainService, IScopeDependency
     /// <param name="config"></param>
     /// <param name="mediator"></param>
     /// <param name="cacheWaitSendId"></param>
-    public PushDomainService(IMessageRepository messageRepository, IHttpClientFactory httpClientFactory
+    public PushDomainService(IRepository<Message> messageRepository, IHttpClientFactory httpClientFactory
         , IMapper mapper, IConfiguration config, IMediator mediator, ITypedCache<CacheWaitSendId> cacheWaitSendId)
     {
         _messageRepository = messageRepository;

+ 0 - 8
src/Hotline/Push/IMessageTemplateRepository.cs

@@ -1,8 +0,0 @@
-using XF.Domain.Repository;
-
-namespace Hotline.Push
-{
-    public interface IMessageTemplateRepository : IRepository<MessageTemplate>
-    {
-    }
-}

+ 3 - 2
src/Hotline/Settings/CommonOpinions/CommonOpinionDomainService.cs

@@ -1,13 +1,14 @@
 using XF.Domain.Dependency;
 using XF.Domain.Exceptions;
+using XF.Domain.Repository;
 
 namespace Hotline.Settings.CommonOpinions
 {
     public class CommonOpinionDomainService : ICommonOpinionDomainService, IScopeDependency
     {
-        private readonly ICommonOpinionRepository _commonOpinionRepository;
+        private readonly IRepository<CommonOpinion> _commonOpinionRepository;
 
-        public CommonOpinionDomainService(ICommonOpinionRepository commonOpinionRepository)
+        public CommonOpinionDomainService(IRepository<CommonOpinion> commonOpinionRepository)
         {
             _commonOpinionRepository = commonOpinionRepository;
         }

+ 0 - 9
src/Hotline/Settings/CommonOpinions/ICommonOpinionRepository.cs

@@ -1,9 +0,0 @@
-using XF.Domain.Repository;
-
-namespace Hotline.Settings.CommonOpinions
-{
-    public interface ICommonOpinionRepository : IRepository<CommonOpinion>
-    {
-
-    }
-}

+ 0 - 9
src/Hotline/Settings/Hotspots/IHotspotTypeRepository.cs

@@ -1,9 +0,0 @@
-using XF.Domain.Repository;
-
-namespace Hotline.Settings.Hotspots
-{
-    public interface IHotspotTypeRepository : IRepository<Hotspot>
-    {
-
-    }
-}

+ 0 - 8
src/Hotline/Settings/ISysDicDataRepository.cs

@@ -1,8 +0,0 @@
-using XF.Domain.Repository;
-
-namespace Hotline.Settings
-{
-    public interface ISysDicDataRepository: IRepository<SysDicData>
-    {
-    }
-}

+ 0 - 9
src/Hotline/Settings/ISysDicTypeRepository.cs

@@ -1,9 +0,0 @@
-using XF.Domain.Repository;
-
-namespace Hotline.Settings
-{
-    public interface ISysDicTypeRepository: IRepository<SysDicType>
-    {
-
-    }
-}

+ 0 - 8
src/Hotline/Settings/ISystemAreaRepository.cs

@@ -1,8 +0,0 @@
-using XF.Domain.Repository;
-
-namespace Hotline.Settings
-{
-    public interface ISystemAreaRepository: IRepository<SystemArea>
-    {
-    }
-}

+ 0 - 9
src/Hotline/Settings/ISystemButtonRepository.cs

@@ -1,9 +0,0 @@
-using XF.Domain.Repository;
-
-namespace Hotline.Settings
-{
-    //public interface ISystemButtonRepository: IRepository<SystemButton>
-    //{
-
-    //}
-}

+ 0 - 8
src/Hotline/Settings/ISystemDataTableRepository.cs

@@ -1,8 +0,0 @@
-using XF.Domain.Repository;
-
-namespace Hotline.Settings
-{
-    public interface ISystemDataTableRepository: IRepository<SystemDataTable>
-    {
-    }
-}

+ 0 - 8
src/Hotline/Settings/ISystemSettingRepository.cs

@@ -1,8 +0,0 @@
-using XF.Domain.Repository;
-
-namespace Hotline.Settings
-{
-    public interface ISystemSettingRepository : IRepository<SystemSetting>
-    {
-    }
-}

+ 0 - 8
src/Hotline/Settings/ITableAccessLevelRepository.cs

@@ -1,8 +0,0 @@
-using XF.Domain.Repository;
-
-namespace Hotline.Settings;
-
-public interface ITableAccessLevelRepository : IRepository<TableAccessLevel>
-{
-
-}

+ 0 - 8
src/Hotline/Settings/ITrunkIvrManagerRepository.cs

@@ -1,8 +0,0 @@
-using XF.Domain.Repository;
-
-namespace Hotline.Settings
-{
-    public interface ITrunkIvrManagerRepository: IRepository<TrunkIvrManager>
-    {
-    }
-}

+ 0 - 8
src/Hotline/Settings/IUserFastMenuRepository.cs

@@ -1,8 +0,0 @@
-using XF.Domain.Repository;
-
-namespace Hotline.Settings
-{
-    public interface IUserFastMenuRepository : IRepository<UserFastMenu>
-    {
-    }
-}

+ 3 - 2
src/Hotline/Settings/SystemAreaDomainService.cs

@@ -1,13 +1,14 @@
 using XF.Domain.Dependency;
 using XF.Domain.Exceptions;
+using XF.Domain.Repository;
 
 namespace Hotline.Settings
 {
     public class SystemAreaDomainService : ISystemAreaDomainService, IScopeDependency
     {
-        private readonly ISystemAreaRepository _systemAreaRepository;
+        private readonly IRepository<SystemArea> _systemAreaRepository;
 
-        public SystemAreaDomainService(ISystemAreaRepository systemAreaRepository)
+        public SystemAreaDomainService(IRepository<SystemArea> systemAreaRepository)
         {
             _systemAreaRepository = systemAreaRepository;
         }

+ 3 - 2
src/Hotline/Settings/SystemDomainService.cs

@@ -1,16 +1,17 @@
 using XF.Domain.Dependency;
 using XF.Domain.Exceptions;
+using XF.Domain.Repository;
 
 namespace Hotline.Settings;
 
 public class SystemDomainService : ISystemDomainService, IScopeDependency
 {
     private readonly ISystemOrganizeRepository _organizeRepository;
-    private readonly ISysDicDataRepository _sysDicDataRepository;
+    private readonly IRepository<SysDicData> _sysDicDataRepository;
 
     public SystemDomainService(
         ISystemOrganizeRepository organizeRepository,
-        ISysDicDataRepository sysDicDataRepository)
+        IRepository<SysDicData> sysDicDataRepository)
     {
         _organizeRepository = organizeRepository;
         _sysDicDataRepository = sysDicDataRepository;