From ae2aa614ce23924c0eb2d440cf84698cf98bfadd Mon Sep 17 00:00:00 2001
From: xiaolipro <2357729423@qq.com>
Date: Fri, 6 Sep 2024 15:32:42 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=20=201.=20=E6=8B=89=E5=8F=96=E6=98=A0?=
 =?UTF-8?q?=E5=B0=84=E6=96=B0=E5=A2=9E=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=8B=89=E5=8F=96=E8=BD=A8=E8=BF=B9=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E5=92=8C=E6=8B=89=E5=8F=96=E8=BD=A8=E8=BF=B9=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E3=80=91=20https://www.tapd.cn/60863849/prong/tasks/v?=
 =?UTF-8?q?iew/1160863849001027892?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TrackPull/EditTrackPullContentInput.cs    | 21 -------------------
 .../Services/TrackPull/TrackPullService.cs    | 10 ++-------
 .../TrackPullContentConfigEntity.cs           | 18 ----------------
 3 files changed, 2 insertions(+), 47 deletions(-)

diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/EditTrackPullContentInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/EditTrackPullContentInput.cs
index f5a08ccc..4c98f036 100644
--- a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/EditTrackPullContentInput.cs
+++ b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/EditTrackPullContentInput.cs
@@ -9,21 +9,11 @@ public class EditTrackPullContentInput
 
     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>
@@ -49,19 +39,8 @@ public class EditTrackPullContentInput
     /// </summary>
     public string? TrackStatusValue { get; set; }
 
-    /// <summary>
-    /// 轨迹时区GMT
-    /// </summary>
-    [Obsolete]
-    public double? TrackTimeZone { get; set; }
-
     /// <summary>
     /// 兜底轨迹时区发生地
     /// </summary>
     public int? TrackTimePlaceValue { get; set; }
-
-    /// <summary>
-    /// 是否完结
-    /// </summary>
-    public bool IsCompleted { get; set; }
 }
diff --git a/src/SJZY.Track.Application/Services/TrackPull/TrackPullService.cs b/src/SJZY.Track.Application/Services/TrackPull/TrackPullService.cs
index 1909de5a..580d2097 100644
--- a/src/SJZY.Track.Application/Services/TrackPull/TrackPullService.cs
+++ b/src/SJZY.Track.Application/Services/TrackPull/TrackPullService.cs
@@ -161,18 +161,12 @@ public class TrackPullService : ApplicationService
             if (await _trackPullConfigRepository.IsContentAnyAsync(isContentAnyExp.And(x =>
                     x.TrackContentId == input.TrackContentId)))
                 throw new BusinessException(message: _stringLocalizer["IsTrackPullContentAny"]);
-            if (!input.TrackContentCodeValue.IsNullOrWhiteSpace() &&
-                await _trackPullConfigRepository.IsContentAnyAsync(isContentAnyExp.And(x =>
-                    x.TrackContentCodeValue == input.TrackContentCodeValue)))
-                throw new BusinessException(message: _stringLocalizer["IsTrackPullContentCodeValueAny"]);
+
             if (!input.TrackStatusValue.IsNullOrWhiteSpace() &&
                 await _trackPullConfigRepository.IsContentAnyAsync(isContentAnyExp.And(x =>
                     x.TrackStatusValue == input.TrackStatusValue)))
                 throw new BusinessException(message: _stringLocalizer["IsTrackPullContentStatusValueAny"]);
-            if (!input.TrackContentValue.IsNullOrWhiteSpace() &&
-                await _trackPullConfigRepository.IsContentAnyAsync(isContentAnyExp.And(x =>
-                    x.TrackContentValue == input.TrackContentValue)))
-                throw new BusinessException(message: _stringLocalizer["IsTrackPullContentValueAny"]);
+
             if (!input.TrackKeywords.IsNullOrEmpty())
             {
                 Expression<Func<TrackPullContentConfigEntity, bool>> trackKeywordExp = _ => false;
diff --git a/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPullContentConfigEntity.cs b/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPullContentConfigEntity.cs
index a1f3ba35..06567e95 100644
--- a/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPullContentConfigEntity.cs
+++ b/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPullContentConfigEntity.cs
@@ -30,30 +30,12 @@ public class TrackPullContentConfigEntity : IFullAuditedBasicEntitys, IEntity
     [SugarColumn(ColumnName = "TrackStatusValue")]
     public string? TrackStatusValue { get; set; }
 
-    /// <summary>
-    /// 服务商轨迹代码参数值
-    /// </summary>
-    [SugarColumn(ColumnName = "TrackContentCodeValue")]
-    public string? TrackContentCodeValue { get; set; }
-
-    /// <summary>
-    /// 服务商轨迹内容参数值
-    /// </summary>
-    [SugarColumn(ColumnName = "TrackContentValue")]
-    public string? TrackContentValue { get; set; }
-
     /// <summary>
     /// 轨迹发生地参数值(主数据枚举)
     /// </summary>
     [SugarColumn(ColumnName = "TrackPlaceValue")]
     public int? TrackPlaceValue { get; set; }
 
-    /// <summary>
-    /// 轨迹时区GMT
-    /// </summary>
-    [SugarColumn(ColumnName = "TrackTimeZone")]
-    public float? TrackTimeZone { get; set; }
-
     /// <summary>
     /// 轨迹关键词（正向），多个逗分隔
     /// </summary>