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; } - /// - /// 服务商轨迹代码参数值 - /// - public string? TrackContentCodeValue { get; set; } - /// /// 轨迹内容id /// public int? TrackContentId { get; set; } - /// - /// 服务商轨迹内容参数值 - /// - public string? TrackContentValue { get; set; } - /// /// 拉取轨迹关键字(正向) /// @@ -49,19 +39,8 @@ public class EditTrackPullContentInput /// public string? TrackStatusValue { get; set; } - /// - /// 轨迹时区GMT - /// - [Obsolete] - public double? TrackTimeZone { get; set; } - /// /// 兜底轨迹时区发生地 /// public int? TrackTimePlaceValue { get; set; } - - /// - /// 是否完结 - /// - 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> 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; } - /// - /// 服务商轨迹代码参数值 - /// - [SugarColumn(ColumnName = "TrackContentCodeValue")] - public string? TrackContentCodeValue { get; set; } - - /// - /// 服务商轨迹内容参数值 - /// - [SugarColumn(ColumnName = "TrackContentValue")] - public string? TrackContentValue { get; set; } - /// /// 轨迹发生地参数值(主数据枚举) /// [SugarColumn(ColumnName = "TrackPlaceValue")] public int? TrackPlaceValue { get; set; } - /// - /// 轨迹时区GMT - /// - [SugarColumn(ColumnName = "TrackTimeZone")] - public float? TrackTimeZone { get; set; } - /// /// 轨迹关键词(正向),多个逗分隔 ///