src/Sharing.Application/Mappers/MapperConfigs.cs

@@ -229,15 +229,16 @@ namespace Sharing.Application.Mappers
            .Map(d => d.FinishNote, x => x.Order.ActualOpinion)
            .Map(d => d.EndDept, x => x.Order.ActualHandleOrgName)
            .Map(d => d.EndName, x => x.Order.ActualHandlerName)
-           .Map(d => d.SendTime, x => x.Order.Workflow.AssignTime)//需要确认
+           .Map(d => d.SendTime, x => x.Order.CenterToOrgTime)
            .Map(d => d.FdBack, x => x.Order.ActualOpinion)
            .Map(d => d.AreaCode, x => x.Order.AreaCode)
            .Map(d => d.EndAreaCode, x => x.Order.ActualHandleOrgAreaCode)
            .Map(d => d.EndAreaName, x => x.Order.ActualHandleOrgAreaName)
            .Map(d => d.SignTimeBf, x => x.Order.ExpiredTime)
-           .Map(d => d.SignTime, x => x.Order.StartTime)//缺少签收时间
+           .Map(d => d.SignTime, x => x.Order.ActualHandleStepAcceptTime)
            .Map(d => d.FdBackTimeBf, x => x.Order.ExpiredTime)
            .Map(d => d.FdBackTime, x => x.Order.ActualHandleTime)
+           .Map(d => d.HandleTimeLong, x => x.Order.HandleDurationWorkday)
              ;
 
             ///服务工单交办处理结果
@@ -249,11 +250,12 @@ namespace Sharing.Application.Mappers
            .Map(d => d.FinishNote, x => x.Order.ActualOpinion)
            .Map(d => d.EndDept, x => x.Order.ActualHandleOrgName)
            .Map(d => d.EndName, x => x.Order.ActualHandlerName)
-           .Map(d => d.SendTime, x => x.Order.Workflow.AssignTime)//需要确认
+           .Map(d => d.SendTime, x => x.Order.CenterToOrgTime)
            .Map(d => d.FdBack, x => x.Order.ActualOpinion)
            .Map(d => d.AreaCode, x => x.Order.AreaCode)
            .Map(d => d.EndAreaCode, x => x.Order.ActualHandleOrgAreaCode)
            .Map(d => d.EndAreaName, x => x.Order.ActualHandleOrgAreaName)
+           .Map(d => d.HandleTimeLong, x => x.Order.HandleDurationWorkday)
             ;
 
 

src/Sharing.Application/Sharing.Application.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Hotline.Share" Version="1.0.14" />
+    <PackageReference Include="Hotline.Share" Version="1.0.16" />
     <PackageReference Include="XF.EasyCaching" Version="1.0.0" />
   </ItemGroup>
 

src/Sharing.DaoShu110/Controllers/PoliceDSController.cs

@@ -9,6 +9,7 @@ using Sharing.DaoShu110.Dtos;
 using Sharing.DaoShu110.Extensions;
 using Sharing.Province.HuiJu.Send;
 using Sharing.Province.XieTong.Knowledge;
+using Sharing.Share.Dtos;
 using Sharing.WebCore;
 using System.Net;
 
@@ -614,7 +615,7 @@ namespace Sharing.DaoShu110.Controllers
                 AreaCode = policeReceive.AreaCode,
                 Street = policeReceive.CallPoliceAddress
             };
-            //await _capPublisher.PublishAsync(Hotline.Share.Mq.EventNames.HotlineOrderReceiveCaseInfo, orderDto, cancellationToken: HttpContext.RequestAborted);
+            await _capPublisher.PublishAsync(Sharing.Share.Mq.EventNames.SharingOrderCreation, orderDto, cancellationToken: HttpContext.RequestAborted);
         }
 
         /// <summary>
