From bb7a3c2312e3872ebfdac10a7044a3914170ee3c Mon Sep 17 00:00:00 2001
From: xiaolipro <2357729423@qq.com>
Date: Fri, 6 Sep 2024 17:12:18 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=20=203.=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?=E6=8B=89=E5=8F=96=E8=BD=A8=E8=BF=B9=E7=8A=B6=E6=80=81=E6=94=AF?=
=?UTF-8?q?=E6=8C=81=E6=B7=BB=E5=8A=A0=E5=A4=9A=E4=B8=AA=E3=80=91=20https:?=
=?UTF-8?q?//www.tapd.cn/60863849/prong/tasks/view/1160863849001027894?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../TrackPull/EditTrackPullContentInput.cs | 2 +-
.../Services/TrackPull/TrackPullService.cs | 21 ++++++---
.../TrackPullContentConfigEntity.cs | 14 +++---
.../GetTrackPullContentDetailOutputVO.cs | 43 ++++++-------------
4 files changed, 38 insertions(+), 42 deletions(-)
diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/EditTrackPullContentInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/EditTrackPullContentInput.cs
index 4c98f036..a4d9e0f8 100644
--- a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/EditTrackPullContentInput.cs
+++ b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/EditTrackPullContentInput.cs
@@ -37,7 +37,7 @@ public class EditTrackPullContentInput
///
/// 服务商轨迹状态参数值
///
- public string? TrackStatusValue { get; set; }
+ public List? TrackStatusValues { get; set; }
///
/// 兜底轨迹时区发生地
diff --git a/src/SJZY.Track.Application/Services/TrackPull/TrackPullService.cs b/src/SJZY.Track.Application/Services/TrackPull/TrackPullService.cs
index 580d2097..c58be118 100644
--- a/src/SJZY.Track.Application/Services/TrackPull/TrackPullService.cs
+++ b/src/SJZY.Track.Application/Services/TrackPull/TrackPullService.cs
@@ -156,16 +156,27 @@ public class TrackPullService : ApplicationService
{
Expression> isContentAnyExp = x =>
x.TrackPullConfigId == input.TrackPullConfigId;
- if (input.Options == OptionTypeNoNull.修改) isContentAnyExp = isContentAnyExp.And(x => x.Id != input.Id);
+
+ if (input.Options == OptionTypeNoNull.修改)
+ {
+ isContentAnyExp = isContentAnyExp.And(x => x.Id != input.Id);
+ }
if (await _trackPullConfigRepository.IsContentAnyAsync(isContentAnyExp.And(x =>
x.TrackContentId == input.TrackContentId)))
throw new BusinessException(message: _stringLocalizer["IsTrackPullContentAny"]);
- if (!input.TrackStatusValue.IsNullOrWhiteSpace() &&
- await _trackPullConfigRepository.IsContentAnyAsync(isContentAnyExp.And(x =>
- x.TrackStatusValue == input.TrackStatusValue)))
- throw new BusinessException(message: _stringLocalizer["IsTrackPullContentStatusValueAny"]);
+ if (!input.TrackStatusValues.IsNullOrEmpty())
+ {
+ Expression> trackStatusValuesExp = _ => false;
+ input.TrackStatusValues!.ForEach(item =>
+ {
+ trackStatusValuesExp = trackStatusValuesExp.Or(x => SqlFunc.SplitIn(x.TrackKeyword, item));
+ });
+
+ if (await _trackPullConfigRepository.IsContentAnyAsync(isContentAnyExp.And(trackStatusValuesExp)))
+ throw new BusinessException(message: _stringLocalizer["IsTrackPullContentStatusValueAny"]);
+ }
if (!input.TrackKeywords.IsNullOrEmpty())
{
diff --git a/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPullContentConfigEntity.cs b/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPullContentConfigEntity.cs
index 06567e95..42ed4681 100644
--- a/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPullContentConfigEntity.cs
+++ b/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPullContentConfigEntity.cs
@@ -30,12 +30,6 @@ public class TrackPullContentConfigEntity : IFullAuditedBasicEntitys, IEntity
[SugarColumn(ColumnName = "TrackStatusValue")]
public string? TrackStatusValue { get; set; }
- ///
- /// 轨迹发生地参数值(主数据枚举)
- ///
- [SugarColumn(ColumnName = "TrackPlaceValue")]
- public int? TrackPlaceValue { get; set; }
-
///
/// 轨迹关键词（正向），多个逗分隔
///
@@ -49,7 +43,13 @@ public class TrackPullContentConfigEntity : IFullAuditedBasicEntitys, IEntity
public string? TrackKeywordReverse { get; set; }
///
- /// 轨迹时区发生地参数值
+ /// 兜底轨迹发生地参数值
+ ///
+ [SugarColumn(ColumnName = "TrackPlaceValue")]
+ public int? TrackPlaceValue { get; set; }
+
+ ///
+ /// 兜底轨迹时区所属发生地参数值
///
[SugarColumn(ColumnName = "TrackZonePlaceValue")]
public int? TrackZonePlaceValue { get; set; }
diff --git a/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentDetailOutputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentDetailOutputVO.cs
index f8de20f8..952c02ef 100644
--- a/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentDetailOutputVO.cs
+++ b/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentDetailOutputVO.cs
@@ -2,17 +2,17 @@ namespace SJZY.Track.Domain.Dtos.TrackPull;
public class GetTrackPullContentDetailOutputVO
{
- ///
- /// 轨迹内容代码
- ///
- public string Code { get; set; } = null!;
-
public int Id { get; set; }
///
- /// 拉取轨迹内容代码
+ /// 轨迹代码
///
- public string? TrackContentCodeValue { get; set; }
+ public string Code { get; set; }
+
+ ///
+ /// 轨迹拉取配置id
+ ///
+ public int TrackPullConfigId { get; set; }
///
/// 轨迹内容id
@@ -20,9 +20,14 @@ public class GetTrackPullContentDetailOutputVO
public int TrackContentId { get; set; }
///
- /// 拉取轨迹内容
+ /// 服务商轨迹状态参数值
///
- public string? TrackContentValue { get; set; }
+ public string? TrackStatusValue { get; set; }
+
+ ///
+ /// 服务商轨迹状态参数值
+ ///
+ public List? TrackStatusValues { get; set; }
///
/// 拉取轨迹关键字（正向）
@@ -49,26 +54,6 @@ public class GetTrackPullContentDetailOutputVO
///
public int? TrackPlaceValue { get; set; }
- ///
- /// 轨迹拉取配置id
- ///
- public int TrackPullConfigId { get; set; }
-
- ///
- /// 拉取轨迹状态
- ///
- public string? TrackStatusValue { get; set; }
-
- ///
- /// 拉取轨迹时区
- ///
- public double? TrackTimeZone { get; set; }
-
- ///
- /// 是否完结
- ///
- public bool IsCompleted { get; set; }
-
///
/// 轨迹时区兜底地址值
///