qinchaoyue 4 місяців тому
батько
коміт
a633670fe2

+ 2 - 0
src/Hotline.Api/Controllers/Snapshot/SnapshotController.cs

@@ -118,6 +118,7 @@ public class SnapshotController : BaseController
     /// </summary>
     /// <returns></returns>
     [HttpGet("order/published")]
+    [AllowAnonymous]
     public async Task<IList<OrderPublishOutDto>> GetPublishOrderAsync([FromQuery] OrderPublishInDto dto)
         => await _snapshotApplication.GetOrderPublishAsync(dto, HttpContext.RequestAborted);
 
@@ -127,6 +128,7 @@ public class SnapshotController : BaseController
     /// <param name="id"></param>
     /// <returns></returns>
     [HttpGet("order/published/{id}")]
+    [AllowAnonymous]
     public async Task<OrderPublishDetailOutDto> GetOrderPublishDetailAsync(string id)
         => await _snapshotApplication.GetOrderPublishDetailAsync(id, HttpContext.RequestAborted);
 

+ 6 - 0
src/Hotline.Application/Mappers/SnapshotMapperConfigs.cs

@@ -16,6 +16,12 @@ public class SnapshotMapperConfigs : IRegister
 {
     public void Register(TypeAdapterConfig config)
     {
+        config.ForType<GuiderSystemInDto, CommunityInfo>()
+            .Map(dest => dest.Name, src => src.OrgName)
+            .Map(dest => dest.ParentCode, src => src.ParentOrgId)
+            .Map(dest => dest.Code, src => src.OrgId)
+            .Map(dest => dest.FullName, src => src.OrgFullName);
+
         config.ForType<AddIndustryDto, Industry>();
         config.ForType<Hotline.File.File, IndustryFileDto>()
             .Map(m => m.AdditionId, n => n.Additions);

+ 12 - 2
src/Hotline.Application/Snapshot/SnapshotApplicationBase.cs

@@ -581,14 +581,14 @@ public abstract class SnapshotApplicationBase
         {
             foreach (var file in dto.ReplyFileList)
             {
-                await _fileDomainService.GetNetworkFileAsync(file,orderSnapshot.Id, token);
+                await _fileDomainService.GetNetworkFileAsync(file, orderSnapshot.Id, token);
             }
         }
         await _orderSnapshotRepository.UpdateAsync(orderSnapshot);
         // 网格员办结
         if (orderSnapshot.ReplyResultType == EGuiderSystemReplyType.Field)
         {
-            await _publisher.PublishAsync(new GuiderSystemFieldNotification(orderSnapshot.Id), token);
+            await _publisher.PublishAsync(new GuiderSystemFieldNotification(orderSnapshot.Id, dto.Adapt<CommunityInfo>()), token);
         }
         // 网格员超时未回复退回
         if (orderSnapshot.ReplyResultType == EGuiderSystemReplyType.Returned)
@@ -626,6 +626,16 @@ public abstract class SnapshotApplicationBase
         await _thirdAccountRepository.UpdateAsync(third, cancellationToken);
     }
 
+    /// <summary>
+    /// 同步社区信息
+    /// </summary>
+    /// <param name="entity"></param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    public async Task SyncCommunityInfoAsync(CommunityInfo entity, CancellationToken cancellationToken)
+    {
+    }
+
     #region 从业人员
 
     /// <summary>

+ 12 - 0
src/Hotline/Snapshot/CommunityInfo.cs

@@ -28,9 +28,21 @@ public class CommunityInfo : CreationSoftDeleteEntity
     [SugarColumn(ColumnDescription = "社区名称")]
     public string Name { get; set; }
 
+    /// <summary>
+    /// 社区全称
+    /// </summary>
+    [SugarColumn(ColumnDescription = "社区全称")]
+    public string FullName { get; set; }
+
     /// <summary>
     /// 父社区Code
     /// </summary>
     [SugarColumn(ColumnDescription = "父社区Code")]
     public string ParentCode { get; set; }
+
+    /// <summary>
+    /// 社区唯一
+    /// </summary>
+    [SugarColumn(ColumnDescription = "社区唯一")]
+    public string UniquenessKey { get; set; }
 }

+ 1 - 1
src/Hotline/Snapshot/Notifications/PostGuiderSystemNotification.cs

@@ -35,4 +35,4 @@ public record GuiderSystemTimeOutBackNotification(string OrderId) : INotificatio
 /// 网格员系统办结
 /// </summary>
 /// <param name="OrderId"></param>
-public record GuiderSystemFieldNotification(string OrderId) : INotification;
+public record GuiderSystemFieldNotification(string OrderId, CommunityInfo CommunityInfo) : INotification;