From 52c16b373865a6ba018724881c9cc631022c837f Mon Sep 17 00:00:00 2001
From: xiaolipro <2357729423@qq.com>
Date: Sun, 28 Sep 2025 09:40:16 +0800
Subject: [PATCH] config upd
---
src/TrackCenter.Api/appsettings.json | 4 ++--
.../Dtos/TrackPush/EditTrackPushConfigInput.cs | 4 ++--
.../Rabbit/TrackRefreshEventHandler.cs | 14 +++++++-------
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/TrackCenter.Api/appsettings.json b/src/TrackCenter.Api/appsettings.json
index dbbd5bd3..dd4d86b2 100644
--- a/src/TrackCenter.Api/appsettings.json
+++ b/src/TrackCenter.Api/appsettings.json
@@ -140,9 +140,9 @@
"ScanTransportWarningDetailsGenerateTaskMinuteInterval": 5
},
"InterfaceRelayParamsConfig": {
- "OrderPath": "[*]",
+ "OrderPath": "",
"OrderNoName": "trackNo",
- "TrackDetailsPath": "data[*]",
+ "TrackDetailsPath": "data",
"TrackContentCodeName": "code",
"TrackStatusName": "status",
"TrackContentName": "content",
diff --git a/src/TrackCenter.Application/Dtos/TrackPush/EditTrackPushConfigInput.cs b/src/TrackCenter.Application/Dtos/TrackPush/EditTrackPushConfigInput.cs
index d090d0ea..1a4ce3a5 100644
--- a/src/TrackCenter.Application/Dtos/TrackPush/EditTrackPushConfigInput.cs
+++ b/src/TrackCenter.Application/Dtos/TrackPush/EditTrackPushConfigInput.cs
@@ -5,12 +5,12 @@ public class EditTrackPushConfigInput
///
/// 客户
///
- public string Customer { get; set; }
+ public string? Customer { get; set; }
///
/// 应用
///
- public string AppKey { get; set; }
+ public string? AppKey { get; set; }
public int? Id { get; set; }
diff --git a/src/TrackCenter.Application/Rabbit/TrackRefreshEventHandler.cs b/src/TrackCenter.Application/Rabbit/TrackRefreshEventHandler.cs
index 7dc30414..2cc5510b 100644
--- a/src/TrackCenter.Application/Rabbit/TrackRefreshEventHandler.cs
+++ b/src/TrackCenter.Application/Rabbit/TrackRefreshEventHandler.cs
@@ -74,7 +74,7 @@ public class TrackRefreshEventHandler : ITransientDependency, IRabbitHandler
}
var attach = Base64Helper.DeSerialize(@event.Attach);
- if (attach is null || @event.Data == null)
+ if (attach is null || @event.Data.IsNullOrWhiteSpace())
{
_logger.LogWarning("请求id: {@RequestId},轨迹消费失败,attach或data解析为空", @event.RequestId);
return;
@@ -88,7 +88,7 @@ public class TrackRefreshEventHandler : ITransientDependency, IRabbitHandler
return;
}
- var data = JObject.Parse(@event.Data);
+ var data = JToken.Parse(@event.Data);
var orderToken = data.SelectToken(config.ParamConfig.OrderPath);
if (orderToken is JArray orderTokens)
@@ -217,23 +217,23 @@ public class TrackRefreshEventHandler : ITransientDependency, IRabbitHandler
// 轨迹发生ISO时间
var trackIsoTime = paramConfig.TrackIsoTimeName == null
? null
- : trackToken.SelectToken(paramConfig.TrackIsoTimeName)?.ToObject();
+ : trackToken.SelectToken(paramConfig.TrackIsoTimeName)?.Value();
// 轨迹发生UTC时间
var trackUtcTime = paramConfig.TrackUtcTimeName == null
? null
- : trackToken.SelectToken(paramConfig.TrackUtcTimeName)?.ToObject();
+ : trackToken.SelectToken(paramConfig.TrackUtcTimeName)?.Value();
// 轨迹发生时间
var trackTime = trackIsoTime?.DateTime ?? (paramConfig.TrackTimeName == null
? null
- : trackToken.SelectToken(paramConfig.TrackTimeName)?.ToObject());
+ : trackToken.SelectToken(paramConfig.TrackTimeName)?.Value());
// 轨迹发生时区
var trackTimeZone = (float?) trackIsoTime?.Offset.TotalHours ?? (paramConfig.TrackTimeZoneName == null
? null
- : trackToken.SelectToken(paramConfig.TrackTimeZoneName)?.ToObject());
+ : trackToken.SelectToken(paramConfig.TrackTimeZoneName)?.Value());
// 轨迹发生地
var trackPlace = paramConfig.TrackPlaceName == null
? null
- : trackToken.SelectToken(paramConfig.TrackPlaceName)?.ToObject();
+ : trackToken.SelectToken(paramConfig.TrackPlaceName)?.Value();
// 轨迹扩展信息,根据输入的多个字段提取报文内容,构建一个新的对象的json形式
var trackExtra = paramConfig.TrackExtraNames == null
? null