All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 9m46s
【核心变更】
1. 停复机逻辑统一(StopResumeService)
- 新增 EvaluateAndAct 统一入口,封装三条件停复机判断
- 停机条件:无套餐(no_package) / 流量耗尽(traffic_exhausted) / 未实名(not_realname)
- 复机条件:stop_reason 合规 + 有套餐且未耗尽 + 已实名或行业卡
- 修复设备套餐 Bug:hasValidPackage 按 device_id 查套餐,而非仅 iot_card_id
- 设备维度停复机加幂等锁(Redis SetNX,TTL 30s),防止多卡并发重复调 Gateway
2. Redis 分片队列(PollingQueueManager)
- 新建 queue_manager.go,封装所有轮询 Redis 操作
- 16 分片 Sorted Set,Key 格式:polling:shard:{shardID}:queue:{taskType}
- Lua 脚本原子出队(ZRANGEBYSCORE + 分批 ZREM),消除竞态窗口
- 新增背压检测:队列深度超 50 万时 Scheduler 跳过该分片
- RemoveFromAllQueues 覆盖 4 种任务类型(含 protect)
3. Handler 拆分(polling_handler.go 1360行 → 5个专注文件)
- polling_base.go:共享基类(并发控制/卡缓存/重入队)
- polling_realname_handler.go:实名采集,实名 0→1 时立即触发复机
- polling_carddata_handler.go:流量采集,保留跨月边界检测逻辑
- polling_package_handler.go:套餐采集,委托 EvaluateAndAct 决策
- polling_protect_handler.go:保护期一致性检查,保护期内强制修正
4. 配置管理(PollingConfigManager)
- 新建 config_manager.go,从 scheduler.go 提取配置职责
- 内存缓存 + 5 分钟定时刷新,刷新失败保留原缓存
- 修复 getCardCondition:停机卡返回 suspended,不再错配 activated 配置
5. 渐进式初始化(CardInitializer)
- 新建 initializer.go,分批加载(每批 10 万),批次间 sleep 500ms
- 过滤 enable_polling=false 的卡,初始化完成前 Scheduler 不出队
6. 卡生命周期服务(PollingLifecycleService)
- 新建 lifecycle_service.go,替代已删除的 callbacks.go 和 api_callback.go
- OnCardCreated/OnCardEnabled/OnCardStatusChanged 入队前检查 enable_polling
7. Scheduler 精简(1000+行 → 227行)
- 保留纯调度循环:scheduleLoop + processShardSchedule + enqueueBatch
- 保留每 10 秒触发套餐过期检测和流量重置
- 移除所有 DB 操作、配置加载、卡初始化逻辑
8. 轮询管控 API(enable_polling)
- 新增 PUT /api/admin/assets/:id/polling-status 接口
- 支持对设备/卡维度开关轮询,关闭后从所有分片队列移除
9. 数据库迁移
- 000103:tb_device 新增 enable_polling 字段(boolean, NOT NULL, DEFAULT true)
- 000104:新增 suspended 轮询配置,为 activated 配置补全 protect_check_interval
【文件统计】
- 新增:19 个文件(handler × 5、polling 组件 × 4、迁移 × 3 等)
- 修改:20 个文件(bootstrap 注入、store 接口、monitoring 适配分片等)
- 删除:3 个文件(polling_handler.go、callbacks.go、api_callback.go)
Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)
Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
308 lines
8.6 KiB
Go
308 lines
8.6 KiB
Go
package admin
|
|
|
|
import (
|
|
"github.com/gofiber/fiber/v2"
|
|
|
|
"github.com/break/junhong_cmp_fiber/internal/model"
|
|
"github.com/break/junhong_cmp_fiber/internal/model/dto"
|
|
"github.com/break/junhong_cmp_fiber/internal/service/polling"
|
|
"github.com/break/junhong_cmp_fiber/pkg/constants"
|
|
"github.com/break/junhong_cmp_fiber/pkg/errors"
|
|
"github.com/break/junhong_cmp_fiber/pkg/middleware"
|
|
"github.com/break/junhong_cmp_fiber/pkg/response"
|
|
)
|
|
|
|
// PollingManualTriggerHandler 轮询手动触发处理器
|
|
type PollingManualTriggerHandler struct {
|
|
service *polling.ManualTriggerService
|
|
}
|
|
|
|
// NewPollingManualTriggerHandler 创建轮询手动触发处理器
|
|
func NewPollingManualTriggerHandler(service *polling.ManualTriggerService) *PollingManualTriggerHandler {
|
|
return &PollingManualTriggerHandler{service: service}
|
|
}
|
|
|
|
// TriggerSingle 单卡手动触发
|
|
// @Summary 单卡手动触发
|
|
// @Description 触发单张卡的轮询任务
|
|
// @Tags 轮询管理-手动触发
|
|
// @Accept json
|
|
// @Produce json
|
|
// @Security BearerAuth
|
|
// @Param request body dto.TriggerSingleReq true "触发请求"
|
|
// @Success 200 {object} response.Response
|
|
// @Router /api/admin/polling-manual-trigger/single [post]
|
|
func (h *PollingManualTriggerHandler) TriggerSingle(c *fiber.Ctx) error {
|
|
ctx := c.UserContext()
|
|
|
|
var req dto.TriggerSingleReq
|
|
if err := c.BodyParser(&req); err != nil {
|
|
return errors.New(errors.CodeInvalidParam)
|
|
}
|
|
|
|
userID := middleware.GetUserIDFromContext(ctx)
|
|
if userID == 0 {
|
|
return errors.New(errors.CodeUnauthorized)
|
|
}
|
|
|
|
if err := h.service.TriggerSingle(ctx, req.CardID, req.TaskType, userID); err != nil {
|
|
return err
|
|
}
|
|
|
|
return response.Success(c, nil)
|
|
}
|
|
|
|
// TriggerBatch 批量手动触发
|
|
// @Summary 批量手动触发
|
|
// @Description 批量触发多张卡的轮询任务
|
|
// @Tags 轮询管理-手动触发
|
|
// @Accept json
|
|
// @Produce json
|
|
// @Security BearerAuth
|
|
// @Param request body dto.TriggerBatchReq true "触发请求"
|
|
// @Success 200 {object} response.Response{data=dto.ManualTriggerLogResp}
|
|
// @Router /api/admin/polling-manual-trigger/batch [post]
|
|
func (h *PollingManualTriggerHandler) TriggerBatch(c *fiber.Ctx) error {
|
|
ctx := c.UserContext()
|
|
|
|
var req dto.TriggerBatchReq
|
|
if err := c.BodyParser(&req); err != nil {
|
|
return errors.New(errors.CodeInvalidParam)
|
|
}
|
|
|
|
userID := middleware.GetUserIDFromContext(ctx)
|
|
if userID == 0 {
|
|
return errors.New(errors.CodeUnauthorized)
|
|
}
|
|
|
|
log, err := h.service.TriggerBatch(ctx, req.CardIDs, req.TaskType, userID)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
return response.Success(c, h.toLogResp(log))
|
|
}
|
|
|
|
// TriggerByCondition 条件筛选触发
|
|
// @Summary 条件筛选触发
|
|
// @Description 根据条件筛选卡并触发轮询任务
|
|
// @Tags 轮询管理-手动触发
|
|
// @Accept json
|
|
// @Produce json
|
|
// @Security BearerAuth
|
|
// @Param request body dto.TriggerByConditionReq true "触发请求"
|
|
// @Success 200 {object} response.Response{data=dto.ManualTriggerLogResp}
|
|
// @Router /api/admin/polling-manual-trigger/by-condition [post]
|
|
func (h *PollingManualTriggerHandler) TriggerByCondition(c *fiber.Ctx) error {
|
|
ctx := c.UserContext()
|
|
|
|
var req dto.TriggerByConditionReq
|
|
if err := c.BodyParser(&req); err != nil {
|
|
return errors.New(errors.CodeInvalidParam)
|
|
}
|
|
|
|
userID := middleware.GetUserIDFromContext(ctx)
|
|
if userID == 0 {
|
|
return errors.New(errors.CodeUnauthorized)
|
|
}
|
|
|
|
filter := &polling.ConditionFilter{
|
|
CardStatus: req.CardStatus,
|
|
CarrierCode: req.CarrierCode,
|
|
CardType: req.CardType,
|
|
ShopID: req.ShopID,
|
|
PackageIDs: req.PackageIDs,
|
|
EnablePolling: req.EnablePolling,
|
|
Limit: req.Limit,
|
|
}
|
|
|
|
log, err := h.service.TriggerByCondition(ctx, filter, req.TaskType, userID)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
return response.Success(c, h.toLogResp(log))
|
|
}
|
|
|
|
// GetStatus 获取触发状态
|
|
// @Summary 获取手动触发状态
|
|
// @Description 获取当前用户的手动触发状态
|
|
// @Tags 轮询管理-手动触发
|
|
// @Accept json
|
|
// @Produce json
|
|
// @Security BearerAuth
|
|
// @Success 200 {object} response.Response{data=dto.ManualTriggerStatusResp}
|
|
// @Router /api/admin/polling-manual-trigger/status [get]
|
|
func (h *PollingManualTriggerHandler) GetStatus(c *fiber.Ctx) error {
|
|
ctx := c.UserContext()
|
|
|
|
userID := middleware.GetUserIDFromContext(ctx)
|
|
if userID == 0 {
|
|
return errors.New(errors.CodeUnauthorized)
|
|
}
|
|
|
|
// 获取正在运行的任务
|
|
runningTasks, err := h.service.GetRunningTasks(ctx, userID)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
items := make([]*dto.ManualTriggerLogResp, 0, len(runningTasks))
|
|
for _, log := range runningTasks {
|
|
items = append(items, h.toLogResp(log))
|
|
}
|
|
|
|
queueSizes := make(map[string]int64)
|
|
for _, taskType := range []string{
|
|
constants.TaskTypePollingRealname,
|
|
constants.TaskTypePollingCarddata,
|
|
constants.TaskTypePollingPackage,
|
|
constants.TaskTypePollingProtect,
|
|
} {
|
|
size, _ := h.service.GetQueueSize(ctx, taskType)
|
|
queueSizes[taskType] = size
|
|
}
|
|
|
|
return response.Success(c, &dto.ManualTriggerStatusResp{
|
|
RunningTasks: items,
|
|
QueueSizes: queueSizes,
|
|
})
|
|
}
|
|
|
|
// ListHistory 获取触发历史
|
|
// @Summary 获取手动触发历史
|
|
// @Description 获取手动触发历史记录
|
|
// @Tags 轮询管理-手动触发
|
|
// @Accept json
|
|
// @Produce json
|
|
// @Security BearerAuth
|
|
// @Param task_type query string false "任务类型筛选"
|
|
// @Param page query int false "页码"
|
|
// @Param page_size query int false "每页数量"
|
|
// @Success 200 {object} response.Response{data=dto.ManualTriggerLogListResp}
|
|
// @Router /api/admin/polling-manual-trigger/history [get]
|
|
func (h *PollingManualTriggerHandler) ListHistory(c *fiber.Ctx) error {
|
|
ctx := c.UserContext()
|
|
|
|
var req dto.ListManualTriggerLogReq
|
|
if err := c.QueryParser(&req); err != nil {
|
|
return errors.New(errors.CodeInvalidParam)
|
|
}
|
|
|
|
if req.Page < 1 {
|
|
req.Page = 1
|
|
}
|
|
if req.PageSize < 1 || req.PageSize > 100 {
|
|
req.PageSize = 20
|
|
}
|
|
|
|
logs, total, err := h.service.ListHistory(ctx, req.Page, req.PageSize, req.TaskType, nil)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
items := make([]*dto.ManualTriggerLogResp, 0, len(logs))
|
|
for _, log := range logs {
|
|
items = append(items, h.toLogResp(log))
|
|
}
|
|
|
|
return response.Success(c, &dto.ManualTriggerLogListResp{
|
|
Items: items,
|
|
Total: total,
|
|
Page: req.Page,
|
|
PageSize: req.PageSize,
|
|
})
|
|
}
|
|
|
|
// CancelTrigger 取消触发任务
|
|
// @Summary 取消手动触发任务
|
|
// @Description 取消正在执行的手动触发任务
|
|
// @Tags 轮询管理-手动触发
|
|
// @Accept json
|
|
// @Produce json
|
|
// @Security BearerAuth
|
|
// @Param request body dto.CancelTriggerReq true "取消请求"
|
|
// @Success 200 {object} response.Response
|
|
// @Router /api/admin/polling-manual-trigger/cancel [post]
|
|
func (h *PollingManualTriggerHandler) CancelTrigger(c *fiber.Ctx) error {
|
|
ctx := c.UserContext()
|
|
|
|
var req dto.CancelTriggerReq
|
|
if err := c.BodyParser(&req); err != nil {
|
|
return errors.New(errors.CodeInvalidParam)
|
|
}
|
|
|
|
userID := middleware.GetUserIDFromContext(ctx)
|
|
if userID == 0 {
|
|
return errors.New(errors.CodeUnauthorized)
|
|
}
|
|
|
|
if err := h.service.CancelTrigger(ctx, req.TriggerID, userID); err != nil {
|
|
return err
|
|
}
|
|
|
|
return response.Success(c, nil)
|
|
}
|
|
|
|
func (h *PollingManualTriggerHandler) toLogResp(log *model.PollingManualTriggerLog) *dto.ManualTriggerLogResp {
|
|
return &dto.ManualTriggerLogResp{
|
|
ID: log.ID,
|
|
TaskType: log.TaskType,
|
|
TaskTypeName: h.getTaskTypeName(log.TaskType),
|
|
TriggerType: log.TriggerType,
|
|
TriggerTypeName: h.getTriggerTypeName(log.TriggerType),
|
|
TotalCount: log.TotalCount,
|
|
ProcessedCount: log.ProcessedCount,
|
|
SuccessCount: log.SuccessCount,
|
|
FailedCount: log.FailedCount,
|
|
Status: log.Status,
|
|
StatusName: h.getStatusName(log.Status),
|
|
TriggeredBy: log.TriggeredBy,
|
|
TriggeredAt: log.TriggeredAt,
|
|
CompletedAt: log.CompletedAt,
|
|
}
|
|
}
|
|
|
|
func (h *PollingManualTriggerHandler) getTaskTypeName(taskType string) string {
|
|
switch taskType {
|
|
case constants.TaskTypePollingRealname:
|
|
return "实名检查"
|
|
case constants.TaskTypePollingCarddata:
|
|
return "流量检查"
|
|
case constants.TaskTypePollingPackage:
|
|
return "套餐检查"
|
|
case constants.TaskTypePollingProtect:
|
|
return "保护期检查"
|
|
default:
|
|
return taskType
|
|
}
|
|
}
|
|
|
|
func (h *PollingManualTriggerHandler) getTriggerTypeName(triggerType string) string {
|
|
switch triggerType {
|
|
case "single":
|
|
return "单卡触发"
|
|
case "batch":
|
|
return "批量触发"
|
|
case "by_condition":
|
|
return "条件筛选"
|
|
default:
|
|
return triggerType
|
|
}
|
|
}
|
|
|
|
func (h *PollingManualTriggerHandler) getStatusName(status string) string {
|
|
switch status {
|
|
case "pending":
|
|
return "待处理"
|
|
case "processing":
|
|
return "处理中"
|
|
case "completed":
|
|
return "已完成"
|
|
case "cancelled":
|
|
return "已取消"
|
|
default:
|
|
return status
|
|
}
|
|
}
|