feat(轮询优先队列): AUG26-016 卡轮询优先队列、人工入队与读侧接口,归档并同步主 Spec 与证据矩阵
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 14m13s
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 14m13s
新增 000228 成对迁移 tb_polling_priority_item:卡、任务类型、状态、触发类型、来源订单/套餐使用记录、
触发次数与来源集合、尝试次数、失败原因、人工原因与操作者、店铺快照与各时间列;以活动项部分唯一索引
uq_polling_priority_item_active(仅 deleted_at IS NULL AND status IN ('pending','processing') 占键位)
表达「同卡同任务类型至多一条活动项」,另有状态/时间索引与全列注释;down 守卫在存在活动项或未终态行时
拒绝回滚并给出中文原因。
新增优先轮询请求可靠事件 polling.priority.requested(载荷版本 v1、事件键前缀 prio:)与消费者:只在原
业务事务内追加、幂等键稳定;消费者按卡 × 纳入任务类型(realname/carddata/card_status/package)逐条
建项并在提交后下发执行提示,重复投递只合并触发次数、来源集合与最近触发时间,不新建行也不重复调用。
触发点为四类自动场景 purchase_activated / renewal_activated(按同载体更早套餐使用记录判定)/
queue_activated / addon_activated 与「无有效套餐」no_valid_package(仅在普通套餐轮询来源且存在待生效
套餐使用记录时追加;事件通道显式拒绝 manual_trigger);入队对象恒为卡,绑定设备资产在触发事务内冻结
在用卡快照逐卡建项,不使用设备当前卡槽口径。
轮询共享基类新增认领接缝:四个 Handler(realname/carddata/card_status/package)在并发信号量之后、调用
上游之前探测活动项——待执行条件认领、执行中且 90 秒租约未到期则跳过并延后、无活动项时行为与既有完全
等价;超租约允许相邻执行接管,尝试次数只在真正发起执行后累加,未达上限(3)回到活动态按既有间隔重排,
达上限或业务校验类失败进入失败终态并保留可安全展示原因;执行前校验卡自身与绑定设备的轮询开关。未引入
通用卡级锁与 Redis 活动标记,分片队列的出队、入队与移除路径未改动。
提示通道按任务类型独立键(polling:priority:{taskType}),与既有手动触发队列分离;调度器在同一周期内先
排空优先提示、再排空手动触发队列,提示排空不受分片背压跳过影响;未新建调度设施或异步任务类型。
新增人工优先入队与只读查询三条路由 POST /api/admin/polling-priority-items、
GET /api/admin/polling-priority-items、GET /api/admin/polling-priority-items/:id:人工入队复用既有轮询
权限判定(抽取为同包共享函数),原因必填,不受每日 500 次上限与 24 小时去重约束,重复抑制由活动项合并
承担;读侧按店铺快照下推数据范围,越权与不存在不可区分,不提供优先级分级、有效期或人工重触发入口。
新增 7 个审计动作(enqueue/claim/fail/retry/complete/dequeue/manual_denied)与资源
polling_priority_item,并按(操作者类型,来源)注册,人工侧与 Worker 侧均通过来源校验。
同步 OpenAPI 文档装配三处与路由注册;归档 Change 至
openspec/changes/archive/2026-09-17-add-priority-polling-queue/ 并同步主 Spec(新增
priority-polling-queue、polling-operations 追加单次执行互斥 Requirement 与三条路由索引)与上下文健康
证据(requirement-evidence 150 行、入口矩阵 http 403 / async 56)。
本机验证:junhong_cmp_test 与隔离 Redis DB 15,未连生产、未启动 Worker/API、未调用运营商上游;迁移
up/down/up 与 down 守卫实测(含 dirty=true 记账口径与 force 恢复),A–F 批 94 PASS、接缝 63 PASS、
提示通道 12 PASS、清理零残留 20 PASS。成功路径 Complete、真并发互斥、尝试上限第 3 次判定、HTTP 层权限
矩阵、通道阈值持锁复机边界与三类生效触发点生产集成留待测试部署验证(见
docs/verification/add-priority-polling-queue-verification.md 第 4 节)。自动化测试按项目决策为 N/A,
未新增 *_test.go。
This commit is contained in:
@@ -6,6 +6,7 @@ import (
|
||||
"time"
|
||||
|
||||
cardObservationApp "github.com/break/junhong_cmp_fiber/internal/application/cardobservation"
|
||||
priorityapp "github.com/break/junhong_cmp_fiber/internal/application/prioritypolling"
|
||||
"github.com/break/junhong_cmp_fiber/internal/infrastructure/audit"
|
||||
"github.com/break/junhong_cmp_fiber/internal/model"
|
||||
"github.com/break/junhong_cmp_fiber/internal/store/postgres"
|
||||
@@ -32,6 +33,7 @@ type ActivationService struct {
|
||||
logger *zap.Logger
|
||||
resumeCallback ResumeCallback // 复机回调,可选
|
||||
observationSeriesEvents cardObservationApp.SeriesEventWriter
|
||||
priorityEvents priorityapp.PriorityEventWriter
|
||||
auditWriter *audit.Writer
|
||||
}
|
||||
|
||||
@@ -45,6 +47,11 @@ func (s *ActivationService) SetObservationSeriesEventWriter(writer cardObservati
|
||||
s.observationSeriesEvents = writer
|
||||
}
|
||||
|
||||
// SetPriorityEventWriter 注入套餐生效后的优先轮询请求 Outbox Writer。
|
||||
func (s *ActivationService) SetPriorityEventWriter(writer priorityapp.PriorityEventWriter) {
|
||||
s.priorityEvents = writer
|
||||
}
|
||||
|
||||
func NewActivationService(
|
||||
db *gorm.DB,
|
||||
redis *redis.Client,
|
||||
@@ -683,6 +690,13 @@ func (s *ActivationService) activatePendingUsage(ctx context.Context, tx *gorm.D
|
||||
if err := s.appendActivationObservation(ctx, tx, usage, carrierType, carrierID, now); err != nil {
|
||||
return err
|
||||
}
|
||||
// 排队主套餐顺延生效:仅 queue 来源追加优先轮询请求,specific 与 realname 来源不属于触发场景。
|
||||
if activationSource == "queue" {
|
||||
if err := AppendActivatedPriorityRequested(ctx, tx, s.priorityEvents, usage, carrierType, carrierID,
|
||||
constants.PollingPriorityTriggerQueueActivated, now); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
if err := appendPackageUsageAudit(ctx, tx, s.auditWriter, constants.AuditActionPackageUsageActivated, logMessage, []packageUsageAuditChange{{
|
||||
Usage: usage, BeforeData: beforeData, AfterData: packageUsageStateData(usage),
|
||||
}}, nil, map[string]any{"activation_source": activationSource}); err != nil {
|
||||
|
||||
163
internal/service/package/priority.go
Normal file
163
internal/service/package/priority.go
Normal file
@@ -0,0 +1,163 @@
|
||||
package packagepkg
|
||||
|
||||
import (
|
||||
"context"
|
||||
"strconv"
|
||||
"time"
|
||||
|
||||
"gorm.io/gorm"
|
||||
|
||||
priorityapp "github.com/break/junhong_cmp_fiber/internal/application/prioritypolling"
|
||||
"github.com/break/junhong_cmp_fiber/internal/model"
|
||||
"github.com/break/junhong_cmp_fiber/pkg/constants"
|
||||
"github.com/break/junhong_cmp_fiber/pkg/errors"
|
||||
)
|
||||
|
||||
// 本文件集中承载卡轮询优先队列在套餐域的两个判定与两条可靠事件写入:
|
||||
// 生效触发(新购/续购/加油包/排队顺延)与「资产无有效套餐」触发。
|
||||
// 事件 ID 命名空间与载荷形状只在本文件构造,调用点不得各自拼装,避免同一决策出现多份实现。
|
||||
|
||||
// ResolveActivationTriggerType 判定主套餐本次生效属于新购还是续购。
|
||||
// 依据是该载体在本次生效前是否存在更早的套餐使用记录,而不是当前是否存在在用主套餐:
|
||||
// 过期后续购时已无在用主套餐,用「当前在用」判定会误判为新购。
|
||||
func ResolveActivationTriggerType(ctx context.Context, tx *gorm.DB, carrierType string, carrierID, usageID uint) (string, error) {
|
||||
hasEarlier, err := HasEarlierPackageUsage(ctx, tx, carrierType, carrierID, usageID)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
if hasEarlier {
|
||||
return constants.PollingPriorityTriggerRenewalActivated, nil
|
||||
}
|
||||
return constants.PollingPriorityTriggerPurchaseActivated, nil
|
||||
}
|
||||
|
||||
// HasEarlierPackageUsage 判断该载体在本次生效前是否已存在更早的套餐使用记录。
|
||||
// 查询与本次记录同载体,并排除本次记录自身。
|
||||
func HasEarlierPackageUsage(ctx context.Context, tx *gorm.DB, carrierType string, carrierID, excludeUsageID uint) (bool, error) {
|
||||
if tx == nil || carrierID == 0 {
|
||||
return false, errors.New(errors.CodeInvalidParam, "查询更早套餐使用记录缺少载体")
|
||||
}
|
||||
query, err := filterPackageUsageByCarrier(tx.WithContext(ctx).Model(&model.PackageUsage{}), carrierType, carrierID)
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
if excludeUsageID != 0 {
|
||||
query = query.Where("id <> ?", excludeUsageID)
|
||||
}
|
||||
var count int64
|
||||
if err := query.Count(&count).Error; err != nil {
|
||||
return false, errors.Wrap(errors.CodeDatabaseError, err, "查询更早套餐使用记录失败")
|
||||
}
|
||||
return count > 0, nil
|
||||
}
|
||||
|
||||
// HasPendingPackageUsage 判断该载体是否存在待生效的套餐使用记录。
|
||||
//
|
||||
// 这是「资产无有效套餐」场景触发优先轮询的前置条件:没有待同步的生效业务时,
|
||||
// 每个普通套餐轮询周期都重新入队只会形成自激循环,因此必须以此条件收敛。
|
||||
func HasPendingPackageUsage(ctx context.Context, tx *gorm.DB, carrierType string, carrierID uint) (bool, error) {
|
||||
if tx == nil || carrierID == 0 {
|
||||
return false, errors.New(errors.CodeInvalidParam, "查询待生效套餐使用记录缺少载体")
|
||||
}
|
||||
query, err := filterPackageUsageByCarrier(tx.WithContext(ctx).Model(&model.PackageUsage{}), carrierType, carrierID)
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
var count int64
|
||||
if err := query.Where("status = ?", constants.PackageUsageStatusPending).Count(&count).Error; err != nil {
|
||||
return false, errors.Wrap(errors.CodeDatabaseError, err, "查询待生效套餐使用记录失败")
|
||||
}
|
||||
return count > 0, nil
|
||||
}
|
||||
|
||||
// AppendActivatedPriorityRequested 在套餐生效事务内追加「套餐生效」优先轮询请求。
|
||||
//
|
||||
// triggerType 只接受 purchase_activated/renewal_activated/queue_activated/addon_activated;
|
||||
// 调用点必须传入生效状态分支所在的业务事务,禁止在事务提交后另行投递。
|
||||
func AppendActivatedPriorityRequested(
|
||||
ctx context.Context,
|
||||
tx *gorm.DB,
|
||||
writer priorityapp.PriorityEventWriter,
|
||||
usage *model.PackageUsage,
|
||||
carrierType string,
|
||||
carrierID uint,
|
||||
triggerType string,
|
||||
occurredAt time.Time,
|
||||
) error {
|
||||
if writer == nil {
|
||||
return errors.New(errors.CodeInternalError, "优先轮询 Outbox Writer 未配置")
|
||||
}
|
||||
if usage == nil || usage.ID == 0 || carrierID == 0 {
|
||||
return errors.New(errors.CodeInvalidParam, "优先轮询事件缺少套餐使用记录或载体")
|
||||
}
|
||||
// 事件 ID 只承担「全局唯一 + 重投稳定」:触发类型与来源已写入事件载荷与事实行,不再重复编码,
|
||||
// 以把长度压进预算(见 constants.PollingPriorityEventKeyPrefix 的长度说明)。
|
||||
// 一条套餐使用记录的生效是单向一次性事实,因此 usage ID 本身即唯一键。
|
||||
eventID := constants.PollingPriorityEventKeyPrefix + "usage:" + strconv.FormatUint(uint64(usage.ID), 10)
|
||||
return writer.AppendPriorityRequested(ctx, tx, priorityapp.PriorityRequestedEvent{
|
||||
EventID: eventID,
|
||||
ResourceType: carrierType,
|
||||
ResourceID: carrierID,
|
||||
TriggerType: triggerType,
|
||||
SourceOrderID: usage.OrderID,
|
||||
SourcePackageUsageID: usage.ID,
|
||||
OccurredAt: occurredAt,
|
||||
RequestID: eventID,
|
||||
CorrelationID: eventID,
|
||||
})
|
||||
}
|
||||
|
||||
// AppendNoValidPackagePriorityRequested 在触发事务内追加「资产无有效套餐」优先轮询请求。
|
||||
//
|
||||
// 事件 ID 以秒级时间戳结尾:本场景在待同步业务持续存在时每个普通套餐周期重复触发,
|
||||
// 稳定键会让第二次触发起被 Outbox 去重而永久失效(如优先项已终态出队后将无法再次加急),
|
||||
// 而同一秒内的并发重复触发共享一个事件,等价于同一轮询周期的合并。
|
||||
func AppendNoValidPackagePriorityRequested(
|
||||
ctx context.Context,
|
||||
tx *gorm.DB,
|
||||
writer priorityapp.PriorityEventWriter,
|
||||
carrierType string,
|
||||
carrierID uint,
|
||||
occurredAt time.Time,
|
||||
) error {
|
||||
if writer == nil {
|
||||
return errors.New(errors.CodeInternalError, "优先轮询 Outbox Writer 未配置")
|
||||
}
|
||||
if carrierID == 0 {
|
||||
return errors.New(errors.CodeInvalidParam, "优先轮询事件缺少载体")
|
||||
}
|
||||
// 载体类型压缩为单字母代码(c-iot_card d-device):完整载体类型与资源 ID 已随事件载体与载荷传递,
|
||||
// 此处只为把长度压进预算(见 constants.PollingPriorityEventKeyPrefix 的长度说明)。
|
||||
eventID := constants.PollingPriorityEventKeyPrefix + "nvp:" + pollingPriorityCarrierCode(carrierType) + ":" +
|
||||
strconv.FormatUint(uint64(carrierID), 10) + ":" + strconv.FormatInt(occurredAt.Unix(), 10)
|
||||
return writer.AppendPriorityRequested(ctx, tx, priorityapp.PriorityRequestedEvent{
|
||||
EventID: eventID,
|
||||
ResourceType: carrierType,
|
||||
ResourceID: carrierID,
|
||||
TriggerType: constants.PollingPriorityTriggerNoValidPackage,
|
||||
OccurredAt: occurredAt,
|
||||
RequestID: eventID,
|
||||
CorrelationID: eventID,
|
||||
})
|
||||
}
|
||||
|
||||
// pollingPriorityCarrierCode 把载体类型压缩为事件 ID 中使用的单字母代码。
|
||||
func pollingPriorityCarrierCode(carrierType string) string {
|
||||
if carrierType == constants.AssetTypeDevice {
|
||||
return "d"
|
||||
}
|
||||
return "c"
|
||||
}
|
||||
|
||||
// filterPackageUsageByCarrier 按载体类型过滤套餐使用记录。
|
||||
// 载体口径与卡的有效套餐判定一致:device 查设备载体,iot_card 查卡载体。
|
||||
func filterPackageUsageByCarrier(query *gorm.DB, carrierType string, carrierID uint) (*gorm.DB, error) {
|
||||
switch carrierType {
|
||||
case constants.AssetTypeDevice:
|
||||
return query.Where("device_id = ?", carrierID), nil
|
||||
case constants.AssetTypeIotCard:
|
||||
return query.Where("iot_card_id = ?", carrierID), nil
|
||||
default:
|
||||
return nil, errors.New(errors.CodeInvalidParam, "不支持的套餐载体类型:只接受 iot_card 或 device")
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user