TANG JIANG před 1 rokem
rodič
revize
6bb8ed9f1f

+ 22 - 1
src/DataSharing.Host/Controllers/TestController.cs

@@ -10,6 +10,7 @@ using MapsterMapper;
 using MediatR;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using System.Threading;
 using XF.Domain.Repository;
 
 namespace DataSharing.Host.Controllers
@@ -160,7 +161,27 @@ namespace DataSharing.Host.Controllers
         public async Task FromNewTaskSend(string id)
         {
             var dto = await _taskRepository.GetAsync(p => p.Id == id, HttpContext.RequestAborted);
-            await _pusherProviderService.SendProvinceDataPusher(dto, HttpContext.RequestAborted);
+            //if (dto.TaskType == "SubmitCaseInfo")
+            //{
+            //    var dataOrder = System.Text.Json.JsonSerializer.Deserialize<ProvinceListRequestSubmitCaseInfo>(dto.Request);//
+            //    if (dataOrder != null && dataOrder.Data != null)
+            //    {
+            //        var orderItems = dataOrder.Data.Items;
+            //        foreach (var item in orderItems)
+            //        {
+            //            var dsOrder = await _dataOrderRepository.GetAsync(p => p.ProvinceNo == item.CaseSerial, HttpContext.RequestAborted);
+            //            if (dsOrder != null)
+            //            {
+            //                if (dsOrder.FirstSendProvinceTime is null)
+            //                    dsOrder.FirstSendProvinceTime = DateTime.Now;
+
+            //                dsOrder.LastSendProvinceTime = DateTime.Now;
+            //                await _dataOrderRepository.UpdateAsync(dsOrder);
+            //            }
+            //        }
+            //    }
+            //}
+             await _pusherProviderService.SendProvinceDataPusher(dto, HttpContext.RequestAborted);
         }
 
         /// <summary>

+ 1 - 1
src/DataSharing.Share/Dtos/Province/HuiJu/SubmitCaseInfo.cs

@@ -29,7 +29,7 @@ namespace DataSharing.Share.Dtos.Province.HuiJu
         /// 登记时间
         /// </summary>
         [JsonPropertyName("CASE_DATE")]
-        public DateTime CaseDate { get; set; }
+        public DateTime? CaseDate { get; set; }
 
         /// <summary>
         /// 诉求渠道

+ 26 - 0
src/DataSharing.Share/Dtos/Province/ProvinceListRequestSubmitCaseInfo.cs

@@ -0,0 +1,26 @@
+using System.Text.Json.Serialization;
+
+namespace DataSharing.Share.Dtos.Province
+{
+    public class ProvinceListRequestSubmitCaseInfo
+    {
+        [JsonPropertyName("paras")]
+        public RequestItemSubmitCaseInfo Data { get; set; }
+
+        [JsonPropertyName("token")]
+        public ClientInfo ClientInf { get; set; }
+    }
+
+    public class RequestItemSubmitCaseInfo
+    {
+        [JsonPropertyName("jsonList")]
+        public List<RequestSubmitCaseInfoNo> Items { get; set; }
+    }
+
+    public class RequestSubmitCaseInfoNo
+    {
+        [JsonPropertyName("CASE_SERIAL")]
+        public string CaseSerial { get; set; }
+    }
+
+}

+ 1 - 2
src/DataSharing/Province/PusherProviderService.cs

@@ -1,7 +1,6 @@
 using DataSharing.RawData;
 using DataSharing.SendTask;
 using DataSharing.Share.Dtos.Province;
-using DataSharing.Share.Dtos.Province.HuiJu;
 using DataSharing.Share.Dtos.Province.XieTong;
 using DataSharing.Share.Dtos.Province.XieTong.Receive;
 using DataSharing.Share.Enums;
@@ -139,7 +138,7 @@ namespace DataSharing.Province
                 #region 处理工单的推送时间,用于后面计算及时率
                 if (dto.TaskType == "SubmitCaseInfo")
                 {
-                    var dataOrder = System.Text.Json.JsonSerializer.Deserialize<ProvinceListRequest<SubmitCaseInfo>>(dto.Request);
+                    var dataOrder = System.Text.Json.JsonSerializer.Deserialize<ProvinceListRequestSubmitCaseInfo>(dto.Request);//
                     if (dataOrder != null && dataOrder.Data != null)
                     {
                         var orderItems = dataOrder.Data.Items;