TANG JIANG 10 months ago
parent
commit
fb4a65bf5b

+ 3 - 2
src/DataSharing.Host/Controllers/HotlineWebController.cs

@@ -4,6 +4,7 @@ using DataSharing.RawData;
 using DataSharing.SendTask;
 using DataSharing.Share.Consts;
 using DataSharing.Share.Dtos.HotlineWeb;
+using DataSharing.Share.Dtos.WebPortal;
 using DotNetCore.CAP;
 using Hotline.Share.Dtos;
 using MapsterMapper;
@@ -77,7 +78,7 @@ namespace DataSharing.Host.Controllers
         /// <returns></returns>
         [HttpGet("getdssendtask")]
         [AllowAnonymous]
-        public async Task<PagedDto<DsSendTask>> GetDsSendTask([FromQuery] QuerySendTaskDto dto)
+        public async Task<PagedDto<DsSendTaskDto>> GetDsSendTask([FromQuery] QuerySendTaskDto dto)
         {
             //数据查询
             RefAsync<int> total = 0;
@@ -89,7 +90,7 @@ namespace DataSharing.Host.Controllers
                 .OrderByDescending(p => p.CreationTime)
                 .ToPageListAsync(dto.PageIndex, dto.PageSize, total, HttpContext.RequestAborted);
 
-            return new PagedDto<DsSendTask>(total, items);
+            return new PagedDto<DsSendTaskDto>(total, _mapper.Map<List<DsSendTaskDto>>(items));
         }
 
         /// <summary>

+ 4 - 0
src/DataSharing.Share/DataSharing.Share.csproj

@@ -12,4 +12,8 @@
     <None Remove="Dtos\HotlineClient\**" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="XF.Utility.EnumExtensions" Version="1.0.5" />
+  </ItemGroup>
+
 </Project>

+ 80 - 0
src/DataSharing.Share/Dtos/WebPortal/DsSendTaskDto.cs

@@ -0,0 +1,80 @@
+using DataSharing.Share.Enums;
+using XF.Utility.EnumExtensions;
+
+namespace DataSharing.Share.Dtos.WebPortal
+{
+    public class DsSendTaskDto
+    {
+        /// <summary>
+        /// 省工单编号
+        /// </summary>
+        public string? ProvinceNo { get; set; }
+
+        /// <summary>
+        /// 任务优先级(0:最低级别)
+        /// </summary>
+        public int TaskPriority { get; set; }
+
+        /// <summary>
+        /// 初次推送时间
+        /// </summary>
+        public DateTime? FirstTime { get; set; }
+
+        /// <summary>
+        /// 最近一次推送时间
+        /// </summary>
+        public DateTime? LastTime { get; set; }
+
+        /// <summary>
+        /// 推送次数
+        /// </summary>
+        public int SendTimes { get; set; }
+
+        /// <summary>
+        /// 推送成功
+        /// </summary>
+        public bool IsSuccess { get; set; }
+
+        /// <summary>
+        /// 平台名称
+        /// </summary>
+        public EPlatformSource PlatformSource { get; set; } = EPlatformSource.Province;
+        public string PlatformSourceText => PlatformSource.GetDescription();
+
+        /// <summary>
+        /// 任务类型
+        /// addOrder, expiredTimeChanged...
+        /// </summary>
+        public string TaskType { get; set; }
+
+        /// <summary>
+        /// 请求方式
+        /// </summary>
+        public string HttpMethod { get; set; }
+
+        /// <summary>
+        /// 请求地址
+        /// </summary>
+        public string Path { get; set; }
+
+        /// <summary>
+        /// 请求参数
+        /// </summary>
+        public string Request { get; set; }
+
+        /// <summary>
+        /// 请求端口,省推送必填,协同或者汇聚
+        /// </summary>
+        public EPathType? PathType { get; set; } = EPathType.Other;
+
+        /// <summary>
+        /// 生成时间(保存工单创建时间或者通话记录生成时间)
+        /// </summary>
+        public DateTime? GenerationTime { get; set; }
+
+        /// <summary>
+        /// 附件
+        /// </summary>
+        public List<FileJson>? FileJson { get; set; }
+    }
+}

+ 11 - 2
src/DataSharing.Share/Enums/EPlatformSource.cs

@@ -1,4 +1,6 @@
-namespace DataSharing.Share.Enums
+using System.ComponentModel;
+
+namespace DataSharing.Share.Enums
 {
     /// <summary>
     /// 推送平台
@@ -6,38 +8,45 @@
     public enum EPlatformSource
     {
         /// <summary>
-        /// 省
+        /// 省12345
         /// </summary>
+        [Description("省12345")]
         Province = 0,
 
         /// <summary>
         /// 110
         /// </summary>
+        [Description("110")]
         Police110 = 1,
 
         /// <summary>
         /// 市州互转
         /// </summary>
+        [Description("市州互转")]
         CityDataExchange = 2,
 
         /// <summary>
         /// 宜宾融媒体
         /// </summary>
+        [Description("宜宾融媒体")]
         ConvergenceMedia = 3,
 
         /// <summary>
         /// 企业服务
         /// </summary>
+        [Description("企业服务")]
         Enterprise = 4,
 
         /// <summary>
         /// i宜宾
         /// </summary>
+        [Description("i宜宾")]
         IYIBIN = 5,
 
         /// <summary>
         /// 综治平台
         /// </summary>
+        [Description("综治平台")]
         ZZPT = 6,
     }
 }