xf 8 months ago
parent
commit
06893fa58d
53 changed files with 115 additions and 227 deletions
  1. 1 0
      src/Hotline.Api/StartupHelper.cs
  2. 1 1
      src/Hotline.Api/config/appsettings.Development.json
  3. 1 0
      src/Hotline.Application/ContingencyManagement/ContingencyManagementNotifyHandler.cs
  4. 1 1
      src/Hotline.Application/Handlers/CallCenter/CallState/AlertExtToExtNotificationHandler.cs
  5. 1 1
      src/Hotline.Application/Handlers/CallCenter/CallState/AlertExtToOuterNotificationHandler.cs
  6. 1 1
      src/Hotline.Application/Handlers/CallCenter/CallState/AlertMenuToOuterNotificationHandler.cs
  7. 1 1
      src/Hotline.Application/Handlers/CallCenter/CallState/AlertVisitorToExtNotificationHandler.cs
  8. 1 1
      src/Hotline.Application/Handlers/CallCenter/CallState/DtmfNotificationHandler.cs
  9. 1 1
      src/Hotline.Application/Handlers/CallCenter/CallState/FailedNotificationHandler.cs
  10. 1 1
      src/Hotline.Application/Handlers/CallCenter/CallState/RingExtToExtNotificationHandler.cs
  11. 1 1
      src/Hotline.Application/Handlers/CallCenter/CallState/RingExtToOuterNotificationHandler.cs
  12. 1 1
      src/Hotline.Application/Handlers/CallCenter/CallState/RingMenuToExtNotificationHandler.cs
  13. 1 1
      src/Hotline.Application/Handlers/CallCenter/CallState/RingVisitorToExtNotificationHandler.cs
  14. 1 1
      src/Hotline.Application/Handlers/CallCenter/ExtState/BusyNotificationHandler.cs
  15. 1 0
      src/Hotline.Application/Handlers/CallCenter/ExtState/IdleNotificationHandler.cs
  16. 1 1
      src/Hotline.Application/Handlers/CallCenter/ExtState/OfflineNotificationHandler.cs
  17. 1 1
      src/Hotline.Application/Handlers/CallCenter/ExtState/OnlineNotificationHandler.cs
  18. 1 1
      src/Hotline.Application/Handlers/CallCenter/FlowControl/AnswerExtToExtNoificationHandler.cs
  19. 1 1
      src/Hotline.Application/Handlers/CallCenter/FlowControl/AnswerExtToOuterNotificationHandler.cs
  20. 1 1
      src/Hotline.Application/Handlers/CallCenter/FlowControl/AnswerViisitorToExtNotificationHandler.cs
  21. 1 1
      src/Hotline.Application/Handlers/CallCenter/FlowControl/AnsweredExtToExtNotificationHandler.cs
  22. 1 1
      src/Hotline.Application/Handlers/CallCenter/FlowControl/AnsweredExtToOuterNotificationHandler.cs
  23. 1 1
      src/Hotline.Application/Handlers/CallCenter/FlowControl/AnsweredExtToOuterToExtNotificationHandler.cs
  24. 1 1
      src/Hotline.Application/Handlers/CallCenter/FlowControl/AnsweredVisitorToExtNotificationHandler.cs
  25. 1 1
      src/Hotline.Application/Handlers/CallCenter/FlowControl/ByeExtAndExtNotificationHandler.cs
  26. 1 1
      src/Hotline.Application/Handlers/CallCenter/FlowControl/ByeExtAndOuterOneNotificationHandler.cs
  27. 1 1
      src/Hotline.Application/Handlers/CallCenter/FlowControl/ByeExtAndOuterTwoNotificationHandler.cs
  28. 1 1
      src/Hotline.Application/Handlers/CallCenter/FlowControl/ByeOuterAndOuterNotificationHandler.cs
  29. 1 1
      src/Hotline.Application/Handlers/CallCenter/FlowControl/ByeVisitorAndExtNotificationHandler.cs
  30. 1 1
      src/Hotline.Application/Handlers/CallCenter/FlowControl/ByeVisitorAndMenuNotificationHandler.cs
  31. 1 1
      src/Hotline.Application/Handlers/CallCenter/FlowControl/ByeVisitorAndOuterNotificationHandler.cs
  32. 1 1
      src/Hotline.Application/Handlers/CallCenter/FlowControl/ByeVisitorOffNotificationHandler.cs
  33. 1 1
      src/Hotline.Application/Handlers/CallCenter/FlowControl/CdrNotificationHandler.cs
  34. 1 1
      src/Hotline.Application/Handlers/CallCenter/FlowControl/DivertVisitorToExtNotificationHandler.cs
  35. 1 1
      src/Hotline.Application/Handlers/CallCenter/FlowControl/EndOfAnnOuterToMenuNotificationHandler.cs
  36. 1 1
      src/Hotline.Application/Handlers/CallCenter/FlowControl/EndOfAnnVisitorToMenuNotificationHandler.cs
  37. 1 1
      src/Hotline.Application/Handlers/CallCenter/FlowControl/IncomingNotificationHandler.cs
  38. 1 1
      src/Hotline.Application/Handlers/CallCenter/FlowControl/InviteNotificationHandler.cs
  39. 1 1
      src/Hotline.Application/Handlers/CallCenter/FlowControl/QueueVisitorToGroupBusyNotificationHandler.cs
  40. 1 0
      src/Hotline.Application/Handlers/CallCenter/System/BootupNotificationHandler.cs
  41. 1 1
      src/Hotline.Application/Handlers/CallCenter/Transient/TransientOuterNotificationHandler.cs
  42. 1 1
      src/Hotline.Application/Handlers/CallCenter/Transient/TransinetVisitorNotificationHandler.cs
  43. 1 0
      src/Hotline.Application/Handlers/Order/TranspondCityNotifyHandler.cs
  44. 1 0
      src/Hotline.Application/JudicialManagement/AddPassTheBuckOrderNotifyHandler.cs
  45. 1 0
      src/Hotline.Application/JudicialManagement/JudicialManagementOrderNotifyHandler.cs
  46. 3 0
      src/Hotline.Application/Quality/AiOrderQualityHandler.cs
  47. 0 6
      src/Hotline.Application/Quality/QualityApplication.cs
  48. 63 63
      src/Hotline.Application/Visit/AiOrderVisitService.cs
  49. 0 12
      src/Hotline.Application/Visit/IOrderVisitApplication.cs
  50. 0 30
      src/Hotline.Application/Visit/OrderVisitApplication.cs
  51. 1 1
      src/Hotline/DI/EAppScope.cs
  52. 1 1
      src/Hotline/DI/HandlerInjectAttribute.cs
  53. 2 76
      src/Hotline/Push/FWMessage/PushDomainService.cs

