ideship/track
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

梳理预警通知

Browse Source
This commit is contained in:
xiaolipro 2024-09-18 10:38:32 +08:00
parent 6ed311bc1f
commit f42e2db302
18 changed files with 103 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/SJZY.Track.Domain/Dtos/Forewarning/AreaCacheEntry.cs → src/SJZY.Track.Application.Contract/Dtos/Forewarning/AreaCacheEntry.cs
View File

@ -1,4 +1,4 @@
namespace SJZY.Track.Domain.Dtos.Forewarning;
namespace SJZY.Track.Application.Contract.Dtos.Forewarning;
public class AreaCacheEntry
{

2
src/SJZY.Track.Domain/Dtos/Forewarning/ForewarningRuleCacheEntry.cs → src/SJZY.Track.Application.Contract/Dtos/Forewarning/ForewarningRuleCacheEntry.cs
View File

@ -1,4 +1,4 @@
namespace SJZY.Track.Domain.Dtos.Forewarning;
namespace SJZY.Track.Application.Contract.Dtos.Forewarning;
public class ForewarningRuleCacheEntry
{

2
src/SJZY.Track.Domain/Dtos/Forewarning/RuleAreaBaseInfo.cs → src/SJZY.Track.Application.Contract/Dtos/Forewarning/RuleAreaBaseInfo.cs
View File

@ -1,4 +1,4 @@
namespace SJZY.Track.Domain.Dtos.Forewarning;
namespace SJZY.Track.Application.Contract.Dtos.Forewarning;
public class RuleAreaBaseInfo
{

8
src/SJZY.Track.Application.Contract/Events/ClearRulCacheEvent.cs Normal file
View File

@ -0,0 +1,8 @@
using SJZY.Track.Application.Contract.Dtos.Forewarning;
namespace SJZY.Track.Application.Contract.Events;
public class ClearRulCacheEvent
{
public List<RuleAreaBaseInfo> Items { get; set; }
}

5
src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/IForewarningCacheService.cs → src/SJZY.Track.Application.Contract/Services/IForewarningCacheService.cs
View File

@ -1,6 +1,7 @@
using SJZY.Track.Domain.Dtos.Forewarning;
using SJZY.Track.Application.Contract.Dtos.Forewarning;
using SJZY.Track.Application.Contract.Events;
namespace SJZY.Track.Domain.Aggregates.ForewarningAggregate;
namespace SJZY.Track.Application.Contract.Services;
public interface IForewarningCacheService
{

5
src/SJZY.Track.Application/BackgroundServices/TrackButtonUpScanner.cs
View File

@ -23,10 +23,11 @@ public class TrackButtonUpScanner : BackgroundService
_orderRepository = orderRepository;
}
protected override Task ExecuteAsync(CancellationToken stoppingToken)
{
throw new NotImplementedException();
// 查看哪些要兜底的轨迹（服务商拉取的，且时区发生地是空的），根据子系统、服务商分组尝试兜底
// 维护轨迹明细、订单主表
return Task.CompletedTask;
}
/// <summary>

4
src/SJZY.Track.Application/HostServices/RedisHostService.cs
View File

@ -1,7 +1,7 @@
using Microsoft.Extensions.Hosting;
using SJZY.Expand.ABP.Core;
using SJZY.Track.Domain.Aggregates.ForewarningAggregate;
using SJZY.Track.Domain.Dtos.Forewarning;
using SJZY.Track.Application.Contract.Events;
using SJZY.Track.Application.Contract.Services;
namespace SJZY.Track.Application.HostServices;

3
src/SJZY.Track.Application/SJZY.Track.Application.csproj
View File

@ -9,11 +9,10 @@
<ItemGroup>
<PackageReference Include="BSI.Stack.Rabbit" Version="2.0.9" />
<PackageReference Include="SJZY.FSCenter.Client" Version="1.5.7"/>
<PackageReference Include="SJZY.InterfaceRelay.Application.Contracts" Version="7.2.3"/>
<PackageReference Include="Volo.Abp.Http.Client" Version="7.0.2" />
<PackageReference Include="Volo.Abp.FluentValidation" Version="7.0.2" />
<PackageReference Include="SJZY.UserCenter.HttpApi" Version="3.0.9-alpha"/>
<PackageReference Include="SJZY.UserCenter.HttpApi" Version="3.0.9-alpha9"/>
<PackageReference Include="SJZY.Expand.CAP" Version="7.8.0" />
<PackageReference Include="DotNetCore.CAP" Version="8.2.0"/>
<PackageReference Include="DotNetCore.CAP.Dashboard" Version="8.2.0"/>

12
src/SJZY.Track.Application/Services/ForewarningServices/ForewarningCacheService.cs
View File

@ -1,7 +1,9 @@
using System.Collections.Concurrent;
using SJZY.Expand.ABP.Core;
using SJZY.Expand.ABP.Core.PublicMethords;
using SJZY.Track.Domain.Aggregates.ForewarningAggregate;
using SJZY.Track.Application.Contract.Dtos.Forewarning;
using SJZY.Track.Application.Contract.Events;
using SJZY.Track.Application.Contract.Services;
using SJZY.Track.Domain.Aggregates.KPIAreaAggregate;
using SJZY.Track.Domain.Dtos.Forewarning;
using SJZY.Track.Domain.Queries;
@ -64,7 +66,7 @@ public class ForewarningCacheService : IForewarningCacheService, ISingletonDepen
public async Task ClearRedisByAreaId(int areaId)
{
var baseInfos = await _warningQueries.GetWarningRuleByAreaId(areaId);
if (baseInfos == null || baseInfos.Count == 0) return;
if (!baseInfos.Any()) return;
baseInfos = baseInfos.DistinctBy(val => WarningKey(val.SystemId, val.CustomerId)).ToList();
var willDelKeys = baseInfos.Select(val => WarningKey(val.SystemId, val.CustomerId)).ToArray();
@ -72,7 +74,11 @@ public class ForewarningCacheService : IForewarningCacheService, ISingletonDepen
await RedisHelper.Client.DelAsync(AreaKey(areaId));
var eventModel = new ClearRulCacheEvent
{
Items = baseInfos
Items = baseInfos.Select(x => new RuleAreaBaseInfo
{
SystemId = x.SystemId,
CustomerId = x.CustomerId
}).ToList()
};
await PublishEvent(eventModel);

119
src/SJZY.Track.Application/Services/ForewarningServices/ForewarningNotifyService.cs
View File

@ -2,9 +2,6 @@ using System.Text;
using FreeRedis;
using SJZY.Expand.ABP.Core;
using SJZY.Expand.ABP.Core.Logger;
using SJZY.FSCenter.Application.Dtos.Message;
using SJZY.FSCenter.Client.Client.Message;
using SJZY.FSCenter.Repository.Enum;
using SJZY.Track.Application.Contract.Dtos.Forewarning;
using SJZY.Track.Application.Contract.Services;
using SJZY.Track.Domain.Aggregates.ForewarningAggregate;
@ -24,23 +21,23 @@ namespace SJZY.Track.Application.Services.ForewarningServices;
/// </summary>
public class ForewarningNotifyService : IForewarningNotifyService, ITransientDependency
{
private readonly IForewarningCacheService _cacheService;
private readonly IMessageClient _messageClient;
private readonly IForewarningCacheService _forewarningCacheService;
private readonly IHttpClientProxy<IRequestSendMessageService> _requestSendMessageService;
private readonly IWarningQueries _warningQueries;
private readonly IWarningRecordEsRepository _warningRecordEsRepository;
public ForewarningNotifyService(IForewarningCacheService cacheService, IWarningQueries warningQueries,
public ForewarningNotifyService(IWarningQueries warningQueries,
IWarningRecordEsRepository warningRecordEsRepository,
IHttpClientProxy<IRequestSendMessageService> requestSendMessageService, IMessageClient messageClient)
IHttpClientProxy<IRequestSendMessageService> requestSendMessageService,
IForewarningCacheService forewarningCacheService)
{
_cacheService = cacheService;
_warningQueries = warningQueries;
_warningRecordEsRepository = warningRecordEsRepository;
_requestSendMessageService = requestSendMessageService;
_messageClient = messageClient;
_forewarningCacheService = forewarningCacheService;
}
/// <summary>
/// 创建预警通知
/// </summary>
@ -49,7 +46,7 @@ public class ForewarningNotifyService : IForewarningNotifyService, ITransientDep
{
if (dto.Orders.Count == 0) return;
var rules = await _cacheService.GetRulesAsync(dto.SubSystemId, dto.CustomerId);
var rules = await _forewarningCacheService.GetRulesAsync(dto.SubSystemId, dto.CustomerId);
if (rules == null || rules.Count == 0) return;
var adds = new List<(int ruleId, int orderId, int counter, long ts)>();
@ -134,7 +131,7 @@ public class ForewarningNotifyService : IForewarningNotifyService, ITransientDep
var warningRecords = await WriteWarningRecordAsync(entries, notifyRules);
// 发通知
await SendCoreAsync(entries, notifyRules);
await SendCoreAsync(subSystemId, entries, notifyRules);
// 移除已处理的预警
await RedisHelper.Client.ZRemRangeByScoreAsync(redisKey, 0, timestamp);
@ -169,7 +166,8 @@ public class ForewarningNotifyService : IForewarningNotifyService, ITransientDep
return warningRecords;
}
private Task SendCoreAsync(List<WarningNotifyCacheEntry> entries, List<GetWarningNotifiesVo> notifyRules)
private Task SendCoreAsync(int subSystemId, List<WarningNotifyCacheEntry> entries,
List<GetWarningNotifiesVo> notifyRules)
{
var userRules = new Dictionary<int, List<GetWarningNotifiesVo>>();
foreach (var rule in notifyRules)
@ -187,64 +185,10 @@ public class ForewarningNotifyService : IForewarningNotifyService, ITransientDep
foreach (var userRule in userRules)
{
var siteInternalContent = BuildNotifyContent(userRule.Value, entries, NotifyMode.SiteInternal);
var feiShuContent = BuildNotifyContent(userRule.Value, entries, NotifyMode.FeiShu);
if (!string.IsNullOrEmpty(siteInternalContent))
{
_ = Task.Run(async () =>
{
// todo：发送站内通知
var res = await _requestSendMessageService.Service.SendMessageByEmptyTemplateAsync(
new SendMessageByEmptyTemplateInput
{
IsNeedToHandle = null,
BizId = null,
MsgSource = null,
SystemId = 0,
TemplateCode = null,
Channels = null,
MsgTitle = null,
MsgContent = null,
PcURl = null,
MobileURl = null,
FileUrl = null,
fileName = null,
receivers = null,
SiteLetterComponentStyle = (ComponentStyle) 0
});
if (res.Code != GlobalConst.SuccessCode)
{
LogHelper.Error($"发送站内通知失败，用户：{userRule.Key}，内容：{siteInternalContent}");
}
});
}
if (!string.IsNullOrEmpty(feiShuContent))
{
_ = Task.Run(async () =>
{
// 发送飞书通知
var res = await _messageClient.SendMessageAsync(new SendMessageInput
{
AppId = null,
AppSecret = null,
ReceiveIdType = IdTypeEnums.user_id,
MsgType = MsgTypeEnums.文本,
ReceiveIds = new List<string>
{
userRule.Key.ToString()
},
Content = feiShuContent
});
if (res.Code != GlobalConst.SuccessCode)
{
LogHelper.Error($"发送飞书通知失败，用户：{userRule.Key}，内容：{feiShuContent}");
}
});
}
// 以人的维度发送通知，异步
_ = DoNotifyAsync(subSystemId, userRule.Key, userRule.Value, entries,
NotifyMode.SiteInternal);
_ = DoNotifyAsync(subSystemId, userRule.Key, userRule.Value, entries, NotifyMode.FeiShu);
}
return Task.CompletedTask;
@ -253,7 +197,8 @@ public class ForewarningNotifyService : IForewarningNotifyService, ITransientDep
private string GetForewarningNotifySetKeyRedisKey(int subSystemId) =>
$"{GlobalConst.ForewarningNotifySetKey}:{subSystemId}";
private string BuildNotifyContent(List<GetWarningNotifiesVo> rules, List<WarningNotifyCacheEntry> entries,
private async Task DoNotifyAsync(int subSystemId, int userId, List<GetWarningNotifiesVo> rules,
List<WarningNotifyCacheEntry> entries,
NotifyMode mode)
{
/* 以人的维度发送通知
@ -283,7 +228,37 @@ public class ForewarningNotifyService : IForewarningNotifyService, ITransientDep
}
}
return notifyContent.ToString();
var msgContent = notifyContent.ToString();
if (string.IsNullOrEmpty(msgContent)) return;
var res = await _requestSendMessageService.Service.SendMessageByEmptyTemplateAsync(
new SendMessageByEmptyTemplateInput
{
IsNeedToHandle = true,
MsgSource = MsgSourceEnum.系统提醒,
SystemId = subSystemId,
TemplateCode = "trackWarning",
Channels = new List<ChannelEnum>()
{
mode == NotifyMode.FeiShu ? ChannelEnum.飞书 : ChannelEnum.站内信,
},
MsgTitle = "轨迹运输时效预警",
MsgContent = msgContent,
receivers = new List<MsgInstanceReceiverInput>
{
new()
{
RecipientType = 1,
ReceiverId = userId,
}
},
});
if (res.Code != GlobalConst.SuccessCode)
{
LogHelper.Error($"发送{mode.ToString()}通知失败，用户：{userId}，内容：{msgContent}");
}
}
private static List<ForewarningRuleCacheEntry> MatchRule(List<ForewarningRuleCacheEntry> rules,

2
src/SJZY.Track.Application/Services/ForewarningServices/ForewarningService.cs
View File

@ -1,5 +1,6 @@
using System.ComponentModel.DataAnnotations;
using SJZY.Track.Application.Contract.Dtos.Forewarning;
using SJZY.Track.Application.Contract.Services;
using SJZY.Track.Application.Helpers;
using SJZY.Track.Domain.Aggregates.ForewarningAggregate;
using SJZY.Track.Domain.Aggregates.TrackStatusAggregate;
@ -22,7 +23,6 @@ public class ForewarningService : ApplicationService
_forewarningCacheService = forewarningCacheService;
}
/// <summary>
/// 获取预警分页列表
/// </summary>

2
src/SJZY.Track.Application/Services/ForewarningServices/KpiAreaService.cs
View File

@ -1,4 +1,4 @@
using SJZY.Track.Domain.Aggregates.ForewarningAggregate;
using SJZY.Track.Application.Contract.Services;
using SJZY.Track.Domain.Aggregates.KPIAreaAggregate;
using SJZY.Track.Domain.Dtos.Forewarning;

9
src/SJZY.Track.Application/SjzyTrackApplicationModule.cs
View File

@ -7,8 +7,8 @@ using Savorboard.CAP.InMemoryMessageQueue;
using SJZY.Expand.ABP.Core.Localization;
using SJZY.Expand.ABP.Core.Logger;
using SJZY.Expand.ABP.Core.PublicMethords;
using SJZY.FSCenter.Client;
using SJZY.InterfaceRelay.Application.Contracts;
using SJZY.Track.Application.BackgroundServices;
using SJZY.Track.Application.CAP;
using SJZY.Track.Application.Contract;
using SJZY.Track.Application.Localization;
@ -35,8 +35,7 @@ namespace SJZY.Track.Application;
typeof(SjzyUserCenterHttpApiModule),
typeof(SJZYInterfaceRelayApplicationContractsModule),
typeof(SjzyTrackDomainModule),
typeof(SjzyTrackApplicationContractModule),
typeof(FSCenterModule)
typeof(SjzyTrackApplicationContractModule)
)]
public class SjzyTrackApplicationModule : AbpModule
{
@ -152,8 +151,8 @@ public class SjzyTrackApplicationModule : AbpModule
};
}, typeof(SjzyTrackApplicationModule).Assembly);
// 飞书
context.Services.Configure<SystemKeyOption>(option => { option.SystemKey = "aaa"; });
context.Services.AddHostedService<OrderPullStatusScanner>();
context.Services.AddHostedService<TrackButtonUpScanner>();
}
public override void PreConfigureServices(ServiceConfigurationContext context)

6
src/SJZY.Track.Domain/Dtos/Forewarning/ClearRulCacheEvent.cs
View File

@ -1,6 +0,0 @@
namespace SJZY.Track.Domain.Dtos.Forewarning;
public class ClearRulCacheEvent
{
public List<RuleAreaBaseInfo> Items { get; set; }
}

17
src/SJZY.Track.Domain/Dtos/Forewarning/RuleAreaBaseInfoVo.cs Normal file
View File

@ -0,0 +1,17 @@
namespace SJZY.Track.Domain.Dtos.Forewarning;
public class RuleAreaBaseInfoVo
{
public RuleAreaBaseInfoVo()
{
}
public RuleAreaBaseInfoVo(int systemId, int customerId)
{
SystemId = systemId;
CustomerId = customerId;
}
public int SystemId { get; set; }
public int CustomerId { get; set; }
}

2
src/SJZY.Track.Domain/Queries/IWarningQueries.cs
View File

@ -23,5 +23,5 @@ public interface IWarningQueries
/// </summary>
/// <param name="areaId"></param>
/// <returns></returns>
Task<List<RuleAreaBaseInfo>?> GetWarningRuleByAreaId(int areaId);
Task<List<RuleAreaBaseInfoVo>> GetWarningRuleByAreaId(int areaId);
}

4
src/SJZY.Track.Repository/Queries/WarningQueries.cs
View File

@ -79,12 +79,12 @@ public class WarningQueries : ISugarRepository, IWarningQueries,
.ToListAsync();
}
public Task<List<RuleAreaBaseInfo>?> GetWarningRuleByAreaId(int areaId)
public Task<List<RuleAreaBaseInfoVo>> GetWarningRuleByAreaId(int areaId)
{
return Context.Queryable<WarningRuleEntity>()
.InnerJoin<WarningEntity>((a, b) => a.WarningId == b.Id)
.Where((a, b) => b.IsEnable && a.AreaId == areaId)
.Select((a, b) => new RuleAreaBaseInfo
.Select((a, b) => new RuleAreaBaseInfoVo
{
CustomerId = b.CustomerId,
SystemId = b.SubSystemId

2
src/SJZY.Track.Repository/SJZY.Track.Repository.csproj
View File

@ -10,7 +10,7 @@
<PackageReference Include="SJZY.LoggerCenter.HttpApi" Version="7.0.5" />
<PackageReference Include="SJZY.OTel.Extension" Version="1.0.4"/>
<PackageReference Include="Volo.Abp.Autofac" Version="7.0.2" />
<PackageReference Include="SJZY.UserCenter.HttpApi" Version="3.0.9-alpha"/>
<PackageReference Include="SJZY.UserCenter.HttpApi" Version="3.0.9-alpha9"/>
<PackageReference Include="SJZY.Expand.CAP" Version="7.8.0" />
</ItemGroup>