TANG JIANG 1 year ago
parent
commit
d3ebe1bc25
25 changed files with 18 additions and 168 deletions
  1. 4 4
      src/Sharing.Api/Controllers/HotlineMessageReceiveController.cs
  2. 0 1
      src/Sharing.Province/Controllers/ProvinceController.cs
  3. 1 1
      src/Sharing.Province/DefaultPusher.cs
  4. 1 1
      src/Sharing.Province/Dtos/HuiJu/Send/SubmitCaseInfoRequest.cs
  5. 4 1
      src/Sharing.Province/Dtos/XieTong/Knowledge/GetKnowledgeInfoAbandonRequest.cs
  6. 1 8
      src/Sharing.Province/Dtos/XieTong/Receive/RemindCaseInfoRequest.cs
  7. 0 12
      src/Sharing.Province/Dtos/XieTong/Send/DelayCaseInfoSendRequest.cs
  8. 0 12
      src/Sharing.Province/Dtos/XieTong/Send/GetCaseBackApplyRequest.cs
  9. 0 12
      src/Sharing.Province/Dtos/XieTong/Send/GetCaseProcessReceiveRequest.cs
  10. 0 12
      src/Sharing.Province/Dtos/XieTong/Send/GetCaseResultReceiveRequest.cs
  11. 0 12
      src/Sharing.Province/Dtos/XieTong/Send/GetVisitInfoReceiveRequest.cs
  12. 1 1
      src/Sharing.Province/Dtos/XieTong/Send/SendRealTimeStatusRequest.cs
  13. 0 12
      src/Sharing.Province/Dtos/XieTong/Send/SendSuperviseProcessInfoRequest.cs
  14. 0 12
      src/Sharing.Province/Dtos/XieTong/Send/SendSuperviseResultInfoRequest.cs
  15. 1 6
      src/Sharing.Province/Handlers/Knowledge/GetKnowledgeInfoAbandonHandler.cs
  16. 1 6
      src/Sharing.Province/Handlers/Knowledge/GetKnowledgeInfoUpdateHandler.cs
  17. 0 7
      src/Sharing.Province/Handlers/XieTong/DelayCaseInfoSendHandler.cs
  18. 0 7
      src/Sharing.Province/Handlers/XieTong/GetCaseBackApplyHandler.cs
  19. 0 7
      src/Sharing.Province/Handlers/XieTong/GetCaseProcessReceiveHandler.cs
  20. 0 7
      src/Sharing.Province/Handlers/XieTong/GetCaseResultReceiveHandler.cs
  21. 0 7
      src/Sharing.Province/Handlers/XieTong/GetVisitInfoReceiveHandler.cs
  22. 0 6
      src/Sharing.Province/Handlers/XieTong/SendRevokeCaseInfoHandler.cs
  23. 0 7
      src/Sharing.Province/Handlers/XieTong/SendSuperviseProcessInfoHandler.cs
  24. 0 7
      src/Sharing.Province/Handlers/XieTong/SendSuperviseResultInfoHandler.cs
  25. 4 0
      src/Sharing/Notifications/XieTong/SendCaseInfoNotification.cs

+ 4 - 4
src/Sharing.Api/Controllers/HotlineMessageReceiveController.cs

@@ -513,7 +513,7 @@ namespace Sharing.Api.Controllers
         /// <param name="dto"></param>
         /// <returns></returns>
         [NonAction]