@@ -626,29 +627,47 @@ namespace Sharing.DaoShu110.Controllers
         {
             if (policeReceiveChainDealDs.DisposalType == 1)//正常办理
             {
-                OrderFlowDto orderFlowDto = new();
-                orderFlowDto.Order.No110 = policeReceiveChainDealDs.AlarmReceiptNumber;
-                orderFlowDto.Order.ActualHandleTime = policeReceiveChainDealDs.FeedbackTime;
-                orderFlowDto.Order.ActualOpinion = policeReceiveChainDealDs.DisposalSituation;
-                orderFlowDto.Order.ActualOpinion = policeReceiveChainDealDs.ResultDescription;
-                orderFlowDto.Order.ActualHandlerId = policeReceiveChainDealDs.FeedbackPersonNumber;
-                orderFlowDto.Order.ActualHandlerName = policeReceiveChainDealDs.FeedbackPersonName;
-                orderFlowDto.Order.ActualHandleOrgCode = policeReceiveChainDealDs.FeedbackUnitCode;
-                orderFlowDto.Order.ActualHandleOrgName = policeReceiveChainDealDs.FeedbackUnitName;
-                //orderFlowDto.Order.ActualHandleTime = policeReceiveChainDealDs.WarehousingTime;
+                OrderDto orderDto = new()
+                {
+                    No110 = policeReceiveChainDealDs.AlarmReceiptNumber,
+                    ActualHandleTime = policeReceiveChainDealDs.FeedbackTime,
+                    ActualOpinion = policeReceiveChainDealDs.DisposalSituation,
+                    ActualHandlerId = policeReceiveChainDealDs.FeedbackPersonNumber,
+                    ActualHandlerName = policeReceiveChainDealDs.FeedbackPersonName,
+                    ActualHandleOrgCode = policeReceiveChainDealDs.FeedbackUnitCode,
+                    ActualHandleOrgName = policeReceiveChainDealDs.FeedbackUnitName
+                };
+                // orderFlowDto.Order.ActualHandleTime = policeReceiveChainDealDs.WarehousingTime;
+                //orderFlowDto.Order.ActualOpinion = policeReceiveChainDealDs.DisposalSituation;
+                //向业务系统推送消息
+                await _capPublisher.PublishAsync(Sharing.Share.Mq.EventNames.SharingPoliceHandle, orderDto, cancellationToken: HttpContext.RequestAborted);
             }
             else if (policeReceiveChainDealDs.DisposalType == 2)//退回 
             {
-
+                ReturnFeedbackDto feedbackDto = new()
+                {
+                    CaseSerial = policeReceiveChainDealDs.AlarmReceiptNumber,
+                    DealDept = policeReceiveChainDealDs.ReturnUnit,
+                    DealName = policeReceiveChainDealDs.ReturnName,
+                    ApplyTime = policeReceiveChainDealDs.ReturnTime,
+                    Reason = policeReceiveChainDealDs.ReturnOpinion
+                };
+                //向业务系统推送消息
+                await _capPublisher.PublishAsync(Sharing.Share.Mq.EventNames.SharingPoliceReturn, feedbackDto, cancellationToken: HttpContext.RequestAborted);
             }
             else if (policeReceiveChainDealDs.DisposalType == 3)//回访
             {
-                PublishVisitDto publishVisitDto = new();
+                PublishVisitDto publishVisitDto = new()
+                {
+                    VisitTime = policeReceiveChainDealDs.RevisitTime,
+                    VisitRemark = policeReceiveChainDealDs.VisitContent,
+                    SubjectResultSatifyCode = policeReceiveChainDealDs.VisitResult,
+                    VisitType = EVisitType.ArtificialVisit
+                };
                 publishVisitDto.Order.No110 = policeReceiveChainDealDs.AlarmReceiptNumber;
-                publishVisitDto.VisitTime = policeReceiveChainDealDs.RevisitTime;
-                publishVisitDto.VisitRemark = policeReceiveChainDealDs.VisitContent;
-                //    publishVisitDto.SubjectResultSatify = policeReceiveChainDealDs.VisitResult;
-                publishVisitDto.VisitType = EVisitType.ArtificialVisit;
+
+                //向业务系统推送消息
+                await _capPublisher.PublishAsync(Sharing.Share.Mq.EventNames.SharingPoliceVisit, publishVisitDto, cancellationToken: HttpContext.RequestAborted);
             }
 
         }

src/Sharing.Province/Controllers/ReceiveController.cs

@@ -228,11 +228,12 @@ namespace Sharing.Province.Controllers
                 data.Latitude = Convert.ToDouble(lngLat[1]);
             }
 
-            //向业务系统推送消息
-            // await _capPublisher.PublishAsync(Hotline.Share.Mq.EventNames.HotlineOrderReceiveCaseInfo, addOrderDto, cancellationToken: HttpContext.RequestAborted);
-
             if (!string.IsNullOrEmpty(id))
+            {
+                //向业务系统推送消息
+                await _capPublisher.PublishAsync(Sharing.Share.Mq.EventNames.SharingOrderCreation, data, cancellationToken: HttpContext.RequestAborted);
                 return Reponse.Success("您已成功提交数据！");
+            }
             else
                 return Reponse.Failed("接口调用失败！");
         }

src/Sharing.Share/Mq/EventNames.Order.cs

@@ -5,6 +5,11 @@
     /// </summary>
     public partial class EventNames
     {
+        /// <summary>
+        /// 服务工单交办(省工单、110都是这个)---OrderDto
+        /// </summary>
+        public const string SharingOrderCreation = "sharing.order.creation";
+
         /// <summary>
         /// 服务工单退回反馈---ReturnFeedbackDto
         /// </summary>
@@ -36,7 +41,7 @@
         public const string SharingOrderWarning = "sharing.order.warning";
 
         /// <summary>
-        /// 服务工单预警---SuperviseDto
+        /// 督办工单派发接口---SuperviseDto
         /// </summary>
         public const string SharingOrderSupervise = "sharing.order.supervise";
 
@@ -64,6 +69,22 @@
         /// 服务工单拓展信息交办---ReceiveCaseExtendsDto
         /// </summary>
         public const string SharingOrderExtends = "sharing.order.extends";
+
+
+        /// <summary>
+        /// 110工单办结---OrderDto
+        /// </summary>
+        public const string SharingPoliceHandle= "sharing.police.handle";
+
+        /// <summary>
+        /// 110工单退回---ReturnFeedbackDto
+        /// </summary>
+        public const string SharingPoliceReturn = "sharing.police.return";
+
+        /// <summary>
+        /// 110工单回访---PublishVisitDto
+        /// </summary>
+        public const string SharingPoliceVisit = "sharing.police.visit";
     }
 }