change：【轨迹的完成根据拉取配置判断】

https://www.tapd.cn/60863849/prong/stories/view/1160863849001017014

src/SJZY.Track.Api/appsettings.json

@@ -5,9 +5,11 @@
     "Apollo": {
       "AppId": "SJZY.Track.Configuration",
       "Env": "DEV",
-      "Namespace": "Test",
+      "Namespace": "Dev",
       "MetaServer": "http://apollo-service-test-apollo-configservice.apollo.svc.cluster.local:8080",
-      "ConfigServer": [ "http://apollo-service-test-apollo-configservice.apollo.svc.cluster.local:8080" ]
+      "ConfigServer": [
+        "http://apollo-service-test-apollo-configservice.apollo.svc.cluster.local:8080"
+      ]
     }
   },
   "Kestrel": {

src/SJZY.Track.Application.Contract/Dtos/TrackContents/EditTrackContentInput.cs

@@ -94,10 +94,5 @@
         /// 轨迹标记
         /// </summary>
         public string TrackFlag { get; set; }
-
-        /// <summary>
-        /// 是否完结
-        /// </summary>
-        public bool IsFinish { get; set; }
     }
 }

src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetPageTrackContentInput.cs

@@ -84,10 +84,5 @@
         /// 修改人
         /// </summary>
         public string UpdateUser { get; set; }
-
-        /// <summary>
-        /// 是否完结
-        /// </summary>
-        public bool IsFinish { get; set; }
     }
 }

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

@@ -53,4 +53,9 @@ public class EditTrackPullContentInput
     /// 轨迹时区GMT
     /// </summary>
     public double? TrackTimeZone { get; set; }
+
+    /// <summary>
+    /// 是否完结
+    /// </summary>
+    public bool IsCompleted { get; set; }
 }

src/SJZY.Track.Application/Services/TrackContents/TrackContentService.cs

@@ -1,40 +1,31 @@
-using Microsoft.Extensions.Localization;
+using System.Linq.Expressions;
+using Microsoft.Extensions.Localization;
 using SJZY.Expand.ABP.Core.Localization;
 using SJZY.Expand.ABP.Core.PublicMethords;
 using SJZY.Track.Application.Contract.Dtos.TrackContents;
 using SJZY.Track.Application.Localization;
 using SJZY.Track.Domain.Aggregates.TrackContentAggregate;
-using SJZY.Track.Domain.Aggregates.TrackTemplateAggregate;
 using SJZY.Track.Domain.Dtos.TrackContents;
-using SJZY.Track.Domain.Queries;
-using System.Linq.Expressions;
-using Volo.Abp.DependencyInjection;
 
