diff --git a/src/SJZY.Track.Application/Services/TrackPull/TrackPullService.cs b/src/SJZY.Track.Application/Services/TrackPull/TrackPullService.cs
index e9300b88..004198e0 100644
--- a/src/SJZY.Track.Application/Services/TrackPull/TrackPullService.cs
+++ b/src/SJZY.Track.Application/Services/TrackPull/TrackPullService.cs
@@ -57,4 +57,15 @@ public class TrackPullService : ApplicationService, ITransientDependency
{
return await _trackPullConfigRepository.GetDetailAsync(id);
}
+
+ ///
+ /// 轨迹拉取配置内容详情
+ ///
+ ///
+ ///
+ [HttpGet("GetContentDetail")]
+ public async Task GetContentDetailAsync(int id)
+ {
+ return await _trackPullConfigRepository.GetContentDetailAsync(id);
+ }
}
\ No newline at end of file
diff --git a/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/ITrackPullConfigRepository.cs b/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/ITrackPullConfigRepository.cs
index 98bb4822..6de7445c 100644
--- a/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/ITrackPullConfigRepository.cs
+++ b/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/ITrackPullConfigRepository.cs
@@ -25,4 +25,11 @@ public interface ITrackPullConfigRepository : IBasicRepository
///
Task GetDetailAsync(int id);
+
+ ///
+ /// 轨迹拉取配置内容详情
+ ///
+ ///
+ ///
+ Task GetContentDetailAsync(int id);
}
\ No newline at end of file
diff --git a/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullConfigDetailOutputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullConfigDetailOutputVO.cs
index 76fbdaf4..c424e5a6 100644
--- a/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullConfigDetailOutputVO.cs
+++ b/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullConfigDetailOutputVO.cs
@@ -1,82 +1,81 @@
-namespace SJZY.Track.Domain.Dtos.TrackPull
+namespace SJZY.Track.Domain.Dtos.TrackPull;
+
+public class GetTrackPullConfigDetailOutputVO
{
- public class GetTrackPullConfigDetailOutputVO
- {
- public int Id { get; set; }
+ public int Id { get; set; }
- ///
- /// 拉取轨迹订单号
- ///
- public string OrderNoName { get; set; }
+ ///
+ /// 拉取轨迹订单号
+ ///
+ public string OrderNoName { get; set; }
- ///
- /// 返参解析对象
- ///
- public int ParseMethod { get; set; }
+ ///
+ /// 返参解析对象
+ ///
+ public int ParseMethod { get; set; }
- ///
- /// 定时任务(分钟)
- ///
- public int PullInterval { get; set; }
+ ///
+ /// 定时任务(分钟)
+ ///
+ public int PullInterval { get; set; }
- ///
- /// 服务商
- ///
- public string ServiceProvider { get; set; }
+ ///
+ /// 服务商
+ ///
+ public string ServiceProvider { get; set; }
- ///
- /// 服务商id
- ///
- public int ServiceProviderId { get; set; }
+ ///
+ /// 服务商id
+ ///
+ public int ServiceProviderId { get; set; }
- ///
- /// 子系统
- ///
- public string SubSystem { get; set; }
+ ///
+ /// 子系统
+ ///
+ public string SubSystem { get; set; }
- ///
- /// 子系统id
- ///
- public int SubSystemId { get; set; }
+ ///
+ /// 子系统id
+ ///
+ public int SubSystemId { get; set; }
- ///
- /// 拉取轨迹时区
- ///
- public string TackTimeZoneName { get; set; }
+ ///
+ /// 拉取轨迹时区
+ ///
+ public string TackTimeZoneName { get; set; }
- ///
- /// 拉取轨迹内容代码
- ///
- public string TrackContentCodeName { get; set; }
+ ///
+ /// 拉取轨迹内容代码
+ ///
+ public string TrackContentCodeName { get; set; }
- ///
- /// 拉取轨迹内容
- ///
- public string TrackContentName { get; set; }
+ ///
+ /// 拉取轨迹内容
+ ///
+ public string TrackContentName { get; set; }
- ///
- /// 拉取轨迹发生地
- ///
- public string TrackPlaceName { get; set; }
+ ///
+ /// 拉取轨迹发生地
+ ///
+ public string TrackPlaceName { get; set; }
- ///
- /// 拉取轨迹状态
- ///
- public string TrackStatusName { get; set; }
+ ///
+ /// 拉取轨迹状态
+ ///
+ public string TrackStatusName { get; set; }
- ///
- /// 轨迹模板
- ///
- public string TrackTemplate { get; set; }
+ ///
+ /// 轨迹模板
+ ///
+ public string TrackTemplate { get; set; }
- ///
- /// 轨迹模板id
- ///
- public int TrackTemplateId { get; set; }
+ ///
+ /// 轨迹模板id
+ ///
+ public int TrackTemplateId { get; set; }
- ///
- /// 拉取轨迹发生时间
- ///
- public string TrackTimeName { get; set; }
- }
+ ///
+ /// 拉取轨迹发生时间
+ ///
+ public string TrackTimeName { get; set; }
}
\ No newline at end of file
diff --git a/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentDetailOutputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentDetailOutputVO.cs
new file mode 100644
index 00000000..af51f0cf
--- /dev/null
+++ b/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentDetailOutputVO.cs
@@ -0,0 +1,56 @@
+namespace SJZY.Track.Domain.Dtos.TrackPull;
+
+public class GetTrackPullContentDetailOutputVO
+{
+ ///
+ /// 轨迹内容代码
+ ///
+ public string Code { get; set; }
+
+ public int Id { get; set; }
+
+ ///
+ /// 拉取轨迹内容代码
+ ///
+ public string TrackContentCodeValue { get; set; }
+
+ ///
+ /// 轨迹内容id
+ ///
+ public int TrackContentId { get; set; }
+
+ ///
+ /// 拉取轨迹内容
+ ///
+ public string TrackContentValue { get; set; }
+
+ ///
+ /// 拉取轨迹关键字(正向)
+ ///
+ public string TrackKeyword { get; set; }
+
+ ///
+ /// 拉取轨迹关键字(反向)
+ ///
+ public string TrackKeywordReverse { get; set; }
+
+ ///
+ /// 拉取轨迹发生地
+ ///
+ public int TrackPlaceValue { get; set; }
+
+ ///
+ /// 轨迹拉取配置id
+ ///
+ public int TrackPullConfigId { get; set; }
+
+ ///
+ /// 拉取轨迹状态
+ ///
+ public string TrackStatusValue { get; set; }
+
+ ///
+ /// 拉取轨迹时区
+ ///
+ public string TrackTimeZone { get; set; }
+}
\ No newline at end of file
diff --git a/src/SJZY.Track.Repository/TrackPullConfigRepository.cs b/src/SJZY.Track.Repository/TrackPullConfigRepository.cs
index 289552b0..8965f22a 100644
--- a/src/SJZY.Track.Repository/TrackPullConfigRepository.cs
+++ b/src/SJZY.Track.Repository/TrackPullConfigRepository.cs
@@ -70,4 +70,17 @@ public class TrackPullConfigRepository : BasicRepository,
}, true)
.SingleAsync();
}
+
+ public async Task GetContentDetailAsync(int id)
+ {
+ return await Context.Queryable()
+ .InnerJoin((pullContent, trackContent) => pullContent.TrackContentId == trackContent.Id)
+ .Where(pullContent => pullContent.Id == id)
+ .Select((pullContent, trackContent) => new GetTrackPullContentDetailOutputVO
+ {
+ Id = pullContent.Id,
+ Code = trackContent.Code + "-" + trackContent.Content,
+ }, true)
+ .SingleAsync();
+ }
}
\ No newline at end of file