Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台

src/SJZY.Track.Application.Contract/Dtos/TrackPull/UpdateTrackPullContentInput.cs

@@ -7,7 +7,7 @@ public class UpdateTrackPullContentInput
     /// <summary>
     /// 服务商轨迹代码参数值
     /// </summary>
-    public string TrackContentCodeValue { get; set; }
+    public string? TrackContentCodeValue { get; set; }
 
     /// <summary>
     /// 轨迹内容id
@@ -17,17 +17,17 @@ public class UpdateTrackPullContentInput
     /// <summary>
     /// 服务商轨迹内容参数值
     /// </summary>
-    public string TrackContentValue { get; set; }
+    public string? TrackContentValue { get; set; }
 
     /// <summary>
-    /// 轨迹关键词（正向）
+    /// 拉取轨迹关键字（正向）
     /// </summary>
-    public string TrackKeyword { get; set; }
+    public List<string>? TrackKeywords { get; set; }
 
     /// <summary>
-    /// 轨迹关键词（反向）
+    /// 拉取轨迹关键字（反向）
     /// </summary>
-    public string TrackKeywordReverse { get; set; }
+    public List<string>? TrackKeywordReverses { get; set; }
 
     /// <summary>
     /// 轨迹发生地参数值
@@ -42,7 +42,7 @@ public class UpdateTrackPullContentInput
     /// <summary>
     /// 服务商轨迹状态参数值
     /// </summary>
-    public string TrackStatusValue { get; set; }
+    public string? TrackStatusValue { get; set; }
 
     /// <summary>
     /// 轨迹时区GMT

src/SJZY.Track.Application.Contract/Dtos/TrackPush/EditTrackPushConfigInput.cs

@@ -72,7 +72,7 @@ public class EditTrackPushConfigInput
     /// <summary>
     /// 轨迹模板id
     /// </summary>
-    public List<int> TrackTemplateIds { get; set; }
+    public List<int>? TrackTemplateIds { get; set; }
 
     /// <summary>
     /// 推送轨迹发生时间

src/SJZY.Track.Application/AutoMapper/TrackPullAutoMapperProfile.cs

@@ -12,6 +12,16 @@ public class TrackPullAutoMapperProfile : Profile
         CreateMap<EditTrackPullConfigInput, TrackPullConfigEntity>(MemberList.None);
         CreateMap<EditTrackPullConfigInput, TrackPushPullParamsConfigEntity>(MemberList.None).Ignore(dest => dest.Id)
             .ForMember(dest => dest.IsPush, opt => opt.MapFrom(source => false));
-        CreateMap<UpdateTrackPullContentInput, TrackPullContentConfigEntity>(MemberList.None);
+        CreateMap<UpdateTrackPullContentInput, TrackPullContentConfigEntity>(MemberList.None)
+            .ForMember(dest => dest.TrackKeyword, opt =>
+            {
+                opt.Condition(src => !src.TrackKeywords.IsNullOrEmpty());
+                opt.MapFrom(src => string.Join(',', src.TrackKeywords));
+            })
+            .ForMember(dest => dest.TrackKeywordReverse, opt =>
+            {
+                opt.Condition(src => !src.TrackKeywordReverses.IsNullOrEmpty());
+                opt.MapFrom(src => string.Join(',', src.TrackKeywordReverses));
+            });
     }
 }

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

@@ -5,9 +5,11 @@ using SJZY.Expand.ABP.Core.PublicMethords;
 using SJZY.Track.Application.Contract.Dtos.TrackPull;
 using SJZY.Track.Application.Localization;
 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.TrackPull;
+using SqlSugar;
 using Volo.Abp.DependencyInjection;
 
 namespace SJZY.Track.Application.Services.TrackPull;
