Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台

src/SJZY.Track.Application/Services/TrackPull/TrackPullService.cs

@@ -1,4 +1,5 @@
-using System.Linq.Expressions;
+using System;
+using System.Linq.Expressions;
 using Microsoft.Extensions.Localization;
 using SJZY.Expand.ABP.Core.Localization;
 using SJZY.Expand.ABP.Core.PublicMethords;
@@ -211,18 +212,22 @@ public class TrackPullService : ApplicationService, ITransientDependency
     {
         Expression<Func<TrackPullContentConfigEntity, bool>> isContentAnyExp = x => x.Id != input.Id && x.TrackPullConfigId == input.TrackPullConfigId;
 
-        var trackKeywordExp = Expressionable.Create<TrackPullContentConfigEntity>()
+        if (await _trackPullConfigRepository.IsContentAnyAsync(isContentAnyExp.And(x => x.TrackContentId == input.TrackContentId)))
-            .And(x => x.TrackContentId == input.TrackContentId
-                      || (input.TrackContentCodeValue != null && x.TrackContentCodeValue == input.TrackContentCodeValue)
-                      || (input.TrackStatusValue != null && x.TrackStatusValue == input.TrackStatusValue)
-                      || (input.TrackContentValue != null && x.TrackContentValue == input.TrackContentValue));
-
-        input.TrackKeywords?.ForEach(item => { trackKeywordExp.Or(x => SqlFunc.SplitIn(x.TrackKeyword, item)); });
-
-        isContentAnyExp = isContentAnyExp.And(trackKeywordExp.ToExpression());
-
-        if (await _trackPullConfigRepository.IsContentAnyAsync(isContentAnyExp))
             throw new BusinessException(message: _stringLocalizer["IsTrackPullContentAny"]);
+        else if (!input.TrackContentCodeValue.IsNullOrWhiteSpace() && await _trackPullConfigRepository.IsContentAnyAsync(isContentAnyExp.And(x => x.TrackContentCodeValue == input.TrackContentCodeValue)))
+            throw new BusinessException(message: _stringLocalizer["IsTrackPullContentCodeValueAny"]);
+        else if (!input.TrackStatusValue.IsNullOrWhiteSpace() && await _trackPullConfigRepository.IsContentAnyAsync(isContentAnyExp.And(x => x.TrackStatusValue == input.TrackStatusValue)))
+            throw new BusinessException(message: _stringLocalizer["IsTrackPullContentStatusValueAny"]);
+        else if (!input.TrackContentValue.IsNullOrWhiteSpace() && await _trackPullConfigRepository.IsContentAnyAsync(isContentAnyExp.And(x => x.TrackContentValue == input.TrackContentValue)))
+            throw new BusinessException(message: _stringLocalizer["IsTrackPullContentValueAny"]);
+        else if (!input.TrackKeywords.IsNullOrEmpty())
+        {
+            Expression<Func<TrackPullContentConfigEntity, bool>> trackKeywordExp = _ => true;
+            input.TrackKeywords!.ForEach(item => { trackKeywordExp = trackKeywordExp.Or(x => SqlFunc.SplitIn(x.TrackKeyword, item)); });
+
+            if (await _trackPullConfigRepository.IsContentAnyAsync(isContentAnyExp.And(trackKeywordExp)))
+                throw new BusinessException(message: _stringLocalizer["IsTrackPullContentKeywordsAny"]);
+        }
 
         var oldTrackPullContentEntity = await _trackPullConfigRepository.GetContentByIdAsync(input.Id) ??
                                         throw new BusinessException(message: _stringLocalizer["NotFindData"]);

src/SJZY.Track.Application/Services/TrackPush/TrackPushService.cs

@@ -111,7 +111,7 @@ public class TrackPushService : ApplicationService, ITransientDependency
             if (input.Options == OptionTypeNoNull.修改) isAnyExp = isAnyExp.And(x => x.Id != input.Id);
 
             var trackTemplateIdExp = Expressionable.Create<TrackPushConfigEntity>();
-            foreach (var trackTemplateId in input.TrackTemplateIds) { trackTemplateIdExp.Or(x => SqlFunc.SplitIn(x.TrackTemplateId, trackTemplateId.ToString())); }
+            input.TrackTemplateIds?.ForEach(item => { trackTemplateIdExp.Or(x => SqlFunc.SplitIn(x.TrackTemplateId, item.ToString())); });
 
             isAnyExp = isAnyExp.And(trackTemplateIdExp.ToExpression());
 
@@ -202,17 +202,19 @@ public class TrackPushService : ApplicationService, ITransientDependency
     {
         if (input.Options != OptionTypeNoNull.删除)
         {
-            Expression<Func<TrackPushContentConfigEntity, bool>> isContentAnyExp = x =>
+            Expression<Func<TrackPushContentConfigEntity, bool>> isContentAnyExp = x => x.TrackPushConfigId == input.TrackPushConfigId;
-            x.TrackPushConfigId == input.TrackPushConfigId
-            && (x.TrackContentId == input.TrackContentId
-                || (input.TrackContentCodeValue != null && x.TrackContentCodeValue == input.TrackContentCodeValue)
-                || (input.TrackStatusValue != null && x.TrackStatusValue == input.TrackStatusValue)
-                || (input.TrackContentValue != null && x.TrackContentValue == input.TrackContentValue)
-                || (input.TrackEnContentValue != null && x.TrackEnContentValue == input.TrackEnContentValue));
             if (input.Options == OptionTypeNoNull.修改) isContentAnyExp = isContentAnyExp.And(x => x.Id != input.Id);
 
-            if (await _trackPushConfigRepository.IsContentAnyAsync(isContentAnyExp))
+            if (await _trackPushConfigRepository.IsContentAnyAsync(isContentAnyExp.And(x => x.TrackContentId == input.TrackContentId)))
                 throw new BusinessException(message: _stringLocalizer["IsTrackPushContentAny"]);
+            else if (!input.TrackContentCodeValue.IsNullOrWhiteSpace() && await _trackPushConfigRepository.IsContentAnyAsync(isContentAnyExp.And(x => x.TrackContentCodeValue == input.TrackContentCodeValue)))
+                throw new BusinessException(message: _stringLocalizer["IsTrackPushContentCodeValueAny"]);
+            else if (!input.TrackStatusValue.IsNullOrWhiteSpace() && await _trackPushConfigRepository.IsContentAnyAsync(isContentAnyExp.And(x => x.TrackStatusValue == input.TrackStatusValue)))
+                throw new BusinessException(message: _stringLocalizer["IsTrackPushContentStatusValueAny"]);
+            else if (!input.TrackContentValue.IsNullOrWhiteSpace() && await _trackPushConfigRepository.IsContentAnyAsync(isContentAnyExp.And(x => x.TrackContentValue == input.TrackContentValue)))
+                throw new BusinessException(message: _stringLocalizer["IsTrackPushContentValueAny"]);
+            else if (!input.TrackEnContentValue.IsNullOrWhiteSpace() && await _trackPushConfigRepository.IsContentAnyAsync(isContentAnyExp.And(x => x.TrackEnContentValue == input.TrackEnContentValue)))
+                throw new BusinessException(message: _stringLocalizer["IsTrackPushEnContentValueAny"]);
         }
 
         switch (input.Options)

src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentDetailOutputVO.cs

@@ -47,7 +47,7 @@ public class GetTrackPushContentDetailOutputVO
     /// <summary>
     /// 轨迹推送配置id
     /// </summary>
-    public int TrackPullConfigId { get; set; }
+    public int TrackPushConfigId { get; set; }
 
     /// <summary>
     /// 推送轨迹状态

src/SJZY.Track.Domain/Enums/EnumPropertyEnums.cs

@@ -11,4 +11,9 @@ public enum EnumPropertyEnums
     /// 节点
     /// </summary>
     [Description("ServiceNode")] 节点,
+
+    /// <summary>
+    /// 单号类型
+    /// </summary>
+    [Description("TrackOrderType")] 单号类型
 }

src/SJZY.Track.Repository/Repositories/TrackPushConfigRepository.cs

@@ -1,9 +1,11 @@
-using SJZY.Track.Domain.Aggregates.TrackContentAggregate;
+using SJZY.Expand.ABP.Core.PublicMethords;
+using SJZY.Track.Domain.Aggregates.TrackContentAggregate;
 using SJZY.Track.Domain.Aggregates.TrackPullAggregate;
 using SJZY.Track.Domain.Aggregates.TrackPushAggregate;
 using SJZY.Track.Domain.Aggregates.TrackTemplateAggregate;
 using SJZY.Track.Domain.Dtos.Common;
 using SJZY.Track.Domain.Dtos.TrackPush;
+using SJZY.Track.Domain.Enums;
 using SJZY.Track.Domain.VEntities;
 using SJZY.Track.Repository.VData.Entitys;
 using System.Linq.Expressions;
@@ -44,12 +46,14 @@ public class TrackPushConfigRepository : BasicRepository<TrackPushConfigEntity>,
     {
         return await Context.Queryable<TrackPushContentConfigEntity>()
             .InnerJoin<TrackContentEntity>((pushContent, trackContent) => pushContent.TrackContentId == trackContent.Id)
+            .LeftJoin<VEnumValueInfoEntity>((pushContent, trackContent, enumValue) => enumValue.Property == EnumPropertyEnums.单号类型.GetDescription() && pushContent.OrderNoType == enumValue.Enumkey && !enumValue.IsDeleted)
             .Where(pushContent => pushContent.TrackPushConfigId == input.TrackPushConfigId)
-            .OrderBy((pushContent, trackContent) => pushContent.Sort)
+            .OrderBy(pushContent => pushContent.Sort)
-            .Select((pushContent, trackContent) => new GetTrackPushContentPageOutputVO
+            .Select((pushContent, trackContent, enumValue) => new GetTrackPushContentPageOutputVO
             {
                 Id = pushContent.Id,
-                Sort = pushContent.Sort
+                Sort = pushContent.Sort,
+                OrderNoType = enumValue.Disp
             }, true)
             .ToPagedListAsync(input.PageIndex, input.PageSize);
     }