From 777cf29baa2695fd3cee06d3c6131973c70743f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9F=B3=E6=96=87=E7=BF=94?= <878130837@qq.com>
Date: Fri, 1 Mar 2024 22:11:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=A8=E8=BF=B9=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/TrackPush/TrackPushService.cs    | 30 ++++++++++++++-----
 .../GetTrackPushConfigDetailOutputVO.cs       |  5 ++++
 src/SJZY.Track.Domain/GlobalConst.cs          |  7 ++++-
 .../Repositories/TrackPushConfigRepository.cs |  1 +
 4 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/src/SJZY.Track.Application/Services/TrackPush/TrackPushService.cs b/src/SJZY.Track.Application/Services/TrackPush/TrackPushService.cs
index 7c8489ed..02a09ce4 100644
--- a/src/SJZY.Track.Application/Services/TrackPush/TrackPushService.cs
+++ b/src/SJZY.Track.Application/Services/TrackPush/TrackPushService.cs
@@ -1,8 +1,10 @@
 using Microsoft.Extensions.Localization;
+using SJZY.Expand.ABP.Core;
 using SJZY.Expand.ABP.Core.Localization;
 using SJZY.Expand.ABP.Core.PublicMethords;
 using SJZY.Track.Application.Contract.Dtos.TrackPush;
 using SJZY.Track.Application.Localization;
+using SJZY.Track.Domain.Aggregates.DemoAggregate;
 using SJZY.Track.Domain.Aggregates.TrackPullAggregate;
 using SJZY.Track.Domain.Aggregates.TrackPushAggregate;
 using SJZY.Track.Domain.Aggregates.TrackTemplateAggregate;
@@ -66,7 +68,7 @@ public class TrackPushService : ApplicationService, ITransientDependency
     /// <param name="id"></param>
     /// <returns></returns>
     [HttpGet("GetDetail")]
-    public async Task<GetTrackPushConfigDetailOutputVO?> GetDetailAsync(int id)
+    public async Task<GetTrackPushConfigDetailOutputVO> GetDetailAsync(int id)
     {
         var res = await _trackPushConfigRepository.GetDetailAsync(id);
         if (res is null) return null;
@@ -126,6 +128,8 @@ public class TrackPushService : ApplicationService, ITransientDependency
                         trackPushParamsEntity.PullOrPushConfigId = id;
                         await _trackPullConfigRepository.InsertParamsAsync(trackPushParamsEntity);
 
+                        if (input.IsAutoPush) await RedisHelper.Client.SAddAsync(GlobalConst.AutoPushRosterRedisKey, input.CustomId);
+
                         ts.Complete();
                     }
                 }
@@ -135,6 +139,8 @@ public class TrackPushService : ApplicationService, ITransientDependency
                 {
                     var oldTrackPushEntity = await _trackPushConfigRepository.GetFirstAsync(x => x.Id == input.Id) ?? throw new BusinessException(message: _stringLocalizer["NotFindData"]);
 
+                    int oldCustomId = oldTrackPushEntity.CustomId;
+
                     var oldTrackPushParamsEntity =
                         await _trackPullConfigRepository.GetParamsSingleAsync(x =>
                             x.PullOrPushConfigId == input.Id && x.IsPush);
@@ -147,22 +153,30 @@ public class TrackPushService : ApplicationService, ITransientDependency
                         await _trackPushConfigRepository.UpdateAsync(oldTrackPushEntity);
                         await _trackPullConfigRepository.UpdateParamsAsync(oldTrackPushParamsEntity);
 
+                        await RedisHelper.Client.SRemAsync(GlobalConst.AutoPushRosterRedisKey, oldCustomId);
+                        if (input.IsAutoPush) await RedisHelper.Client.SAddAsync(GlobalConst.AutoPushRosterRedisKey, input.CustomId);
+
                         ts.Complete();
                     }
                 }
                 break;
 
             case OptionTypeNoNull.删除:
-                using (var ts = TransactionScopeHelper.Create())
                 {
-                    await _trackPushConfigRepository.SoftDeleteAsync(x => x.Id == input.Id);
-                    await _trackPullConfigRepository.SoftDeleteParamsAsync(x =>
-                        x.PullOrPushConfigId == input.Id && x.IsPush);
-                    await _trackPushConfigRepository.SoftDeleteContentAsync(x => x.TrackPushConfigId == input.Id);
+                    var oldTrackPushEntity = await _trackPushConfigRepository.GetFirstAsync(x => x.Id == input.Id) ?? throw new BusinessException(message: _stringLocalizer["NotFindData"]);
 
-                    ts.Complete();
+                    using (var ts = TransactionScopeHelper.Create())
+                    {
+                        await _trackPushConfigRepository.SoftDeleteAsync(x => x.Id == input.Id);
+                        await _trackPullConfigRepository.SoftDeleteParamsAsync(x =>
+                            x.PullOrPushConfigId == input.Id && x.IsPush);
+                        await _trackPushConfigRepository.SoftDeleteContentAsync(x => x.TrackPushConfigId == input.Id);
+
+                        await RedisHelper.Client.SRemAsync(GlobalConst.AutoPushRosterRedisKey, oldTrackPushEntity.CustomId);
+
+                        ts.Complete();
+                    }
                 }
-
                 break;
 
             default:
diff --git a/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushConfigDetailOutputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushConfigDetailOutputVO.cs
index 900c74bc..ced23f75 100644
--- a/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushConfigDetailOutputVO.cs
+++ b/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushConfigDetailOutputVO.cs
@@ -91,6 +91,11 @@ public class GetTrackPushConfigDetailOutputVO
     /// </summary>
     public string TrackTemplateId { get; set; }
 
+    /// <summary>
+    /// 轨迹模板ids
+    /// </summary>
+    public List<int> TrackTemplateIds { get; set; }
+
     /// <summary>
     /// 推送轨迹发生时间
     /// </summary>
diff --git a/src/SJZY.Track.Domain/GlobalConst.cs b/src/SJZY.Track.Domain/GlobalConst.cs
index 77881f20..8db2300c 100644
--- a/src/SJZY.Track.Domain/GlobalConst.cs
+++ b/src/SJZY.Track.Domain/GlobalConst.cs
@@ -6,9 +6,14 @@ public class GlobalConst
     /// 轨迹明细es索引名称
     /// </summary>
     public const string TrackIndex = "sjzy_track_details";
-    
+
     /// <summary>
     /// 轨迹新增/更新cap订阅名称
     /// </summary>
     public const string TrackUpsertSubscribe = "SJZY.Track.Upsert";
+
+    /// <summary>
+    /// 自动推送名单RedisKey
+    /// </summary>
+    public const string AutoPushRosterRedisKey = "AutoPushRoster";
 }
\ No newline at end of file
diff --git a/src/SJZY.Track.Repository/Repositories/TrackPushConfigRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackPushConfigRepository.cs
index 9c2cb3d2..1cec950d 100644
--- a/src/SJZY.Track.Repository/Repositories/TrackPushConfigRepository.cs
+++ b/src/SJZY.Track.Repository/Repositories/TrackPushConfigRepository.cs
@@ -68,6 +68,7 @@ public class TrackPushConfigRepository : BasicRepository<TrackPushConfigEntity>,
                 CustomName = externalSubject.Abbreviation,
                 ServiceProvider = service.Name,
             }, true)
+            .Mapper(x => { x.TrackTemplateIds = x.TrackTemplateId.Split(',').Select(int.Parse).ToList(); })
             .SingleAsync();
     }