-        // [CapSubscribe(Hotline.Share.Mq.EventNames.HotlineOrderCreated)]
+        // [CapSubscribe(Hotline.Share.Mq.EventNames.SendCaseInfo)]
         public async Task SendCaseInfo(OrderDto dto)
         {
             //处理数据
@@ -632,7 +632,7 @@ namespace Sharing.Api.Controllers
         /// <param name="dto"></param>
         /// <returns></returns>
         [NonAction]
-        //[CapSubscribe(Hotline.Share.Mq.EventNames.HotlineOrderCreated)]
+        //[CapSubscribe(Hotline.Share.Mq.EventNames.SupplyCaseInfoSend)]
         public async Task SupplyCaseInfoSend(SupplyCaseInfoSendInfo dto)
         {
             var data = _mapper.Map<SupplyCaseInfoSend>(dto);
@@ -651,7 +651,7 @@ namespace Sharing.Api.Controllers
         /// <param name="dto"></param>
         /// <returns></returns>
         [NonAction]
-        //[CapSubscribe(Hotline.Share.Mq.EventNames.HotlineOrderCreated)]
+        //[CapSubscribe(Hotline.Share.Mq.EventNames.SendRevokeCaseInfo)]
         public async Task SendRevokeCaseInfo(RevokeCaseInfoInfo dto)
         {
             var data = _mapper.Map<RevokeCaseInfo>(dto);
@@ -670,7 +670,7 @@ namespace Sharing.Api.Controllers
         /// <param name="dto"></param>
         /// <returns></returns>
         [NonAction]
-        //[CapSubscribe(Hotline.Share.Mq.EventNames.HotlineOrderCreated)]
+        //[CapSubscribe(Hotline.Share.Mq.EventNames.SendRemindCaseInfo)]
         public async Task SendRemindCaseInfo(RemindCaseInfoInfo dto)
         {
             var data = _mapper.Map<RemindCaseInfo>(dto);

+ 0 - 1
src/Sharing.Province/Controllers/ProvinceController.cs

@@ -4,7 +4,6 @@ using MediatR;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Sharing.Province.Dtos;
-using Sharing.Province.Dtos.HuiJu;
 using Sharing.Province.Dtos.HuiJu.Send;
 using Sharing.Province.Dtos.XieTong.Send;
 using Sharing.WebCore;

+ 1 - 1
src/Sharing.Province/DefaultPusher.cs

@@ -282,6 +282,6 @@ public class DefaultPusher : IProvincePusher
         var response = await _huiJuClient.RequestAsync<SendRealTimeStatusRequest, ProvinceResponse>(request, cancellationToken);
         return response.ReturnInfo;
     }
-    
+
     #endregion
 }

+ 1 - 1
src/Sharing.Province/Dtos/HuiJu/Send/SubmitCaseInfoRequest.cs

@@ -27,7 +27,7 @@ public class SubmitCaseInfoData
 /// <summary>
 /// 
 /// </summary>
-public class CaseInfo: BaseModel
+public class CaseInfo : BaseModel
 {
     /// <summary>
     /// 服务工单标题

+ 4 - 1
src/Sharing.Province/Dtos/XieTong/Knowledge/GetKnowledgeInfoAbandonRequest.cs

@@ -3,6 +3,9 @@ using System.Text.Json.Serialization;
 
 namespace Sharing.Province.Dtos.XieTong.Knowledge
 {
+    /// <summary>
+    /// 知识删除
+    /// </summary>
     public class GetKnowledgeInfoAbandonRequest : ProvinceRequest<GetKnowledgeInfoAbandonInfo>
     {
         public override string GetRequestUrl() => "get_knowledge_info_abandon";
@@ -11,7 +14,7 @@ namespace Sharing.Province.Dtos.XieTong.Knowledge
     }
 
     /// <summary>
-    /// 知识库上报
+    /// 知识删除
     /// </summary>
     public class GetKnowledgeInfoAbandonInfo
     {

+ 1 - 8
src/Sharing.Province/Dtos/XieTong/Receive/RemindCaseInfoRequest.cs

@@ -1,11 +1,4 @@
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
-using System.Text;
-using System.Text.Json.Serialization;
-using System.Threading.Tasks;
+using System.Text.Json.Serialization;
 
 namespace Sharing.Province.Dtos.XieTong.Receive
 {

+ 0 - 12
src/Sharing.Province/Dtos/XieTong/Send/DelayCaseInfoSendRequest.cs

@@ -21,18 +21,6 @@ namespace Sharing.Province.Dtos.XieTong.Send
         public override string GetHttpMethod() => HttpMethods.Post;
     }
 
-    ///// <summary>
-    ///// 服务工单申请延时
-    ///// </summary>
-    //public class DelayCaseInfoSendData
-    //{
-    //    /// <summary>
-    //    /// 
-    //    /// </summary>
-    //    [JsonPropertyName("jsonList")]
-    //    public IReadOnlyList<DelayCaseInfoSendInfo> DelayCaseInfoSendInfos { get; set; }
-    //}
-
     /// <summary>
     /// 
     /// </summary>

+ 0 - 12
src/Sharing.Province/Dtos/XieTong/Send/GetCaseBackApplyRequest.cs

@@ -21,18 +21,6 @@ namespace Sharing.Province.Dtos.XieTong.Send
         public override string GetHttpMethod() => HttpMethods.Post;
     }
 
-    ///// <summary>
-    ///// 退回申请
-    ///// </summary>
-    //public class GetCaseBackApplyData
-    //{
-    //    /// <summary>
-    //    /// 
-    //    /// </summary>
-    //    [JsonPropertyName("jsonList")]
-    //    public IReadOnlyList<GetCaseBackApplyInfo> GetCaseBackApplyInfos { get; set; }
-    //}
-
     /// <summary>
     /// 
     /// </summary>

+ 0 - 12
src/Sharing.Province/Dtos/XieTong/Send/GetCaseProcessReceiveRequest.cs

@@ -21,18 +21,6 @@ namespace Sharing.Province.Dtos.XieTong.Send
         public override string GetHttpMethod() => HttpMethods.Post;
     }
 
-    ///// <summary>
-    ///// 服务工单交办处理过程
-    ///// </summary>
-    //public class GetCaseProcessReceiveData
-    //{
-    //    /// <summary>
-    //    /// 
-    //    /// </summary>
-    //    [JsonPropertyName("jsonList")]
-    //    public IReadOnlyList<GetCaseProcessReceiveInfo> GetCaseProcessReceiveInfos { get; set; }
-    //}
-
     /// <summary>
     /// 
     /// </summary>

+ 0 - 12
src/Sharing.Province/Dtos/XieTong/Send/GetCaseResultReceiveRequest.cs

@@ -21,18 +21,6 @@ namespace Sharing.Province.Dtos.XieTong.Send
         public override string GetHttpMethod() => HttpMethods.Post;
     }
 
-    ///// <summary>
-    ///// 服务工单交办处理结果
-    ///// </summary>
-    //public class GetCaseResultReceiveData
-    //{
-    //    /// <summary>
-    //    /// 
-    //    /// </summary>
-    //    [JsonPropertyName("jsonList")]
-    //    public IReadOnlyList<GetCaseResultReceiveInfo> GetCaseResultReceiveInfos { get; set; }
-    //}
-
     /// <summary>
     /// 
     /// </summary>

+ 0 - 12
src/Sharing.Province/Dtos/XieTong/Send/GetVisitInfoReceiveRequest.cs

@@ -21,18 +21,6 @@ namespace Sharing.Province.Dtos.XieTong.Send
         public override string GetHttpMethod() => HttpMethods.Post;
     }
 
-    ///// <summary>
-    ///// 服务工单交办评价
-    ///// </summary>
-    //public class GetVisitInfoReceiveData
-    //{
-    //    /// <summary>
-    //    /// 
-    //    /// </summary>
-    //    [JsonPropertyName("jsonList")]
-    //    public IReadOnlyList<GetVisitInfoReceiveInfo> GetVisitInfoReceiveInfos { get; set; }
-    //}
-
     /// <summary>
     /// 
     /// </summary>

+ 1 - 1
src/Sharing.Province/Dtos/XieTong/Send/SendRealTimeStatusRequest.cs

@@ -22,7 +22,7 @@ public class SendRealTimeStatusInfo
     /// 热线标识
     /// </summary>
     [JsonPropertyName("HOTLINE")]
-    public string HotLine { get; set; }
+    public string HotLine { get; set; } = "99";
 
     /// <summary>
     /// 行政区划代码

+ 0 - 12
src/Sharing.Province/Dtos/XieTong/Send/SendSuperviseProcessInfoRequest.cs

@@ -22,18 +22,6 @@ namespace Sharing.Province.Dtos.XieTong.Send
         public override string GetHttpMethod() => HttpMethods.Post;
     }
 