@@ -208,6 +210,18 @@ public class TrackPullService : ApplicationService, ITransientDependency
     [HttpPost("UpdateContent")]
     public async Task<bool> UpdateContentAsync([FromBody] UpdateTrackPullContentInput input)
     {
+        Expression<Func<TrackPullContentConfigEntity, bool>> isContentAnyExp = x => x.Id != input.Id && x.TrackPullConfigId == input.TrackPullConfigId;
+
+        var trackKeywordExp = Expressionable.Create<TrackPullContentConfigEntity>()
+            .And(x => x.TrackContentId == input.TrackContentId || x.TrackContentCodeValue == input.TrackContentCodeValue || x.TrackStatusValue == input.TrackStatusValue || 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"]);
+
         var oldTrackPullContentEntity = await _trackPullConfigRepository.GetContentByIdAsync(input.Id) ??
                                         throw new BusinessException(message: _stringLocalizer["NotFindData"]);
 

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

@@ -199,7 +199,7 @@ public class TrackPushService : ApplicationService, ITransientDependency
         if (input.Options != OptionTypeNoNull.删除)
         {
             Expression<Func<TrackPushContentConfigEntity, bool>> isContentAnyExp = x =>
-            x.TrackPushConfigId == input.TrackPushConfigId && x.TrackContentId == input.TrackContentId;
+            x.TrackPushConfigId == input.TrackPushConfigId && (x.TrackContentId == input.TrackContentId || x.TrackContentCodeValue == input.TrackContentCodeValue || x.TrackStatusValue == x.TrackStatusValue || x.TrackContentValue == input.TrackContentValue || x.TrackEnContentValue == input.TrackEnContentValue);
             if (input.Options == OptionTypeNoNull.修改) isContentAnyExp = isContentAnyExp.And(x => x.Id != input.Id);
 
             if (await _trackPushConfigRepository.IsContentAnyAsync(isContentAnyExp))

src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/ITrackPullConfigRepository.cs

@@ -48,4 +48,6 @@ public interface ITrackPullConfigRepository : IBasicRepository<TrackPullConfigEn
     Task<TrackPullContentConfigEntity> GetContentByIdAsync(int id);
 
     Task<bool> UpdateContentAsync(TrackPullContentConfigEntity updateObj);
+
+    Task<bool> IsContentAnyAsync(Expression<Func<TrackPullContentConfigEntity, bool>> whereExpression);
 }

src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentDetailOutputVO.cs

@@ -29,11 +29,21 @@ public class GetTrackPullContentDetailOutputVO
     /// </summary>
     public string TrackKeyword { get; set; }
 
+    /// <summary>
+    /// 拉取轨迹关键字（正向）
+    /// </summary>
+    public List<string>? TrackKeywords { get; set; }
+
     /// <summary>
     /// 拉取轨迹关键字（反向）
     /// </summary>
     public string TrackKeywordReverse { get; set; }
 
+    /// <summary>
+    /// 拉取轨迹关键字（反向）
+    /// </summary>
+    public List<string>? TrackKeywordReverses { get; set; }
+
     /// <summary>
     /// 拉取轨迹发生地
     /// </summary>

src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentPageOutputVO.cs

@@ -34,21 +34,11 @@ public class GetTrackPullContentPageOutputVO
     /// </summary>
     public string? TrackKeyword { get; set; }
 
-    /// <summary>
-    /// 拉取轨迹关键字（正向）
-    /// </summary>
-    public List<string>? TrackKeywords { get; set; }
-
     /// <summary>
     /// 拉取轨迹关键字（反向）
     /// </summary>
     public string? TrackKeywordReverse { get; set; }
 
-    /// <summary>
-    /// 拉取轨迹关键字（反向）
-    /// </summary>
-    public List<string>? TrackKeywordsReverse { get; set; }
-
     /// <summary>
     /// 轨迹发生地
     /// </summary>

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

@@ -45,11 +45,6 @@ public class TrackPullConfigRepository : BasicRepository<TrackPullConfigEntity>,
             {
                 Id = pullContent.Id
             }, true)
-            .Mapper(x =>
-            {
-                x.TrackKeywords = x.TrackKeyword?.Split(',').ToList();
-                x.TrackKeywordsReverse = x.TrackKeywordReverse?.Split(',').ToList();
-            })
             .ToPagedListAsync(input.PageIndex, input.PageSize);
     }
 
@@ -82,6 +77,11 @@ public class TrackPullConfigRepository : BasicRepository<TrackPullConfigEntity>,
                 Id = pullContent.Id,
                 Code = trackContent.Code + "-" + trackContent.Content,
             }, true)
+            .Mapper(x =>
+            {
+                x.TrackKeywords = x.TrackKeyword?.Split(',').ToList();
+                x.TrackKeywordReverses = x.TrackKeywordReverse?.Split(',').ToList();
+            })
             .SingleAsync();
     }
 
@@ -130,4 +130,9 @@ public class TrackPullConfigRepository : BasicRepository<TrackPullConfigEntity>,
     {
         return await Context.Updateable(updateObj).ExecuteCommandHasChangeAsync();
     }
+
+    public async Task<bool> IsContentAnyAsync(Expression<Func<TrackPullContentConfigEntity, bool>> whereExpression)
+    {
+        return await Context.Queryable<TrackPullContentConfigEntity>().Where(whereExpression).AnyAsync();
+    }
 }

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

@@ -99,6 +99,7 @@ public class TrackTemplateRepository : BasicRepository<TrackTemplateEntity>, ITr
                     UpdateTime = templateContent.UpdateTime,
                     UpdateUser = updateUser.Name
                 }, true)
+            .Distinct()
             .ToPagedListAsync(input.PageIndex, input.PageSize);
     }