From 90e59e27ea92f40328e9fddd708dd526a7966224 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9F=B3=E6=96=87=E7=BF=94?= <878130837@qq.com>
Date: Thu, 29 Feb 2024 09:55:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=20=E8=BD=A8=E8=BF=B9?=
 =?UTF-8?q?=E6=8B=89=E5=8F=96=E9=85=8D=E7=BD=AE=E5=86=85=E5=AE=B9=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=20=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/TrackPull/TrackPullService.cs    |  11 ++
 .../ITrackPullConfigRepository.cs             |   7 +
 .../GetTrackPullConfigDetailOutputVO.cs       | 129 +++++++++---------
 .../GetTrackPullContentDetailOutputVO.cs      |  56 ++++++++
 .../TrackPullConfigRepository.cs              |  13 ++
 5 files changed, 151 insertions(+), 65 deletions(-)
 create mode 100644 src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentDetailOutputVO.cs

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);
     }
+
+    /// <summary>
+    /// 轨迹拉取配置内容详情
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    [HttpGet("GetContentDetail")]
+    public async Task<GetTrackPullContentDetailOutputVO> 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<TrackPullConfigEn
     /// <param name="id"></param>
     /// <returns></returns>
     Task<GetTrackPullConfigDetailOutputVO> GetDetailAsync(int id);
+
+    /// <summary>
+    /// 轨迹拉取配置内容详情
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    Task<GetTrackPullContentDetailOutputVO> 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; }
 
-        /// <summary>
-        /// 拉取轨迹订单号
-        /// </summary>
-        public string OrderNoName { get; set; }
+    /// <summary>
+    /// 拉取轨迹订单号
+    /// </summary>
+    public string OrderNoName { get; set; }
 
-        /// <summary>
-        /// 返参解析对象
-        /// </summary>
-        public int ParseMethod { get; set; }
+    /// <summary>
+    /// 返参解析对象
+    /// </summary>
+    public int ParseMethod { get; set; }
 
-        /// <summary>
-        /// 定时任务（分钟）
-        /// </summary>
-        public int PullInterval { get; set; }
+    /// <summary>
+    /// 定时任务（分钟）
+    /// </summary>
+    public int PullInterval { get; set; }
 
-        /// <summary>
-        /// 服务商
-        /// </summary>
-        public string ServiceProvider { get; set; }
+    /// <summary>
+    /// 服务商
+    /// </summary>
+    public string ServiceProvider { get; set; }
 
-        /// <summary>
-        /// 服务商id
-        /// </summary>
-        public int ServiceProviderId { get; set; }
+    /// <summary>
+    /// 服务商id
+    /// </summary>
+    public int ServiceProviderId { get; set; }
 
-        /// <summary>
-        /// 子系统
-        /// </summary>
-        public string SubSystem { get; set; }
+    /// <summary>
+    /// 子系统
+    /// </summary>
+    public string SubSystem { get; set; }
 
-        /// <summary>
-        /// 子系统id
-        /// </summary>
-        public int SubSystemId { get; set; }
+    /// <summary>
+    /// 子系统id
+    /// </summary>
+    public int SubSystemId { get; set; }
 
-        /// <summary>
-        /// 拉取轨迹时区
-        /// </summary>
-        public string TackTimeZoneName { get; set; }
+    /// <summary>
+    /// 拉取轨迹时区
+    /// </summary>
+    public string TackTimeZoneName { get; set; }
 
-        /// <summary>
-        /// 拉取轨迹内容代码
-        /// </summary>
-        public string TrackContentCodeName { get; set; }
+    /// <summary>
+    /// 拉取轨迹内容代码
+    /// </summary>
+    public string TrackContentCodeName { get; set; }
 
-        /// <summary>
-        /// 拉取轨迹内容
-        /// </summary>
-        public string TrackContentName { get; set; }
+    /// <summary>
+    /// 拉取轨迹内容
+    /// </summary>
+    public string TrackContentName { get; set; }
 
-        /// <summary>
-        /// 拉取轨迹发生地
-        /// </summary>
-        public string TrackPlaceName { get; set; }
+    /// <summary>
+    /// 拉取轨迹发生地
+    /// </summary>
+    public string TrackPlaceName { get; set; }
 
-        /// <summary>
-        /// 拉取轨迹状态
-        /// </summary>
-        public string TrackStatusName { get; set; }
+    /// <summary>
+    /// 拉取轨迹状态
+    /// </summary>
+    public string TrackStatusName { get; set; }
 
-        /// <summary>
-        /// 轨迹模板
-        /// </summary>
-        public string TrackTemplate { get; set; }
+    /// <summary>
+    /// 轨迹模板
+    /// </summary>
+    public string TrackTemplate { get; set; }
 
-        /// <summary>
-        /// 轨迹模板id
-        /// </summary>
-        public int TrackTemplateId { get; set; }
+    /// <summary>
+    /// 轨迹模板id
+    /// </summary>
+    public int TrackTemplateId { get; set; }
 
-        /// <summary>
-        /// 拉取轨迹发生时间
-        /// </summary>
-        public string TrackTimeName { get; set; }
-    }
+    /// <summary>
+    /// 拉取轨迹发生时间
+    /// </summary>
+    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
+{
+    /// <summary>
+    /// 轨迹内容代码
+    /// </summary>
+    public string Code { get; set; }
+
+    public int Id { get; set; }
+
+    /// <summary>
+    /// 拉取轨迹内容代码
+    /// </summary>
+    public string TrackContentCodeValue { get; set; }
+
+    /// <summary>
+    /// 轨迹内容id
+    /// </summary>
+    public int TrackContentId { get; set; }
+
+    /// <summary>
+    /// 拉取轨迹内容
+    /// </summary>
+    public string TrackContentValue { get; set; }
+
+    /// <summary>
+    /// 拉取轨迹关键字（正向）
+    /// </summary>
+    public string TrackKeyword { get; set; }
+
+    /// <summary>
+    /// 拉取轨迹关键字（反向）
+    /// </summary>
+    public string TrackKeywordReverse { get; set; }
+
+    /// <summary>
+    /// 拉取轨迹发生地
+    /// </summary>
+    public int TrackPlaceValue { get; set; }
+
+    /// <summary>
+    /// 轨迹拉取配置id
+    /// </summary>
+    public int TrackPullConfigId { get; set; }
+
+    /// <summary>
+    /// 拉取轨迹状态
+    /// </summary>
+    public string TrackStatusValue { get; set; }
+
+    /// <summary>
+    /// 拉取轨迹时区
+    /// </summary>
+    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<TrackPullConfigEntity>,
             }, true)
             .SingleAsync();
     }
+
+    public async Task<GetTrackPullContentDetailOutputVO> GetContentDetailAsync(int id)
+    {
+        return await Context.Queryable<TrackPullContentConfigEntity>()
+            .InnerJoin<TrackContentEntity>((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