TANG JIANG 1 year ago
parent
commit
6a44e7e5e3

+ 28 - 5
src/DataSharing.Host/Controllers/HotlineWebController.cs

@@ -1,19 +1,17 @@
 using DataSharing.Province;
 using DataSharing.RawData;
 using DataSharing.SendTask;
-using DataSharing.Share.Dtos.ConvergenceMedia;
 using DataSharing.Share.Dtos.HotlineWeb;
-using DataSharing.WebPortal;
+using DataSharing.Share.Dtos.Province;
+using DataSharing.Share.Dtos.Province.HuiJu;
 using DotNetCore.CAP;
 using Hotline.Share.Dtos;
-using Hotline.Share.Enums.Order;
-using Hotline.Share.Requests;
 using MapsterMapper;
 using MediatR;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
 using SqlSugar;
-using System.ComponentModel;
 using XF.Domain.Repository;
 
 namespace DataSharing.Host.Controllers
@@ -106,6 +104,31 @@ namespace DataSharing.Host.Controllers
             await _pusherProviderService.SendProvinceDataPusher(dto, HttpContext.RequestAborted);
         }
 
+        /// <summary>
+        /// 根据ID从新推送
+        /// </summary>
+        /// <param name="id">推送任务Id</param>
+        /// <returns></returns>
+        [HttpGet("updatetasksend")]
+        [AllowAnonymous]
+        public async Task UpdateTaskSend(string id)
+        {
+            var dto = await _taskRepository.GetAsync(p => p.Id == id, HttpContext.RequestAborted);
+            var dataOrder = System.Text.Json.JsonSerializer.Deserialize<SendRequestSubmitCaseInfo>(dto.Request, ProvinceJsonSerializerOptions.UnStandardDatetimeJsonOptions);
+            if (dataOrder != null)
+            {
+                if (dataOrder.Data != null && dataOrder.Data.Items != null && dataOrder.Data.Items.Count > 0)
+                {
+                    var data = dataOrder.Data.Items[0].ToString();
+                    ///ProvinceJsonSerializerOptions.UnStandardDatetimeJsonOptions
+                    var temp = JsonConvert.DeserializeObject<SubmitCaseInfo>(data);
+
+                    var ttt = System.Text.Json.JsonSerializer.Deserialize<SubmitCaseInfo>(data, ProvinceJsonSerializerOptions.UnStandardDatetimeJsonOptions);
+                }
+            }
+            //await _pusherProviderService.SendProvinceDataPusher(dto, HttpContext.RequestAborted);
+        }
+
         /// <summary>
         /// 修改状态为已推送,防止错误数据一直请求
         /// </summary>

+ 18 - 1
src/DataSharing.Share/Dtos/Province/ProvinceListRequestSubmitCaseInfo.cs

@@ -1,4 +1,5 @@
-using System.Text.Json.Serialization;
+using DataSharing.Share.Dtos.Province.HuiJu;
+using System.Text.Json.Serialization;
 
 namespace DataSharing.Share.Dtos.Province
 {
@@ -23,4 +24,20 @@ namespace DataSharing.Share.Dtos.Province
         public string CaseSerial { get; set; }
     }
 
+
+    public class SendRequestSubmitCaseInfo
+    {
+        [JsonPropertyName("paras")]
+        public SendRequestItemSubmitCaseInfo Data { get; set; }
+
+        [JsonPropertyName("token")]
+        public ClientInfo ClientInf { get; set; }
+    }
+
+    public class SendRequestItemSubmitCaseInfo
+    {
+        [JsonPropertyName("jsonList")]
+        public List<SubmitCaseInfo> Items { get; set; }
+    }
+
 }