|
@@ -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)
|