-    ///// <summary>
-    ///// 服务工单督办过程
-    ///// </summary>
-    //public class SendSuperviseProcessInfoData
-    //{
-    //    /// <summary>
-    //    /// 
-    //    /// </summary>
-    //    [JsonPropertyName("jsonList")]
-    //    public IReadOnlyList<SendSuperviseProcessInfoInfo> SendSuperviseProcessInfoInfos { get; set; }
-    //}
-
     /// <summary>
     /// 
     /// </summary>

+ 0 - 12
src/Sharing.Province/Dtos/XieTong/Send/SendSuperviseResultInfoRequest.cs

@@ -22,18 +22,6 @@ namespace Sharing.Province.Dtos.XieTong.Send
         public override string GetHttpMethod() => HttpMethods.Post;
     }
 
-    ///// <summary>
-    ///// 服务工单督办结果
-    ///// </summary>
-    //public class SendSuperviseResultInfoData
-    //{
-    //    /// <summary>
-    //    /// 
-    //    /// </summary>
-    //    [JsonPropertyName("jsonList")]
-    //    public IReadOnlyList<SendSuperviseResultInfoInfo> SendSuperviseResultInfoInfos { get; set; }
-    //}
-
     /// <summary>
     /// 
     /// </summary>

+ 1 - 6
src/Sharing.Province/Handlers/Knowledge/GetKnowledgeInfoAbandonHandler.cs