-namespace SJZY.Track.Application.Services.TrackContents
+namespace SJZY.Track.Application.Services.TrackContents;
+
+/// <summary>
+/// 轨迹内容服务
+/// </summary>
+[ApiExplorerSettings(GroupName = "轨迹内容")]
+[Route("/Track/Content")]
+public class TrackContentService : ApplicationService
 {
-    /// <summary>
-    /// 轨迹内容服务
-    /// </summary>
-    [ApiExplorerSettings(GroupName = "轨迹内容")]
-    [Route("/Track/Content")]
-    public class TrackContentService : ApplicationService, ITransientDependency
-    {
     private readonly IStringLocalizer<TrackLocalizationResource> _stringLocalizer;
     private readonly ITrackContentRepository _trackContentRepository;
-        private readonly IBasicQuery<TrackContentMapEntity> _trackContentMapBasicQuery;
-        private readonly IBasicQuery<TrackTemplateContentEntity> _trackTemplateContentBasicQuery;
 
     public TrackContentService(
         IStringLocalizer<TrackLocalizationResource> stringLocalizer,
-            ITrackContentRepository trackContentRepository,
+        ITrackContentRepository trackContentRepository
-            IBasicQuery<TrackContentMapEntity> trackContentMapBasicQuery,
-            IBasicQuery<TrackTemplateContentEntity> trackTemplateContentBasicQuery
     )
     {
-            this._stringLocalizer = stringLocalizer;
+        _stringLocalizer = stringLocalizer;
-            this._trackContentRepository = trackContentRepository;
+        _trackContentRepository = trackContentRepository;
-            this._trackContentMapBasicQuery = trackContentMapBasicQuery;
-            this._trackTemplateContentBasicQuery = trackTemplateContentBasicQuery;
     }
 
     /// <summary>
@@ -106,11 +97,13 @@ namespace SJZY.Track.Application.Services.TrackContents
             {
                 throw new BusinessException(message: "该子系统下轨迹代码已存在");
             }
+
             var contents = trackContentEntitys.FirstOrDefault(a => a.Content == input.Content);
             if (contents != null)
             {
                 throw new BusinessException(message: "该子系统下轨迹内容已存在");
             }
+
             var contentEns = trackContentEntitys.FirstOrDefault(a => a.EnContent == input.EnContent);
             if (contentEns != null)
             {
@@ -143,11 +136,13 @@ namespace SJZY.Track.Application.Services.TrackContents
             {
                 throw new BusinessException(message: "该子系统下轨迹代码已存在");
             }
+
             var contents = trackContentEntitys.FirstOrDefault(a => a.Content == input.Content);
             if (contents != null)
             {
                 throw new BusinessException(message: "该子系统下轨迹内容已存在");
             }
+
             var contentEns = trackContentEntitys.FirstOrDefault(a => a.EnContent == input.EnContent);
             if (contentEns != null)
             {
@@ -160,7 +155,7 @@ namespace SJZY.Track.Application.Services.TrackContents
         //更新的时候需要覆盖内容映射轨迹代码
         var templateEntity = await _trackContentRepository.GetFirstAsync(a => a.Id == input.Id);
 
-            bool isTrue = false;
+        bool isTrue;
 
         using (var ts = TransactionScopeHelper.Create())
         {
@@ -193,6 +188,7 @@ namespace SJZY.Track.Application.Services.TrackContents
     private async Task<UnifyResultDto> DeleteAsync(EditTrackContentInput input)
     {
         #region 业务校验
+
         //查询是否关联了轨迹模版内容
         var isExistTemplate = await _trackContentRepository.GetTemplateIsExist(input.Id);
         if (isExistTemplate)
@@ -211,6 +207,7 @@ namespace SJZY.Track.Application.Services.TrackContents
         //{
         //    throw new BusinessException(message: "无法删除该内容，该轨迹内容已在轨迹内容映射中使用了,请检查");
         //}
+
         #endregion 业务校验
 
         var isTrue = await _trackContentRepository.SoftDeleteAsync(x => x.Id == input.Id);
@@ -226,7 +223,8 @@ namespace SJZY.Track.Application.Services.TrackContents
     /// <param name="input"></param>
     /// <returns></returns>
     [HttpPost("GetMapPage")]
-        public async Task<UnifyPageResultDto<GetTrackContentMapPageOutputVO>> GetMapPageAsync([FromBody] GetTrackContentMapPageInputVO input)
+    public async Task<UnifyPageResultDto<GetTrackContentMapPageOutputVO>> GetMapPageAsync(
+        [FromBody] GetTrackContentMapPageInputVO input)
     {
         return await _trackContentRepository.GetMapPageAsync(input);
     }
@@ -252,7 +250,8 @@ namespace SJZY.Track.Application.Services.TrackContents
     {
         if (input.Options != OptionTypeNoNull.删除)
         {
-                if (input.SubSystemId == input.MapSubSystemId) throw new BusinessException(message: _stringLocalizer["NotAllowedToMapSubSystem"]);
+            if (input.SubSystemId == input.MapSubSystemId)
+                throw new BusinessException(message: _stringLocalizer["NotAllowedToMapSubSystem"]);
 
             Expression<Func<TrackContentMapEntity, bool>> isMapAnyExp = x =>
                 x.TrackContentId == input.TrackContentId && x.MapTrackContentId == input.MapTrackContentId;
@@ -274,7 +273,8 @@ namespace SJZY.Track.Application.Services.TrackContents
 
             case OptionTypeNoNull.修改:
             {
-                        var oldTrackContentMapEntity = await _trackContentRepository.GetMapByIdAsync(input.Id!.Value) ?? throw new BusinessException(message: _stringLocalizer["NotFindData"]);
+                var oldTrackContentMapEntity = await _trackContentRepository.GetMapByIdAsync(input.Id!.Value) ??
+                                               throw new BusinessException(message: _stringLocalizer["NotFindData"]);
 
                 ObjectMapper.Map(input, oldTrackContentMapEntity);
 
@@ -293,5 +293,4 @@ namespace SJZY.Track.Application.Services.TrackContents
 
         return true;
     }
-    }
 }

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

@@ -152,6 +152,7 @@ public class TrackPullService : ApplicationService
                         x.PullOrPushConfigId == input.Id && !x.IsPush);
                     await _trackPullConfigRepository.SoftDeleteContentAsync(x => x.TrackPullConfigId == input.Id);
 
+                    await _trackPullCacheService.SetPullConfigAsync(input.Id);
                     ts.Complete();
                 }
 
@@ -182,19 +183,19 @@ public class TrackPullService : ApplicationService
             if (await _trackPullConfigRepository.IsContentAnyAsync(isContentAnyExp.And(x =>
                     x.TrackContentId == input.TrackContentId)))
                 throw new BusinessException(message: _stringLocalizer["IsTrackPullContentAny"]);
-            else if (!input.TrackContentCodeValue.IsNullOrWhiteSpace() &&
+            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() &&
+            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() &&
+            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())
+            if (!input.TrackKeywords.IsNullOrEmpty())
             {
                 Expression<Func<TrackPullContentConfigEntity, bool>> trackKeywordExp = _ => false;
                 input.TrackKeywords!.ForEach(item =>

src/SJZY.Track.Domain/Dtos/TrackContents/GetPageTrackContentVO.cs

@@ -1,10 +1,4 @@
-using System;
+namespace SJZY.Track.Domain.Dtos.TrackContents
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SJZY.Track.Domain.Dtos.TrackContents
 {
     public class GetPageTrackContentVO : PageInfoInput
     {
@@ -90,10 +84,5 @@ namespace SJZY.Track.Domain.Dtos.TrackContents
         /// 修改人
         /// </summary>
         public string UpdateUser { get; set; }
-
-        /// <summary>
-        /// 是否完结
-        /// </summary>
-        public bool IsFinish { get; set; }
     }
 }

src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentDetailVO.cs

@@ -1,10 +1,4 @@
-using System;
+namespace SJZY.Track.Domain.Dtos.TrackContents
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SJZY.Track.Domain.Dtos.TrackContents
 {
     public class GetTrackContentDetailVO
     {
@@ -57,10 +51,5 @@ namespace SJZY.Track.Domain.Dtos.TrackContents
         /// 轨迹标记
         /// </summary>
         public string TrackFlag { get; set; }
-
-        /// <summary>
-        /// 是否完结
-        /// </summary>
-        public bool IsFinish { get; set; }
     }
 }