+ 1 - 0
src/Hotline.Api/StartupHelper.cs

@@ -5,6 +5,7 @@ using Hotline.Application;
 using Hotline.Application.Jobs;
 using Hotline.Application.Orders;
 using Hotline.CallCenter.Configs;
+using Hotline.DI;
 using Hotline.Configurations;
 using Hotline.EventBus;
 using Hotline.Identity;

+ 1 - 1
src/Hotline.Api/config/appsettings.Development.json

@@ -1,7 +1,7 @@
 {
   "AllowedHosts": "*",
   "AppConfiguration": {
-    "AppScope": "YiBin",
+    "AppScope": "ZiGong",
     "YiBin": {
       "CallCenterType": "TianRun", //XunShi、WeiErXin、TianRun、XingTang
       //智能回访

+ 1 - 0
src/Hotline.Application/ContingencyManagement/ContingencyManagementNotifyHandler.cs

@@ -1,6 +1,7 @@
 using DotNetCore.CAP;
 using Hotline.ContingencyManagement;
 using Hotline.ContingencyManagement.Notifies;
+using Hotline.DI;
 using Hotline.EventBus;
 using Hotline.Share.Dtos.ContingencyManagement;
 using MapsterMapper;

+ 1 - 1
src/Hotline.Application/Handlers/CallCenter/CallState/AlertExtToExtNotificationHandler.cs

@@ -1,5 +1,5 @@
 using Hotline.Caching.Interfaces;
-using Hotline.EventBus;
+using Hotline.DI;
 using Hotline.Realtimes;
 using Hotline.Share.Dtos.Realtime;
 using Hotline.Share.Enums.CallCenter;

+ 1 - 1
src/Hotline.Application/Handlers/CallCenter/CallState/AlertExtToOuterNotificationHandler.cs

@@ -1,6 +1,6 @@
 using Hotline.Caching.Interfaces;
 using Hotline.CallCenter.Calls;
-using Hotline.EventBus;
+using Hotline.DI;
 using Hotline.Realtimes;
 using Hotline.Share.Dtos.Realtime;
 using Hotline.Share.Enums.CallCenter;

+ 1 - 1
src/Hotline.Application/Handlers/CallCenter/CallState/AlertMenuToOuterNotificationHandler.cs

@@ -1,5 +1,5 @@
 using Hotline.CallCenter.Calls;
-using Hotline.EventBus;
+using Hotline.DI;
 using Hotline.Share.Enums.CallCenter;
 using Hotline.Share.Notifications.NewRockCallCenter;
 using MediatR;

+ 1 - 1
src/Hotline.Application/Handlers/CallCenter/CallState/AlertVisitorToExtNotificationHandler.cs

@@ -1,5 +1,5 @@
 using Hotline.CallCenter.Calls;
-using Hotline.EventBus;
+using Hotline.DI;
 using Hotline.Share.Enums.CallCenter;
 using Hotline.Share.Notifications.NewRockCallCenter;
 using MediatR;

+ 1 - 1
src/Hotline.Application/Handlers/CallCenter/CallState/DtmfNotificationHandler.cs

@@ -2,7 +2,7 @@
 using Hotline.CallCenter.Calls;
 using Hotline.CallCenter.Configs;
 using Hotline.CallCenter.Ivrs;
-using Hotline.EventBus;
+using Hotline.DI;
 using Hotline.Realtimes;
 using Hotline.Share.Enums.CallCenter;
 using Hotline.Share.Notifications.NewRockCallCenter;

+ 1 - 1
src/Hotline.Application/Handlers/CallCenter/CallState/FailedNotificationHandler.cs

@@ -1,5 +1,5 @@
 using Hotline.CallCenter.Calls;
-using Hotline.EventBus;
+using Hotline.DI;
 using Hotline.Share.Notifications.NewRockCallCenter;
 using MediatR;
 

+ 1 - 1
src/Hotline.Application/Handlers/CallCenter/CallState/RingExtToExtNotificationHandler.cs

@@ -1,6 +1,6 @@
 using Hotline.Caching.Interfaces;
 using Hotline.CallCenter.Calls;
-using Hotline.EventBus;
+using Hotline.DI;
 using Hotline.Realtimes;
 using Hotline.Share.Dtos.Realtime;
 using Hotline.Share.Enums.CallCenter;

+ 1 - 1
src/Hotline.Application/Handlers/CallCenter/CallState/RingExtToOuterNotificationHandler.cs

@@ -1,6 +1,6 @@
 using Hotline.Caching.Interfaces;
 using Hotline.CallCenter.Calls;
-using Hotline.EventBus;
+using Hotline.DI;
 using Hotline.Share.Enums.CallCenter;
 using Hotline.Share.Notifications.NewRockCallCenter;
 using Hotline.Tools;

+ 1 - 1
src/Hotline.Application/Handlers/CallCenter/CallState/RingMenuToExtNotificationHandler.cs

@@ -1,4 +1,4 @@
-using Hotline.EventBus;
+using Hotline.DI;
 using Hotline.Share.Notifications.NewRockCallCenter;
 using MediatR;
 

+ 1 - 1
src/Hotline.Application/Handlers/CallCenter/CallState/RingVisitorToExtNotificationHandler.cs

@@ -1,6 +1,6 @@
 using Hotline.Caching.Interfaces;
 using Hotline.CallCenter.Calls;
-using Hotline.EventBus;
+using Hotline.DI;
 using Hotline.Realtimes;
 using Hotline.Share.Enums.CallCenter;
 using Hotline.Share.Notifications.NewRockCallCenter;

+ 1 - 1
src/Hotline.Application/Handlers/CallCenter/ExtState/BusyNotificationHandler.cs

@@ -1,6 +1,6 @@
 using Hotline.Caching.Interfaces;
 using Hotline.CallCenter.Tels;
-using Hotline.EventBus;
+using Hotline.DI;
 using Hotline.Share.Enums.CallCenter;
 using Hotline.Share.Notifications.NewRockCallCenter;
 using MediatR;

+ 1 - 0
src/Hotline.Application/Handlers/CallCenter/ExtState/IdleNotificationHandler.cs

@@ -5,6 +5,7 @@ using Hotline.CallCenter.Devices;
 using Hotline.CallCenter.Tels;
 using Hotline.Configurations;
 using Hotline.EventBus;
+using Hotline.DI;
 using Hotline.NewRock;
 using Hotline.Realtimes;
 using Hotline.Repository.SqlSugar.CallCenter;

+ 1 - 1
src/Hotline.Application/Handlers/CallCenter/ExtState/OfflineNotificationHandler.cs

@@ -1,6 +1,6 @@
 using Hotline.Caching.Interfaces;
 using Hotline.CallCenter.Tels;
-using Hotline.EventBus;
+using Hotline.DI;
 using Hotline.Share.Enums.CallCenter;
 using Hotline.Share.Notifications.NewRockCallCenter;
 using MediatR;

+ 1 - 1
src/Hotline.Application/Handlers/CallCenter/ExtState/OnlineNotificationHandler.cs

@@ -1,6 +1,6 @@
 using Hotline.Caching.Interfaces;
 using Hotline.CallCenter.Tels;
-using Hotline.EventBus;
+using Hotline.DI;
 using Hotline.Share.Enums.CallCenter;
 using Hotline.Share.Notifications.NewRockCallCenter;
 using MediatR;

+ 1 - 1
src/Hotline.Application/Handlers/CallCenter/FlowControl/AnswerExtToExtNoificationHandler.cs

@@ -1,5 +1,5 @@
 using Hotline.Caching.Interfaces;
-using Hotline.EventBus;
+using Hotline.DI;
 using Hotline.Realtimes;
 using Hotline.Share.Dtos.Realtime;
 using Hotline.Share.Enums.CallCenter;

+ 1 - 1
src/Hotline.Application/Handlers/CallCenter/FlowControl/AnswerExtToOuterNotificationHandler.cs

@@ -1,6 +1,6 @@
 using Hotline.Caching.Interfaces;
 using Hotline.CallCenter.Calls;
-using Hotline.EventBus;
+using Hotline.DI;
 using Hotline.Realtimes;
 using Hotline.Share.Dtos.Realtime;
 using Hotline.Share.Enums.CallCenter;

+ 1 - 1
src/Hotline.Application/Handlers/CallCenter/FlowControl/AnswerViisitorToExtNotificationHandler.cs

@@ -1,6 +1,6 @@
 using Hotline.Caching.Interfaces;
 using Hotline.CallCenter.Calls;
-using Hotline.EventBus;
+using Hotline.DI;
 using Hotline.Realtimes;
 using Hotline.Share.Dtos.Realtime;
 using Hotline.Share.Enums.CallCenter;

+ 1 - 1
src/Hotline.Application/Handlers/CallCenter/FlowControl/AnsweredExtToExtNotificationHandler.cs

@@ -1,5 +1,5 @@
 using Hotline.Caching.Interfaces;
-using Hotline.EventBus;
+using Hotline.DI;
 using Hotline.Realtimes;
 using Hotline.Share.Dtos.Realtime;
 using Hotline.Share.Enums.CallCenter;

+ 1 - 1
src/Hotline.Application/Handlers/CallCenter/FlowControl/AnsweredExtToOuterNotificationHandler.cs

@@ -1,6 +1,6 @@
 using Hotline.Caching.Interfaces;
 using Hotline.CallCenter.Calls;
-using Hotline.EventBus;
+using Hotline.DI;
 using Hotline.Realtimes;
 using Hotline.Share.Dtos.Realtime;
 using Hotline.Share.Enums.CallCenter;

+ 1 - 1
src/Hotline.Application/Handlers/CallCenter/FlowControl/AnsweredExtToOuterToExtNotificationHandler.cs

@@ -1,6 +1,6 @@
 using Hotline.Caching.Interfaces;
 using Hotline.CallCenter.Calls;
-using Hotline.EventBus;
+using Hotline.DI;
 using Hotline.Realtimes;
 using Hotline.Share.Dtos.Realtime;
 using Hotline.Share.Enums.CallCenter;

+ 1 - 1
src/Hotline.Application/Handlers/CallCenter/FlowControl/AnsweredVisitorToExtNotificationHandler.cs

@@ -1,6 +1,6 @@
 using Hotline.Caching.Interfaces;
 using Hotline.CallCenter.Calls;
-using Hotline.EventBus;
+using Hotline.DI;
 using Hotline.Realtimes;
 using Hotline.Share.Enums.CallCenter;
 using Hotline.Share.Notifications.NewRockCallCenter;

+ 1 - 1
src/Hotline.Application/Handlers/CallCenter/FlowControl/ByeExtAndExtNotificationHandler.cs

@@ -1,5 +1,5 @@
 using Hotline.Caching.Interfaces;
-using Hotline.EventBus;
+using Hotline.DI;
 using Hotline.Realtimes;
 using Hotline.Share.Dtos.Realtime;
 using Hotline.Share.Notifications.NewRockCallCenter;

+ 1 - 1
src/Hotline.Application/Handlers/CallCenter/FlowControl/ByeExtAndOuterOneNotificationHandler.cs

@@ -1,6 +1,6 @@
 using Hotline.Caching.Interfaces;
 using Hotline.CallCenter.Calls;
-using Hotline.EventBus;
+using Hotline.DI;
 using Hotline.Realtimes;
 using Hotline.Share.Dtos.Realtime;
 using Hotline.Share.Enums.CallCenter;

+ 1 - 1
src/Hotline.Application/Handlers/CallCenter/FlowControl/ByeExtAndOuterTwoNotificationHandler.cs

@@ -1,7 +1,7 @@
 using Hotline.Caching.Interfaces;
 using Hotline.Caching.Services;
 using Hotline.CallCenter.Calls;
-using Hotline.EventBus;
+using Hotline.DI;
 using Hotline.Realtimes;
 using Hotline.Share.Dtos.Realtime;
 using Hotline.Share.Enums.CallCenter;

+ 1 - 1
src/Hotline.Application/Handlers/CallCenter/FlowControl/ByeOuterAndOuterNotificationHandler.cs

@@ -1,5 +1,5 @@
 using Hotline.CallCenter.Calls;
-using Hotline.EventBus;
+using Hotline.DI;
 using Hotline.Share.Enums.CallCenter;
 using Hotline.Share.Notifications.NewRockCallCenter;
 using MediatR;

+ 1 - 1
src/Hotline.Application/Handlers/CallCenter/FlowControl/ByeVisitorAndExtNotificationHandler.cs

@@ -1,6 +1,6 @@
 using Hotline.Caching.Interfaces;
 using Hotline.CallCenter.Calls;
-using Hotline.EventBus;
+using Hotline.DI;
 using Hotline.Realtimes;
 using Hotline.Share.Enums.CallCenter;
 using Hotline.Share.Notifications.NewRockCallCenter;

+ 1 - 1
src/Hotline.Application/Handlers/CallCenter/FlowControl/ByeVisitorAndMenuNotificationHandler.cs

@@ -1,6 +1,6 @@
 using Hotline.Caching.Interfaces;
 using Hotline.CallCenter.Calls;
-using Hotline.EventBus;
+using Hotline.DI;
 using Hotline.Realtimes;
 using Hotline.Share.Dtos.Realtime;
 using Hotline.Share.Enums.CallCenter;

+ 1 - 1
src/Hotline.Application/Handlers/CallCenter/FlowControl/ByeVisitorAndOuterNotificationHandler.cs

@@ -1,5 +1,5 @@
 using Hotline.CallCenter.Calls;
-using Hotline.EventBus;
+using Hotline.DI;
 using Hotline.Share.Notifications.NewRockCallCenter;
 using MediatR;
 

+ 1 - 1
src/Hotline.Application/Handlers/CallCenter/FlowControl/ByeVisitorOffNotificationHandler.cs

@@ -1,6 +1,6 @@
 using Hotline.Caching.Interfaces;
 using Hotline.CallCenter.Calls;
-using Hotline.EventBus;
+using Hotline.DI;
 using Hotline.Realtimes;
 using Hotline.Share.Enums.CallCenter;
 using Hotline.Share.Notifications.NewRockCallCenter;

+ 1 - 1
src/Hotline.Application/Handlers/CallCenter/FlowControl/CdrNotificationHandler.cs

@@ -1,7 +1,7 @@
 using Hotline.Caching.Interfaces;
 using Hotline.CallCenter.Calls;
 using Hotline.CallCenter.Tels;
-using Hotline.EventBus;
+using Hotline.DI;
 using Hotline.Realtimes;
 using Hotline.Share.Dtos.Realtime;
 using Hotline.Share.Enums.CallCenter;

+ 1 - 1
src/Hotline.Application/Handlers/CallCenter/FlowControl/DivertVisitorToExtNotificationHandler.cs

@@ -1,5 +1,5 @@
 using Hotline.CallCenter.Calls;
-using Hotline.EventBus;
+using Hotline.DI;
 using Hotline.Share.Enums.CallCenter;
 using Hotline.Share.Notifications.NewRockCallCenter;
 using MediatR;

+ 1 - 1
src/Hotline.Application/Handlers/CallCenter/FlowControl/EndOfAnnOuterToMenuNotificationHandler.cs

@@ -2,7 +2,7 @@
 using Hotline.CallCenter.Calls;
 using Hotline.CallCenter.Configs;
 using Hotline.CallCenter.Ivrs;
-using Hotline.EventBus;
+using Hotline.DI;
 using Hotline.Realtimes;
 using Hotline.Share.Enums.CallCenter;
 using Hotline.Share.Notifications.NewRockCallCenter;

+ 1 - 1
src/Hotline.Application/Handlers/CallCenter/FlowControl/EndOfAnnVisitorToMenuNotificationHandler.cs

@@ -2,7 +2,7 @@
 using Hotline.CallCenter.Calls;
 using Hotline.CallCenter.Configs;
 using Hotline.CallCenter.Ivrs;
-using Hotline.EventBus;
+using Hotline.DI;
 using Hotline.Realtimes;
 using Hotline.Share.Enums.CallCenter;
 using Hotline.Share.Notifications.NewRockCallCenter;

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

@@ -1,7 +1,7 @@
 using Hotline.Caching.Interfaces;
 using Hotline.CallCenter.Calls;
 using Hotline.CallCenter.Configs;
-using Hotline.EventBus;
+using Hotline.DI;
 using Hotline.Realtimes;
 using Hotline.Settings;
 using Hotline.Share.Enums.CallCenter;

+ 1 - 1
src/Hotline.Application/Handlers/CallCenter/FlowControl/InviteNotificationHandler.cs

@@ -2,7 +2,7 @@
 using Hotline.CallCenter.BlackLists;
 using Hotline.CallCenter.Calls;
 using Hotline.CallCenter.Configs;
-using Hotline.EventBus;
+using Hotline.DI;
 using Hotline.Settings;
 using Hotline.Share.Enums.CallCenter;
 using Hotline.Share.Notifications.NewRockCallCenter;

+ 1 - 1
src/Hotline.Application/Handlers/CallCenter/FlowControl/QueueVisitorToGroupBusyNotificationHandler.cs

@@ -1,6 +1,6 @@
 using Hotline.Caching.Interfaces;
 using Hotline.CallCenter.Calls;
-using Hotline.EventBus;
+using Hotline.DI;
 using Hotline.Realtimes;
 using Hotline.Share.Notifications.NewRockCallCenter;
 using MediatR;

+ 1 - 0
src/Hotline.Application/Handlers/CallCenter/System/BootupNotificationHandler.cs

@@ -5,6 +5,7 @@ using Hotline.CallCenter.Ivrs;
 using Hotline.CallCenter.Tels;
 using Hotline.Configurations;
 using Hotline.EventBus;
+using Hotline.DI;
 using Hotline.NewRock;
 using Hotline.Share.Notifications.NewRockCallCenter;
 using MediatR;

+ 1 - 1
src/Hotline.Application/Handlers/CallCenter/Transient/TransientOuterNotificationHandler.cs

@@ -1,6 +1,6 @@
 using Hotline.Caching.Interfaces;
 using Hotline.CallCenter.Calls;
-using Hotline.EventBus;
+using Hotline.DI;
 using Hotline.Share.Enums.CallCenter;
 using Hotline.Share.Notifications.NewRockCallCenter;
 using Hotline.Tools;

+ 1 - 1
src/Hotline.Application/Handlers/CallCenter/Transient/TransinetVisitorNotificationHandler.cs

@@ -1,5 +1,5 @@
 using Hotline.CallCenter.Calls;
-using Hotline.EventBus;
+using Hotline.DI;
 using Hotline.Share.Notifications.NewRockCallCenter;
 using MediatR;
 

+ 1 - 0
src/Hotline.Application/Handlers/Order/TranspondCityNotifyHandler.cs

@@ -1,4 +1,5 @@
 using DotNetCore.CAP;
+using Hotline.DI;
 using Hotline.EventBus;
 using Hotline.Orders;
 using Hotline.Orders.Notifications;

+ 1 - 0
src/Hotline.Application/JudicialManagement/AddPassTheBuckOrderNotifyHandler.cs

@@ -1,4 +1,5 @@
 using Hotline.Caching.Interfaces;
+using Hotline.DI;
 using Hotline.EventBus;
 using Hotline.JudicialManagement;
 using Hotline.JudicialManagement.Notifies;

+ 1 - 0
src/Hotline.Application/JudicialManagement/JudicialManagementOrderNotifyHandler.cs

@@ -1,4 +1,5 @@
 using Hotline.Caching.Interfaces;
+using Hotline.DI;
 using Hotline.EventBus;
 using Hotline.JudicialManagement;
 using Hotline.JudicialManagement.Notifies;

+ 3 - 0
src/Hotline.Application/Quality/AiOrderQualityHandler.cs

@@ -9,10 +9,13 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Hotline.EventBus;
 using Hotline.Quality.Notifications;
+using Hotline.DI;
 
 namespace Hotline.Application.Quality
 {
+    [HandlerInject(AppScopes = EAppScope.YiBin)]
 	public class AiOrderQualityHandler : INotificationHandler<AiOrderQualityNotify>
 	{
 		private readonly IAiQualityService _aiQualityService;

+ 0 - 6
src/Hotline.Application/Quality/QualityApplication.cs

@@ -35,9 +35,7 @@ namespace Hotline.Application.Quality
         private readonly IMapper _mapper;
         private readonly IRepository<QualityDetail> _qualiteyDetail;
         private readonly IQualityRepository _qualityRepository;
-        private readonly IAiQualityService _aiQualityService;
         private readonly IOrderRepository _orderRepository;
-        //private readonly IRepository<TrCallRecord> _trCallRecordRepository;
         private readonly IRepository<QualityTemplate> _qualityTemplate;
         private readonly ISystemSettingCacheManager _systemSettingCacheManager;
         private readonly ILogger<Hotline.Quality.Quality> _logger;
@@ -51,8 +49,6 @@ namespace Hotline.Application.Quality
             IMapper mapper,
             IRepository<QualityDetail> qualiteyDetail,
             IQualityRepository qualityRepository,
-            IAiQualityService aiQualityService,
-            //IRepository<TrCallRecord> trCallRecordRepository,
             IRepository<QualityTemplate> qualityTemplate,
             IOrderRepository orderRepository,
             ISystemSettingCacheManager systemSettingCacheManager,
@@ -66,8 +62,6 @@ namespace Hotline.Application.Quality
             _mapper = mapper;
             _qualiteyDetail = qualiteyDetail;
             _qualityRepository = qualityRepository;
-            _aiQualityService = aiQualityService;
-            //_trCallRecordRepository = trCallRecordRepository;
             _qualityTemplate = qualityTemplate;
             _orderRepository = orderRepository;
             _systemSettingCacheManager = systemSettingCacheManager;

+ 63 - 63
src/Hotline.Application/Visit/AiOrderVisitService.cs

@@ -1,71 +1,71 @@
 
-using Hotline.Ai.Visit;
-using Hotline.Orders;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using Org.BouncyCastle.Utilities;
-using XF.Domain.Repository;
+//using Hotline.Ai.Visit;
+//using Hotline.Orders;
+//using Microsoft.Extensions.DependencyInjection;
+//using Microsoft.Extensions.Hosting;
+//using Org.BouncyCastle.Utilities;
+//using XF.Domain.Repository;
 
-namespace Hotline.Application.Visit
-{
-    public class AiOrderVisitService : BackgroundService
-    {
-        private readonly IServiceScopeFactory _serviceScopeFactory;
+//namespace Hotline.Application.Visit
+//{
+//    public class AiOrderVisitService : BackgroundService
+//    {
+//        private readonly IServiceScopeFactory _serviceScopeFactory;
 
-        public AiOrderVisitService(IServiceScopeFactory serviceScopeFactory)
-        {
-            _serviceScopeFactory = serviceScopeFactory;
-        }
+//        public AiOrderVisitService(IServiceScopeFactory serviceScopeFactory)
+//        {
+//            _serviceScopeFactory = serviceScopeFactory;
+//        }
 
-        protected override async Task ExecuteAsync(CancellationToken stoppingToken)
-        {
-            using var scope = _serviceScopeFactory.CreateScope();
-            var _aivisitService = scope.ServiceProvider.GetRequiredService<IAiVisitService>();
-            var _aivisitRepository = scope.ServiceProvider.GetRequiredService<IRepository<AiOrderVisit>>();
-            var _aiVisitDetailRepository = scope.ServiceProvider.GetRequiredService<IRepository<AiOrderVisitDetail>>();
-            var _orderVisitRepository = scope.ServiceProvider.GetRequiredService<IRepository<OrderVisit>>();
+//        protected override async Task ExecuteAsync(CancellationToken stoppingToken)
+//        {
+//            using var scope = _serviceScopeFactory.CreateScope();
+//            var _aivisitService = scope.ServiceProvider.GetRequiredService<IAiVisitService>();
+//            var _aivisitRepository = scope.ServiceProvider.GetRequiredService<IRepository<AiOrderVisit>>();
+//            var _aiVisitDetailRepository = scope.ServiceProvider.GetRequiredService<IRepository<AiOrderVisitDetail>>();
+//            var _orderVisitRepository = scope.ServiceProvider.GetRequiredService<IRepository<OrderVisit>>();
 
-            int times = 300000;
-            while (!stoppingToken.IsCancellationRequested)
-            {
-                try
-                {
-                    var aivisitList = await _aivisitRepository.Queryable()
-                    .Includes(x => x.AiOrderVisitDetails,d=>d.OrderVisit).Where(x=>x.TaskState == Share.Enums.Ai.EAiOrderVisitTaskState.InProgress).ToListAsync();
-                    if (aivisitList != null)
-                    {
-                        foreach (var aivisit in aivisitList)
-                        {
-                            foreach (var aivisitDetail in aivisit.AiOrderVisitDetails)
-                            {
-                                if (!string.IsNullOrEmpty(aivisit.BatchUid) && !string.IsNullOrEmpty(aivisitDetail.TaskUid))
-                                {
-                                    var res = await _aivisitService.QueryAiVisitTask(aivisit.BatchUid, aivisitDetail.TaskUid, stoppingToken);
-                                    if(res!=null  && res.Status == 4)
-                                    {
-                                        aivisitDetail.AiOrderVisitState = Share.Enums.Ai.EAiOrderVisitState.LoseEfficacy;
-                                        await _aiVisitDetailRepository.UpdateAsync(aivisitDetail,stoppingToken);
-                                        aivisitDetail.OrderVisit.VisitState = Share.Enums.Order.EVisitState.WaitForVisit;
-                                        aivisitDetail.OrderVisit.IsCanAiVisit = true;
-                                        await _orderVisitRepository.UpdateAsync(aivisitDetail.OrderVisit,stoppingToken);
-                                        aivisit.VisitedFailCount++;
-                                        if ((aivisit.VisitedFailCount + aivisit.VisitedCount) == aivisit.HasVisitCount)
-                                        {
-                                            aivisit.TaskState = Share.Enums.Ai.EAiOrderVisitTaskState.Ended;
-                                        }
-                                        await _aivisitRepository.UpdateAsync(aivisit,stoppingToken);
-                                    }
-                                }
+//            int times = 300000;
+//            while (!stoppingToken.IsCancellationRequested)
+//            {
+//                try
+//                {
+//                    var aivisitList = await _aivisitRepository.Queryable()
+//                    .Includes(x => x.AiOrderVisitDetails,d=>d.OrderVisit).Where(x=>x.TaskState == Share.Enums.Ai.EAiOrderVisitTaskState.InProgress).ToListAsync();
+//                    if (aivisitList != null)
+//                    {
+//                        foreach (var aivisit in aivisitList)
+//                        {
+//                            foreach (var aivisitDetail in aivisit.AiOrderVisitDetails)
+//                            {
+//                                if (!string.IsNullOrEmpty(aivisit.BatchUid) && !string.IsNullOrEmpty(aivisitDetail.TaskUid))
+//                                {
+//                                    var res = await _aivisitService.QueryAiVisitTask(aivisit.BatchUid, aivisitDetail.TaskUid, stoppingToken);
+//                                    if(res!=null  && res.Status == 4)
+//                                    {
+//                                        aivisitDetail.AiOrderVisitState = Share.Enums.Ai.EAiOrderVisitState.LoseEfficacy;
+//                                        await _aiVisitDetailRepository.UpdateAsync(aivisitDetail,stoppingToken);
+//                                        aivisitDetail.OrderVisit.VisitState = Share.Enums.Order.EVisitState.WaitForVisit;
+//                                        aivisitDetail.OrderVisit.IsCanAiVisit = true;
+//                                        await _orderVisitRepository.UpdateAsync(aivisitDetail.OrderVisit,stoppingToken);
+//                                        aivisit.VisitedFailCount++;
+//                                        if ((aivisit.VisitedFailCount + aivisit.VisitedCount) == aivisit.HasVisitCount)
+//                                        {
+//                                            aivisit.TaskState = Share.Enums.Ai.EAiOrderVisitTaskState.Ended;
+//                                        }
+//                                        await _aivisitRepository.UpdateAsync(aivisit,stoppingToken);
+//                                    }
+//                                }
 
-                            }
-                        }
-                    }
+//                            }
+//                        }
+//                    }
                     
-                }
-                catch{}
-                await Task.Delay(times);
-            }
+//                }
+//                catch{}
+//                await Task.Delay(times);
+//            }
            
-        }
-    }
-}
+//        }
+//    }
+//}

+ 0 - 12
src/Hotline.Application/Visit/IOrderVisitApplication.cs

@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Hotline.Application.Visit
-{
-    public interface IOrderVisitApplication
-    {
-    }
-}

+ 0 - 30
src/Hotline.Application/Visit/OrderVisitApplication.cs

@@ -1,30 +0,0 @@
-using Hotline.Ai.Visit;
-using Hotline.Caching.Interfaces;
-using Hotline.Orders;
-using StackExchange.Redis;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using XF.Domain.Constants;
-using XF.Domain.Dependency;
-using XF.Domain.Repository;
-
-namespace Hotline.Application.Visit
-{
-    public class OrderVisitApplication : IOrderVisitApplication, IScopeDependency
-    {
-        private readonly IRepository<AiOrderVisit> _aiOrderVisitRepository;
-        private readonly IAiVisitService _aiVisitService;
-        private readonly ISystemSettingCacheManager _systemSettingCacheManager;
-
-        public OrderVisitApplication(IRepository<AiOrderVisit> aiOrderVisitRepository,IAiVisitService aiVisitService, ISystemSettingCacheManager systemSettingCacheManager)
-        {
-            _aiOrderVisitRepository = aiOrderVisitRepository;
-            _aiVisitService = aiVisitService;
-            _systemSettingCacheManager = systemSettingCacheManager;
-        }
-       
-    }
-}

+ 1 - 1
src/Hotline/EventBus/EAppScope.cs → src/Hotline/DI/EAppScope.cs

@@ -1,4 +1,4 @@
-namespace Hotline.EventBus;
+namespace Hotline.DI;
 
 /// <summary>
 /// 适用范围(prop名称与appsettings.json保持一致)

+ 1 - 1
src/Hotline/EventBus/HandlerInjectAttribute.cs → src/Hotline/DI/HandlerInjectAttribute.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Hotline.EventBus
+namespace Hotline.DI
 {
     [AttributeUsage(AttributeTargets.Class)]
     public class HandlerInjectAttribute : Attribute

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

@@ -27,25 +27,20 @@ public class PushDomainService : IPushDomainService, IScopeDependency
     private readonly IMapper _mapper;
     private readonly IRepository<MessageTemplate> _messageTemplateRepository;
     private readonly ICapPublisher _capPublisher;
-    private readonly IHttpClientFactory _httpClientFactory;
     private readonly ILogger<PushDomainService> _logger;
-
+    
     /// <summary>
     /// 
     /// </summary>
     /// <param name="messageRepository"></param>
     /// <param name="mapper"></param>
-    /// <param name="mediator"></param>
     /// <param name="messageTemplateRepository"></param>
     /// <param name="capPublisher"></param>
-    /// <param name="httpClientFactory"></param>
     /// <param name="logger"></param>
-    /// <param name="sendSmsConfiguration"></param>
     public PushDomainService(IRepository<Message> messageRepository,
         IMapper mapper,
         IRepository<MessageTemplate> messageTemplateRepository,
         ICapPublisher capPublisher,
-        IHttpClientFactory httpClientFactory,
         ILogger<PushDomainService> logger
         )
     {
@@ -53,7 +48,6 @@ public class PushDomainService : IPushDomainService, IScopeDependency
         _mapper = mapper;
         _messageTemplateRepository = messageTemplateRepository;
         _capPublisher = capPublisher;
-        _httpClientFactory = httpClientFactory;
         _logger = logger;
     }
     #endregion
@@ -115,15 +109,6 @@ public class PushDomainService : IPushDomainService, IScopeDependency
         };
         //消息队列
         await _capPublisher.PublishAsync(Hotline.Share.Mq.EventNames.SendSms, pushMessage, cancellationToken: cancellation);
-
-        ////http请求
-        //var result = await ExecuteAsync<PushMessageDto, SendSmsReponse>(_sendSmsConfiguration.Value.Url, pushMessage, cancellationToken: cancellation);
-        //if (result != null && result.code == 0)
-        //{
-        //    message.Status = EPushStatus.Success;
-        //    message.SendState = ESendState.Sending;
-        //    await _messageRepository.UpdateAsync(message, cancellation);
-        //}
     }
 
     /// <summary>
@@ -191,64 +176,5 @@ public class PushDomainService : IPushDomainService, IScopeDependency
             await _messageRepository.UpdateAsync(data, cancellation);
         }
     }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <typeparam name="TRequest"></typeparam>
-    /// <typeparam name="TResponse"></typeparam>
-    /// <param name="path"></param>
-    /// <param name="request"></param>
-    /// <param name="clientInitialize"></param>
-    /// <param name="cancellationToken"></param>
-    /// <returns></returns>
-    private async Task<TResponse?> ExecuteAsync<TRequest, TResponse>(string path, TRequest request,
-            Action<HttpClient>? clientInitialize = null, CancellationToken cancellationToken = default)
-    {
-        var client = _httpClientFactory.CreateClient("sendwaitsms");
-        clientInitialize?.Invoke(client);
-
-        using var responseMessage = await client.PostAsJsonAsync(path, request, cancellationToken);
-        responseMessage.EnsureSuccessStatusCode();
-        var result = await responseMessage.Content.ReadFromJsonAsync<TResponse>(cancellationToken: cancellationToken);
-        return result;
-    }
-
-
-    #region http请求
-
-    /// <summary>
-    /// 封装使用HttpClient调用WebService
-    /// </summary>
-    /// <param name="url">URL地址</param>
-    /// <param name="content">参数</param>
-    /// <returns></returns>
-    private async Task<string> PostHelper(string url, HttpContent content)
-    {
-        _logger.LogInformation($"准备推送短信, {nameof(PostHelper)}");
-        var result = string.Empty;
-        try
-        {
-            using var client = _httpClientFactory.CreateClient();
-            using (var response = await client.PostAsync(url, content))
-            {
-                if (response.StatusCode == HttpStatusCode.OK)
-                {
-                    result = await response.Content.ReadAsStringAsync();
-                    XmlDocument doc = new XmlDocument();
-                    doc.LoadXml(result);
-                    result = doc.InnerText;
-                }
-            }
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex.InnerException?.Message);
-            result = ex.Message;
-        }
-        _logger.LogInformation($"推送响应:{result}");
-        return result;
-    }
-
-    #endregion
+    
 }