@@ -3,11 +3,6 @@ using MediatR;
 using Sharing.Notifications.Knowledge;
 using Sharing.Province.Dtos.XieTong.Knowledge;
 using Sharing.Province.XieTong.Knowledge;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Sharing.Province.Handlers.Knowledge
 {
@@ -19,7 +14,7 @@ namespace Sharing.Province.Handlers.Knowledge
         private readonly IChannelConfigurationManager _channelConfigurationManager;
         private readonly PusherProvider _pusherProvider;
         private readonly IMapper _mapper;
-        private readonly IGetKnowledgeInfoAbandonRepository _getKnowledgeInfoAbandonRepository ;
+        private readonly IGetKnowledgeInfoAbandonRepository _getKnowledgeInfoAbandonRepository;
 
         /// <summary>
         /// 

+ 1 - 6
src/Sharing.Province/Handlers/Knowledge/GetKnowledgeInfoUpdateHandler.cs

@@ -3,11 +3,6 @@ using MediatR;
 using Sharing.Notifications.Knowledge;
 using Sharing.Province.Dtos.XieTong.Knowledge;
 using Sharing.Province.XieTong.Knowledge;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Sharing.Province.Handlers.Knowledge
 {
@@ -19,7 +14,7 @@ namespace Sharing.Province.Handlers.Knowledge
         private readonly IChannelConfigurationManager _channelConfigurationManager;
         private readonly PusherProvider _pusherProvider;
         private readonly IMapper _mapper;
-        private readonly IGetKnowledgeInfoUpdateRepository _getKnowledgeInfoUpdateRepository ;
+        private readonly IGetKnowledgeInfoUpdateRepository _getKnowledgeInfoUpdateRepository;
 
         /// <summary>
         /// 

+ 0 - 7
src/Sharing.Province/Handlers/XieTong/DelayCaseInfoSendHandler.cs

@@ -43,13 +43,6 @@ namespace Sharing.Province.Handlers.XieTong
             var pusher = _pusherProvider.CreatePusher(_channelConfigurationManager);
 
             var dataReceive = _mapper.Map<DelayCaseInfoSendInfo>(notification.Data);
-            //var data = new DelayCaseInfoSendData
-            //{
-            //    DelayCaseInfoSendInfos = new List<DelayCaseInfoSendInfo>
-            //    {
-            //        dataReceive
-            //    }
-            //};
 
             var request = new DelayCaseInfoSendRequest();
             request.SetData(dataReceive);

+ 0 - 7
src/Sharing.Province/Handlers/XieTong/GetCaseBackApplyHandler.cs

@@ -43,13 +43,6 @@ namespace Sharing.Province.Handlers.XieTong
             var pusher = _pusherProvider.CreatePusher(_channelConfigurationManager);
 
             var dataReceive = _mapper.Map<GetCaseBackApplyInfo>(notification.Data);
-            //var data = new GetCaseBackApplyData
-            //{
-            //    GetCaseBackApplyInfos = new List<GetCaseBackApplyInfo>
-            //    {
-            //        dataReceive
-            //    }
-            //};
 
             var request = new GetCaseBackApplyRequest();
             request.SetData(dataReceive);

+ 0 - 7
src/Sharing.Province/Handlers/XieTong/GetCaseProcessReceiveHandler.cs

@@ -43,13 +43,6 @@ namespace Sharing.Province.Handlers.XieTong
             var pusher = _pusherProvider.CreatePusher(_channelConfigurationManager);
 
             var dataReceive = _mapper.Map<GetCaseProcessReceiveInfo>(notification.Data);
-            //var data = new GetCaseProcessReceiveData
-            //{
-            //    GetCaseProcessReceiveInfos = new List<GetCaseProcessReceiveInfo>
-            //    {
-            //        dataReceive
-            //    }
-            //};
 
             var request = new GetCaseProcessReceiveRequest();
             request.SetData(dataReceive);

+ 0 - 7
src/Sharing.Province/Handlers/XieTong/GetCaseResultReceiveHandler.cs

@@ -41,13 +41,6 @@ namespace Sharing.Province.Handlers.XieTong
             var pusher = _pusherProvider.CreatePusher(_channelConfigurationManager);
 
             var dataReceive = _mapper.Map<GetCaseResultReceiveInfo>(notification.Data);
-            //var data = new GetCaseResultReceiveData
-            //{
-            //    GetCaseResultReceiveInfos = new List<GetCaseResultReceiveInfo>
-            //    {
-            //        dataReceive
-            //    }
-            //};
 
             var request = new GetCaseResultReceiveRequest();
             request.SetData(dataReceive);

+ 0 - 7
src/Sharing.Province/Handlers/XieTong/GetVisitInfoReceiveHandler.cs

@@ -43,13 +43,6 @@ namespace Sharing.Province.Handlers.XieTong
             var pusher = _pusherProvider.CreatePusher(_channelConfigurationManager);
 
             var dataReceive = _mapper.Map<GetVisitInfoReceiveInfo>(notification.Data);
-            //var data = new GetVisitInfoReceiveData
-            //{
-            //    GetVisitInfoReceiveInfos = new List<GetVisitInfoReceiveInfo>
-            //    {
-            //        dataReceive
-            //    }
-            //};
 
             var request = new GetVisitInfoReceiveRequest();
             request.SetData(dataReceive);

+ 0 - 6
src/Sharing.Province/Handlers/XieTong/SendRevokeCaseInfoHandler.cs

@@ -3,12 +3,6 @@ using MediatR;
 using Sharing.Notifications.XieTong;
 using Sharing.Province.Dtos.XieTong.Send;
 using Sharing.Province.XieTong.Receive;
-using Sharing.Province.XieTong.Send;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Sharing.Province.Handlers.XieTong
 {

+ 0 - 7
src/Sharing.Province/Handlers/XieTong/SendSuperviseProcessInfoHandler.cs

@@ -43,13 +43,6 @@ namespace Sharing.Province.Handlers.XieTong
             var pusher = _pusherProvider.CreatePusher(_channelConfigurationManager);
 
             var dataReceive = _mapper.Map<SendSuperviseProcessInfoInfo>(notification.Data);
-            //var data = new SendSuperviseProcessInfoData
-            //{
-            //    SendSuperviseProcessInfoInfos = new List<SendSuperviseProcessInfoInfo>
-            //    {
-            //        dataReceive
-            //    }
-            //};
 
             var request = new SendSuperviseProcessInfoRequest();
             request.SetData(dataReceive);

+ 0 - 7
src/Sharing.Province/Handlers/XieTong/SendSuperviseResultInfoHandler.cs

@@ -43,13 +43,6 @@ namespace Sharing.Province.Handlers.XieTong
             var pusher = _pusherProvider.CreatePusher(_channelConfigurationManager);
 
             var dataReceive = _mapper.Map<SendSuperviseResultInfoInfo>(notification.Data);
-            //var data = new SendSuperviseResultInfoData
-            //{
-            //    SendSuperviseResultInfoInfos = new List<SendSuperviseResultInfoInfo>
-            //    {
-            //        dataReceive
-            //    }
-            //};
 
             var request = new SendSuperviseResultInfoRequest();
             request.SetData(dataReceive);

+ 4 - 0
src/Sharing/Notifications/XieTong/SendCaseInfoNotification.cs

@@ -3,5 +3,9 @@ using Sharing.Province.XieTong.Send;
 
 namespace Sharing.Notifications.XieTong
 {
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="Data"></param>
     public record SendCaseInfoNotification(SendCaseInfo Data) : INotification;
 }