tangjiang 4 сар өмнө
parent
commit
1da704a13a

+ 8 - 1
src/DataSharing.Host/Controllers/Police110/PoliceDCJTController.cs

@@ -289,14 +289,21 @@ namespace DataSharing.Host.Controllers.Police110
                     ChainDeal_DCJT chainDeal = new();
 
                     string base64String = await GetStreamBase64(HttpContext.Request);
+                    _logger.LogInformation($"接收原始数据:" + $"\r\n\r\nbase64:{base64String}");
                     if (!string.IsNullOrEmpty(base64String))
                     {
                         // 解密:base64通过sm4解密转json
                         string jsonRes = Sm4Crypto.Decrypt_ECB_Base64(sm4, base64String);
+                        _logger.LogInformation($"接收原始数据jsonRes:" + $"jsonRes:{jsonRes}");
                         if (!string.IsNullOrEmpty(jsonRes))
+                        {
+                            var data = JsonConvert.DeserializeObject<ChainDeal_DCJTNewDto>(jsonRes);
+                            jsonRes = JsonConvert.SerializeObject(data);
+                        }
                             // json 转 实体类
                             chainDeal = System.Text.Json.JsonSerializer.Deserialize<ChainDeal_DCJT>(jsonRes);
 
+                        _logger.LogInformation("base64String---------" + base64String);
                         await InitRawData("service/api/dcjt/110To12345/chainDeal", base64String, jsonRes, chainDeal?.AlarmReceiptNumber);
 
                     }
@@ -783,7 +790,7 @@ namespace DataSharing.Host.Controllers.Police110
                 //写入对外展示表数据
                 DsReceiveHandleData dsReceive = new()
                 {
-                    OrderNo = orderData.OrderNo,
+                    OrderNo = policeReceiveChainDealDs.AlarmReceiptNumber,
                     Source = "110平台",
                     PlatformsName = "110平台",
                     ReceiveData = System.Text.Json.JsonSerializer.Serialize(policeReceiveChainDealDs)

+ 0 - 6
src/DataSharing.Share/Dtos/Police110/DCJT110/ChainDeal_DCJT.cs

@@ -11,16 +11,12 @@ namespace DataSharing.Share.Dtos.Police110.DaoShu110
         /// 接警单编号
         /// </summary>
         [JsonPropertyName("JJDBH")]
-        [MDisplayName("接警单编号")]
-        [VRequired]
         public string AlarmReceiptNumber { get; set; }
 
         /// <summary>
         /// 处置类型 1正常 2退回 3回访 4警情签收状态  5是结果签收状态 
         /// </summary>
         [JsonPropertyName("CZLX")]
-        [MDisplayName("处置类型")]
-        [VRequired]
         public string DisposalType { get; set; }
 
         /// <summary>
@@ -117,8 +113,6 @@ namespace DataSharing.Share.Dtos.Police110.DaoShu110
         /// 入库时间
         /// </summary>
         [JsonPropertyName("TSSJ")]
-        [MDisplayName("入库时间")]
-        [VRequired]
         public string WarehousingTime { get; set; }
     }
 

+ 1 - 1
src/DataSharing.Share/Dtos/Police110/DCJT110/DCJTDeResponse.cs

@@ -45,7 +45,7 @@ namespace DataSharing.Share.Dtos.Police110.DCJT110
         {
             return new DCJTDeResponse<TData>
             {
-                rcode = 0,
+                rcode = -1,
                 rdata = data,
                 rmsg = description ?? "调用失败"
             };