应急管理局

src/Hotline.Api/Controllers/OrderController.cs

@@ -349,8 +349,11 @@ public class OrderController : BaseController
                                 await _contingencyManagementOrdersRepository.UpdateAsync(orderData, HttpContext.RequestAborted);
                             }
                             //推送消息
-                            await _capPublisher.PublishAsync(Share.Mq.EventNames.HotlineOrderContingencyManagement,
-                                _mapper.Map<ContingencyManagementOrdersDto>(orderData), Share.Mq.EventNames.HotlineOrderContingencyManagementState);
+                            var pushaData = _mapper.Map<ContingencyManagementOrdersDto>(orderData);
+                            pushaData.Id = orderData.Id;
+                            //推送消息
+                            await _capPublisher.PublishAsync(Hotline.Share.Mq.EventNames.HotlineOrderContingencyManagement,
+                             pushaData, Hotline.Share.Mq.EventNames.HotlineOrderContingencyManagementState);
                         }
                     }
                     catch (Exception)
@@ -483,9 +486,11 @@ public class OrderController : BaseController
                     orderData.ArrangeContent = dto.ArrangeContent;
                     await _contingencyManagementOrdersRepository.UpdateAsync(orderData, HttpContext.RequestAborted);
                 }
+                var pushaData = _mapper.Map<ContingencyManagementOrdersDto>(orderData);
+                pushaData.Id = orderData.Id;
                 //推送消息
                 await _capPublisher.PublishAsync(Hotline.Share.Mq.EventNames.HotlineOrderContingencyManagement,
-                    _mapper.Map<ContingencyManagementOrdersDto>(orderData), Hotline.Share.Mq.EventNames.HotlineOrderContingencyManagementState);
+                 pushaData, Hotline.Share.Mq.EventNames.HotlineOrderContingencyManagementState);
             }
         }
         catch (Exception)

src/Hotline.Application/Subscribers/DatasharingSubscriber.cs

@@ -830,7 +830,7 @@ namespace Hotline.Application.Subscribers
         [CapSubscribe(EventNames.HotlineOrderContingencyManagementState)]
         public async Task RecHotlineOrderContingencyManagementState(RecOrderStateDto dto, CancellationToken cancellationToken)
         {
-            var data = await _contingencyManagementOrdersRepository.GetAsync(p => p.No == dto.Id, cancellationToken);
+            var data = await _contingencyManagementOrdersRepository.GetAsync(p => p.Id == dto.Id, cancellationToken);
             if (data != null && dto.State != data.PushState)
             {
                 data.PushState = dto.State;

src/Hotline.Share/Dtos/ContingencyManagement/ContingencyManagementOrdersDto.cs

@@ -6,6 +6,8 @@ namespace Hotline.Share.Dtos.ContingencyManagement
 {
     public class ContingencyManagementOrdersDto
     {
+        public string Id { get; set; }
+
         /// <summary>
         /// 来源渠道（电话、网站、APP等）
         /// </summary>
@@ -181,6 +183,56 @@ namespace Hotline.Share.Dtos.ContingencyManagement
         /// </summary>
         public string? ArrangementOpinion { get; set; }
 
+        /// <summary>
+        /// 经度
+        /// </summary>
+        public double? Longitude { get; set; }
+
+        /// <summary>
+        /// 维度
+        /// </summary>
+        public double? Latitude { get; set; }
+
+        /// <summary>
+        /// 行政区划编码
+        /// </summary>
+        public string? AreaCode { get; set; }
+
+        /// <summary>
+        /// 省
+        /// </summary>
+        public string? Province { get; set; }
+
+        /// <summary>
+        /// 市
+        /// </summary>
+        public string? City { get; set; }
+
+        /// <summary>
+        /// 区/县
+        /// </summary>
+        public string? County { get; set; }
+
+        /// <summary>
+        /// 乡镇(4级行政区划)
+        /// </summary>
+        public string? Town { get; set; }
+
+        /// <summary>
+        /// 详细街道
+        /// </summary>
+        public string? Street { get; set; }
+
+        /// <summary>
+        /// 行政区划地址
+        /// </summary>
+        public string? Address { get; set; }
+
+        /// <summary>
+        /// 完整地址
+        /// </summary>
+        public string? FullAddress { get; set; }
+
         /// <summary>
         ///  推送状态 0：推送中，1：成功，2：失败
         /// </summary>

src/Hotline.Share/Hotline.Share.csproj

@@ -7,7 +7,7 @@
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
     <NoWarn>$(NoWarn);1591;8618;</NoWarn>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>1.0.89</Version>
+    <Version>1.0.90</Version>
   </PropertyGroup>
 
   <ItemGroup>