feat: 轮询系统重构（分片队列 + 停复机统一 + Handler 拆分）

【核心变更】 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>
2026-04-07 12:27:04 +08:00
parent 10fcc0b3c9
commit 434a8b0349
62 changed files with 7496 additions and 3023 deletions
--- a/internal/bootstrap/handlers.go
+++ b/internal/bootstrap/handlers.go
@@ -5,8 +5,11 @@ import (
 	"github.com/break/junhong_cmp_fiber/internal/handler/app"
 	authHandler "github.com/break/junhong_cmp_fiber/internal/handler/auth"
 	"github.com/break/junhong_cmp_fiber/internal/handler/callback"
+	pollingPkg "github.com/break/junhong_cmp_fiber/internal/polling"
 	clientOrderSvc "github.com/break/junhong_cmp_fiber/internal/service/client_order"
+	pollingSvcPkg "github.com/break/junhong_cmp_fiber/internal/service/polling"
 	"github.com/break/junhong_cmp_fiber/internal/store/postgres"
+	"github.com/break/junhong_cmp_fiber/pkg/constants"
 	"github.com/go-playground/validator/v10"
 )

@@ -91,11 +94,15 @@ func initHandlers(svc *services, deps *Dependencies) *Handlers {
 		PollingAlert:                admin.NewPollingAlertHandler(svc.PollingAlert),
 		PollingCleanup:              admin.NewPollingCleanupHandler(svc.PollingCleanup),
 		PollingManualTrigger:        admin.NewPollingManualTriggerHandler(svc.PollingManualTrigger),
-		Asset:                       admin.NewAssetHandler(svc.Asset, svc.Device, svc.StopResumeService),
-		AssetLifecycle:              admin.NewAssetLifecycleHandler(svc.AssetLifecycle),
-		AssetWallet:                 admin.NewAssetWalletHandler(svc.AssetWallet),
-		WechatConfig:                admin.NewWechatConfigHandler(svc.WechatConfig),
-		AgentRecharge:               admin.NewAgentRechargeHandler(svc.AgentRecharge, validate),
-		Refund:                      admin.NewRefundHandler(svc.Refund),
+		Asset: func() *admin.AssetHandler {
+			pollingQueueMgr := pollingPkg.NewPollingQueueManager(deps.Redis, constants.PollingShardCount, deps.Logger)
+			assetPollingSvc := pollingSvcPkg.NewAssetPollingService(deviceStore, deviceSimBindingStore, svc.IotCard, pollingQueueMgr, deps.Logger)
+			return admin.NewAssetHandler(svc.Asset, svc.Device, svc.StopResumeService, assetPollingSvc)
+		}(),
+		AssetLifecycle: admin.NewAssetLifecycleHandler(svc.AssetLifecycle),
+		AssetWallet:    admin.NewAssetWalletHandler(svc.AssetWallet),
+		WechatConfig:   admin.NewWechatConfigHandler(svc.WechatConfig),
+		AgentRecharge:  admin.NewAgentRechargeHandler(svc.AgentRecharge, validate),
+		Refund:         admin.NewRefundHandler(svc.Refund),
 	}
 }
--- a/internal/bootstrap/services.go
+++ b/internal/bootstrap/services.go
@@ -12,6 +12,8 @@ import (
 	commissionStatsSvc "github.com/break/junhong_cmp_fiber/internal/service/commission_stats"
 	commissionWithdrawalSvc "github.com/break/junhong_cmp_fiber/internal/service/commission_withdrawal"
 	commissionWithdrawalSettingSvc "github.com/break/junhong_cmp_fiber/internal/service/commission_withdrawal_setting"
+	"github.com/break/junhong_cmp_fiber/internal/store/postgres"
+	"github.com/break/junhong_cmp_fiber/pkg/constants"

 	assetSvc "github.com/break/junhong_cmp_fiber/internal/service/asset"
 	assetWalletSvc "github.com/break/junhong_cmp_fiber/internal/service/asset_wallet"
@@ -105,7 +107,11 @@ func initServices(s *stores, deps *Dependencies) *services {

 	// 创建 IotCard service 并设置回调
 	iotCard := iotCardSvc.New(deps.DB, s.IotCard, s.Shop, s.AssetAllocationRecord, s.ShopPackageAllocation, s.ShopSeriesAllocation, s.PackageSeries, deps.GatewayClient, deps.Logger)
-	iotCard.SetPollingCallback(polling.NewAPICallback(deps.Redis, deps.Logger))
+	// 使用 PollingLifecycleService 替代 APICallback：通过分片队列准确操作（修复 api_callback.go 遗漏 protect 队列的 Bug3）
+	pollingConfigStore := postgres.NewPollingConfigStore(deps.DB)
+	pollingConfigMgr := polling.NewPollingConfigManager(pollingConfigStore, deps.Redis, deps.Logger)
+	pollingQueueMgr := polling.NewPollingQueueManager(deps.Redis, constants.PollingShardCount, deps.Logger)
+	iotCard.SetPollingCallback(polling.NewPollingLifecycleService(pollingQueueMgr, pollingConfigMgr, s.IotCard, s.DeviceSimBinding, s.Device, deps.Logger))
 	// 注入流量扣减回调，使手动刷新资产时能触发套餐流量扣减
 	usageService := packageSvc.NewUsageService(deps.DB, deps.Redis, s.PackageUsage, s.PackageUsageDailyRecord, s.DeviceSimBinding, deps.Logger)
 	iotCard.SetDataDeductor(usageService)
@@ -122,7 +128,7 @@ func initServices(s *stores, deps *Dependencies) *services {
 		deps.Logger,
 	)

-	stopResumeService := iotCardSvc.NewStopResumeService(deps.DB, deps.Redis, s.IotCard, s.DeviceSimBinding, deps.GatewayClient, deps.Logger)
+	stopResumeService := iotCardSvc.NewStopResumeService(deps.Redis, s.IotCard, s.PackageUsage, s.DeviceSimBinding, deps.GatewayClient, deps.Logger)
 	device := deviceSvc.New(deps.DB, deps.Redis, s.Device, s.DeviceSimBinding, s.IotCard, s.Shop, s.AssetAllocationRecord, s.ShopPackageAllocation, s.ShopSeriesAllocation, s.PackageSeries, deps.GatewayClient)

 	return &services{
--- a/internal/bootstrap/worker_services.go
+++ b/internal/bootstrap/worker_services.go
@@ -103,7 +103,7 @@ func initWorkerServices(stores *queue.WorkerStores, deps *WorkerDependencies) *q
 	)

 	// 创建停复机服务并注入回调：流量耗尽自动停机、套餐激活/重置/支付后自动复机
-	stopResumeService := iotCardSvc.NewStopResumeService(deps.DB, deps.Redis, stores.IotCard, stores.DeviceSimBinding, deps.GatewayClient, deps.Logger)
+	stopResumeService := iotCardSvc.NewStopResumeService(deps.Redis, stores.IotCard, stores.PackageUsage, stores.DeviceSimBinding, deps.GatewayClient, deps.Logger)
 	usageService.SetStopResumeCallback(stopResumeService)
 	activationService.SetResumeCallback(stopResumeService)
 	orderService.SetResumeCallback(stopResumeService)
--- a/internal/handler/admin/asset.go
+++ b/internal/handler/admin/asset.go
@@ -5,9 +5,11 @@ import (

 	"github.com/gofiber/fiber/v2"

+	dto "github.com/break/junhong_cmp_fiber/internal/model/dto"
 	assetService "github.com/break/junhong_cmp_fiber/internal/service/asset"
 	deviceService "github.com/break/junhong_cmp_fiber/internal/service/device"
 	iotCardService "github.com/break/junhong_cmp_fiber/internal/service/iot_card"
+	pollingSvc "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"
@@ -15,11 +17,12 @@ import (
 )

 // AssetHandler 资产管理处理器
-// 提供统一的资产解析、实时状态、套餐查询、停复机等接口
+// 提供统一的资产解析、实时状态、套餐查询、停复机、轮询管控等接口
 type AssetHandler struct {
 	assetService      *assetService.Service
 	deviceService     *deviceService.Service
 	iotCardStopResume *iotCardService.StopResumeService
+	assetPolling      *pollingSvc.AssetPollingService
 }

 // NewAssetHandler 创建资产管理处理器
@@ -27,11 +30,13 @@ func NewAssetHandler(
 	assetSvc *assetService.Service,
 	deviceSvc *deviceService.Service,
 	iotCardStopResume *iotCardService.StopResumeService,
+	assetPolling *pollingSvc.AssetPollingService,
 ) *AssetHandler {
 	return &AssetHandler{
 		assetService:      assetSvc,
 		deviceService:     deviceSvc,
 		iotCardStopResume: iotCardStopResume,
+		assetPolling:      assetPolling,
 	}
 }

@@ -187,3 +192,40 @@ func (h *AssetHandler) StartCard(c *fiber.Ctx) error {

 	return response.Success(c, nil)
 }
+
+// UpdatePollingStatus 更新资产轮询状态
+// PATCH /api/admin/assets/:asset_type/:id/polling-status
+func (h *AssetHandler) UpdatePollingStatus(c *fiber.Ctx) error {
+	assetType := c.Params("asset_type")
+	idStr := c.Params("id")
+
+	if assetType == "" || idStr == "" {
+		return errors.New(errors.CodeInvalidParam)
+	}
+
+	id, err := strconv.ParseUint(idStr, 10, 64)
+	if err != nil {
+		return errors.New(errors.CodeInvalidParam)
+	}
+
+	var req dto.UpdateAssetPollingStatusRequest
+	if err := c.BodyParser(&req); err != nil {
+		return errors.New(errors.CodeInvalidParam)
+	}
+
+	_ = middleware.GetUserIDFromContext(c.UserContext())
+
+	if h.assetPolling == nil {
+		return errors.New(errors.CodeInternalError, "轮询管控服务未配置")
+	}
+
+	if err := h.assetPolling.UpdatePollingStatus(c.UserContext(), assetType, uint(id), req.EnablePolling); err != nil {
+		return err
+	}
+
+	return response.Success(c, &dto.UpdateAssetPollingStatusResponse{
+		AssetType:     assetType,
+		AssetID:       uint(id),
+		EnablePolling: req.EnablePolling,
+	})
+}
--- a/internal/handler/admin/polling_manual_trigger.go
+++ b/internal/handler/admin/polling_manual_trigger.go
@@ -152,12 +152,12 @@ func (h *PollingManualTriggerHandler) GetStatus(c *fiber.Ctx) error {
 		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
@@ -271,6 +271,8 @@ func (h *PollingManualTriggerHandler) getTaskTypeName(taskType string) string {
 		return "流量检查"
 	case constants.TaskTypePollingPackage:
 		return "套餐检查"
+	case constants.TaskTypePollingProtect:
+		return "保护期检查"
 	default:
 		return taskType
 	}
--- a/internal/model/device.go
+++ b/internal/model/device.go
@@ -37,6 +37,8 @@ type Device struct {
 	FirstRechargeTriggeredBySeriesJSON string     `gorm:"column:first_recharge_triggered_by_series;type:jsonb;default:'{}';comment:按套餐系列追踪的首充触发状态" json:"-"`
 	AssetStatus                        int        `gorm:"column:asset_status;type:int;not null;default:1;comment:业务状态 1-在库 2-已销售 3-已换货 4-已停用" json:"asset_status"`
 	Generation                         int        `gorm:"column:generation;type:int;not null;default:1;comment:资产世代编号" json:"generation"`
+	// EnablePolling 是否参与轮询，false 时设备下所有卡不加入轮询队列
+	EnablePolling                       bool       `gorm:"column:enable_polling;not null;default:true" json:"enable_polling"`
 	// 以下字段由 Gateway sync-info 接口同步，有离线存储意义
 	OnlineStatus      int        `gorm:"column:online_status;type:int;not null;default:0;comment:在线状态：0未知 1在线 2离线" json:"online_status"`
 	LastOnlineTime    *time.Time `gorm:"column:last_online_time;comment:最后在线时间（来自 Gateway sync-info）" json:"last_online_time,omitempty"`
--- a/internal/model/dto/asset_dto.go
+++ b/internal/model/dto/asset_dto.go
@@ -196,3 +196,18 @@ type DeviceGatewayInfo struct {
 	IMEI       *string `json:"imei,omitempty" description:"IMEI号"`
 	IMSI       *string `json:"imsi,omitempty" description:"IMSI用户标识码"`
 }
+
+// UpdateAssetPollingStatusRequest 更新资产轮询状态请求
+type UpdateAssetPollingStatusRequest struct {
+	AssetType string `path:"asset_type" description:"资产类型 (iot_card:IoT卡, device:设备)" required:"true"`
+	ID        uint   `path:"id" description:"资产ID" required:"true"`
+	// EnablePolling 是否启用轮询
+	EnablePolling bool `json:"enable_polling" description:"是否启用轮询 (true:启用, false:禁用)"`
+}
+
+// UpdateAssetPollingStatusResponse 更新资产轮询状态响应
+type UpdateAssetPollingStatusResponse struct {
+	AssetType     string `json:"asset_type" description:"资产类型 (card:IoT卡, device:设备)"`
+	AssetID       uint   `json:"asset_id" description:"资产ID"`
+	EnablePolling bool   `json:"enable_polling" description:"更新后的轮询状态 (true:已启用, false:已禁用)"`
+}
--- a/internal/polling/api_callback.go
+++ b/internal/polling/api_callback.go
@@ -1,107 +0,0 @@
-package polling
-
-import (
-	"context"
-	"strconv"
-
-	"github.com/redis/go-redis/v9"
-	"go.uber.org/zap"
-
-	"github.com/break/junhong_cmp_fiber/internal/model"
-	"github.com/break/junhong_cmp_fiber/pkg/constants"
-)
-
-// APICallback API 进程使用的轻量级轮询回调
-// 直接操作 Redis 队列，不依赖调度器
-type APICallback struct {
-	redis  *redis.Client
-	logger *zap.Logger
-}
-
-// NewAPICallback 创建 API 回调实例
-func NewAPICallback(redis *redis.Client, logger *zap.Logger) *APICallback {
-	return &APICallback{
-		redis:  redis,
-		logger: logger,
-	}
-}
-
-// OnCardCreated 卡创建时的回调
-// 注意：大多数卡创建是通过 Worker 的批量导入完成的，这个方法主要用于单卡创建场景
-func (c *APICallback) OnCardCreated(ctx context.Context, card *model.IotCard) {
-	if card == nil {
-		return
-	}
-	c.logger.Debug("API 回调：卡创建", zap.Uint("card_id", card.ID))
-	// 卡创建后，scheduler 的渐进式初始化会将其加入队列
-	// 这里不做处理，让 scheduler 处理
-}
-
-// OnCardStatusChanged 卡状态变化时的回调
-func (c *APICallback) OnCardStatusChanged(ctx context.Context, cardID uint) {
-	c.logger.Debug("API 回调：卡状态变化", zap.Uint("card_id", cardID))
-	// 状态变化后，scheduler 下次扫描时会更新配置匹配
-	// 这里不做处理，让 scheduler 处理
-}
-
-// OnCardDeleted 卡删除时的回调
-// 从所有队列中移除卡
-func (c *APICallback) OnCardDeleted(ctx context.Context, cardID uint) {
-	c.logger.Debug("API 回调：卡删除", zap.Uint("card_id", cardID))
-
-	member := strconv.FormatUint(uint64(cardID), 10)
-
-	// 从所有轮询队列中移除
-	queues := []string{
-		constants.RedisPollingQueueRealnameKey(),
-		constants.RedisPollingQueueCarddataKey(),
-		constants.RedisPollingQueuePackageKey(),
-	}
-
-	for _, queueKey := range queues {
-		if err := c.redis.ZRem(ctx, queueKey, member).Err(); err != nil {
-			c.logger.Warn("从队列移除卡失败",
-				zap.String("queue", queueKey),
-				zap.Uint("card_id", cardID),
-				zap.Error(err))
-		}
-	}
-
-	// 删除卡信息缓存
-	cacheKey := constants.RedisPollingCardInfoKey(cardID)
-	if err := c.redis.Del(ctx, cacheKey).Err(); err != nil {
-		c.logger.Warn("删除卡缓存失败",
-			zap.Uint("card_id", cardID),
-			zap.Error(err))
-	}
-}
-
-// OnCardEnabled 卡启用轮询时的回调
-func (c *APICallback) OnCardEnabled(ctx context.Context, cardID uint) {
-	c.logger.Debug("API 回调：卡启用轮询", zap.Uint("card_id", cardID))
-	// 启用后，scheduler 下次扫描时会将其加入队列
-}
-
-// OnCardDisabled 卡禁用轮询时的回调
-// 从所有队列中移除卡
-func (c *APICallback) OnCardDisabled(ctx context.Context, cardID uint) {
-	c.logger.Debug("API 回调：卡禁用轮询", zap.Uint("card_id", cardID))
-
-	member := strconv.FormatUint(uint64(cardID), 10)
-
-	// 从所有轮询队列中移除
-	queues := []string{
-		constants.RedisPollingQueueRealnameKey(),
-		constants.RedisPollingQueueCarddataKey(),
-		constants.RedisPollingQueuePackageKey(),
-	}
-
-	for _, queueKey := range queues {
-		if err := c.redis.ZRem(ctx, queueKey, member).Err(); err != nil {
-			c.logger.Warn("从队列移除卡失败",
-				zap.String("queue", queueKey),
-				zap.Uint("card_id", cardID),
-				zap.Error(err))
-		}
-	}
-}
--- a/internal/polling/callbacks.go
+++ b/internal/polling/callbacks.go
@@ -1,228 +0,0 @@
-package polling
-
-import (
-	"context"
-	"time"
-
-	"go.uber.org/zap"
-
-	"github.com/break/junhong_cmp_fiber/internal/model"
-	"github.com/break/junhong_cmp_fiber/pkg/constants"
-)
-
-// OnCardCreated 卡创建时的回调
-// 将新卡加入轮询队列
-func (s *Scheduler) OnCardCreated(ctx context.Context, card *model.IotCard) {
-	if card == nil {
-		return
-	}
-
-	s.logger.Debug("卡创建回调", zap.Uint("card_id", card.ID))
-
-	if err := s.initCardPolling(ctx, card); err != nil {
-		s.logger.Error("初始化新卡轮询失败",
-			zap.Uint("card_id", card.ID),
-			zap.Error(err))
-	}
-}
-
-// OnBatchCardsCreated 批量卡创建时的回调
-func (s *Scheduler) OnBatchCardsCreated(ctx context.Context, cards []*model.IotCard) {
-	if len(cards) == 0 {
-		return
-	}
-
-	s.logger.Info("批量卡创建回调", zap.Int("count", len(cards)))
-
-	for _, card := range cards {
-		if err := s.initCardPolling(ctx, card); err != nil {
-			s.logger.Warn("初始化批量导入卡轮询失败",
-				zap.Uint("card_id", card.ID),
-				zap.Error(err))
-		}
-	}
-}
-
-// OnCardStatusChanged 卡状态变化时的回调
-// 重新匹配配置并更新轮询队列
-func (s *Scheduler) OnCardStatusChanged(ctx context.Context, cardID uint) {
-	s.logger.Debug("卡状态变化回调", zap.Uint("card_id", cardID))
-
-	// 从数据库重新加载卡信息
-	card, err := s.iotCardStore.GetByID(ctx, cardID)
-	if err != nil {
-		s.logger.Error("加载卡信息失败",
-			zap.Uint("card_id", cardID),
-			zap.Error(err))
-		return
-	}
-
-	// 先从所有队列中移除
-	s.removeFromAllQueues(ctx, cardID)
-
-	// 重新初始化轮询
-	if err := s.initCardPolling(ctx, card); err != nil {
-		s.logger.Error("重新初始化卡轮询失败",
-			zap.Uint("card_id", cardID),
-			zap.Error(err))
-	}
-}
-
-// OnCardDeleted 卡删除时的回调
-// 从轮询队列中移除
-func (s *Scheduler) OnCardDeleted(ctx context.Context, cardID uint) {
-	s.logger.Debug("卡删除回调", zap.Uint("card_id", cardID))
-
-	// 从所有队列中移除
-	s.removeFromAllQueues(ctx, cardID)
-
-	// 删除缓存
-	key := constants.RedisPollingCardInfoKey(cardID)
-	if err := s.redis.Del(ctx, key).Err(); err != nil {
-		s.logger.Warn("删除卡缓存失败",
-			zap.Uint("card_id", cardID),
-			zap.Error(err))
-	}
-}
-
-// OnCardEnabled 卡启用轮询时的回调
-func (s *Scheduler) OnCardEnabled(ctx context.Context, cardID uint) {
-	s.logger.Debug("卡启用轮询回调", zap.Uint("card_id", cardID))
-
-	// 从数据库加载卡信息
-	card, err := s.iotCardStore.GetByID(ctx, cardID)
-	if err != nil {
-		s.logger.Error("加载卡信息失败",
-			zap.Uint("card_id", cardID),
-			zap.Error(err))
-		return
-	}
-
-	// 初始化轮询
-	if err := s.initCardPolling(ctx, card); err != nil {
-		s.logger.Error("启用卡轮询失败",
-			zap.Uint("card_id", cardID),
-			zap.Error(err))
-	}
-}
-
-// OnCardDisabled 卡禁用轮询时的回调
-func (s *Scheduler) OnCardDisabled(ctx context.Context, cardID uint) {
-	s.logger.Debug("卡禁用轮询回调", zap.Uint("card_id", cardID))
-
-	// 从所有队列中移除
-	s.removeFromAllQueues(ctx, cardID)
-}
-
-// removeFromAllQueues 从所有轮询队列中移除卡
-func (s *Scheduler) removeFromAllQueues(ctx context.Context, cardID uint) {
-	member := formatUint(cardID)
-
-	queues := []string{
-		constants.RedisPollingQueueRealnameKey(),
-		constants.RedisPollingQueueCarddataKey(),
-		constants.RedisPollingQueuePackageKey(),
-	}
-
-	for _, queueKey := range queues {
-		if err := s.redis.ZRem(ctx, queueKey, member).Err(); err != nil {
-			s.logger.Warn("从队列移除卡失败",
-				zap.String("queue", queueKey),
-				zap.Uint("card_id", cardID),
-				zap.Error(err))
-		}
-	}
-}
-
-// RequeueCard 重新将卡加入队列
-// 用于任务完成后重新入队
-func (s *Scheduler) RequeueCard(ctx context.Context, cardID uint, taskType string) error {
-	// 从数据库加载卡信息
-	card, err := s.iotCardStore.GetByID(ctx, cardID)
-	if err != nil {
-		return err
-	}
-
-	// 匹配配置
-	config := s.MatchConfig(card)
-	if config == nil {
-		return nil
-	}
-
-	now := time.Now()
-	var queueKey string
-	var intervalSeconds int
-
-	switch taskType {
-	case constants.TaskTypePollingRealname:
-		if config.RealnameCheckInterval == nil {
-			return nil
-		}
-		queueKey = constants.RedisPollingQueueRealnameKey()
-		intervalSeconds = *config.RealnameCheckInterval
-	case constants.TaskTypePollingCarddata:
-		if config.CarddataCheckInterval == nil {
-			return nil
-		}
-		queueKey = constants.RedisPollingQueueCarddataKey()
-		intervalSeconds = *config.CarddataCheckInterval
-	case constants.TaskTypePollingPackage:
-		if config.PackageCheckInterval == nil {
-			return nil
-		}
-		queueKey = constants.RedisPollingQueuePackageKey()
-		intervalSeconds = *config.PackageCheckInterval
-	default:
-		return nil
-	}
-
-	nextCheck := now.Add(time.Duration(intervalSeconds) * time.Second)
-	return s.addToQueue(ctx, queueKey, cardID, nextCheck)
-}
-
-// TriggerManualCheck 触发手动检查
-func (s *Scheduler) TriggerManualCheck(ctx context.Context, cardID uint, taskType string) error {
-	key := constants.RedisPollingManualQueueKey(taskType)
-	return s.redis.RPush(ctx, key, formatUint(cardID)).Err()
-}
-
-// TriggerBatchManualCheck 批量触发手动检查
-func (s *Scheduler) TriggerBatchManualCheck(ctx context.Context, cardIDs []uint, taskType string) error {
-	if len(cardIDs) == 0 {
-		return nil
-	}
-
-	key := constants.RedisPollingManualQueueKey(taskType)
-
-	// 转换为 interface{} 切片
-	members := make([]interface{}, len(cardIDs))
-	for i, id := range cardIDs {
-		members[i] = formatUint(id)
-	}
-
-	return s.redis.RPush(ctx, key, members...).Err()
-}
-
-// LazyLoad 懒加载卡信息
-// 当卡未初始化但被访问时调用
-func (s *Scheduler) LazyLoad(ctx context.Context, cardID uint) error {
-	// 检查是否已在缓存中
-	key := constants.RedisPollingCardInfoKey(cardID)
-	exists, err := s.redis.Exists(ctx, key).Result()
-	if err != nil {
-		return err
-	}
-
-	if exists > 0 {
-		return nil // 已缓存
-	}
-
-	// 从数据库加载
-	card, err := s.iotCardStore.GetByID(ctx, cardID)
-	if err != nil {
-		return err
-	}
-
-	// 初始化轮询
-	return s.initCardPolling(ctx, card)
-}
--- a/internal/polling/config_manager.go
+++ b/internal/polling/config_manager.go
@@ -0,0 +1,152 @@
+package polling
+
+import (
+	"context"
+	"sync"
+	"time"
+
+	"github.com/bytedance/sonic"
+	"github.com/redis/go-redis/v9"
+	"go.uber.org/zap"
+
+	"github.com/break/junhong_cmp_fiber/internal/model"
+	"github.com/break/junhong_cmp_fiber/internal/store/postgres"
+	"github.com/break/junhong_cmp_fiber/pkg/constants"
+)
+
+// PollingConfigManager 轮询配置管理器
+// 从 DB 加载 tb_polling_config，同步到 Redis Hash，内存缓存（读写锁）
+// 5 分钟定时自动刷新；加载失败时保留原缓存不清空
+type PollingConfigManager struct {
+	configStore *postgres.PollingConfigStore
+	redis       *redis.Client
+	logger      *zap.Logger
+
+	mu          sync.RWMutex
+	configs     []*model.PollingConfig
+	refreshOnce sync.Once
+}
+
+// NewPollingConfigManager 创建配置管理器
+func NewPollingConfigManager(configStore *postgres.PollingConfigStore, redisClient *redis.Client, logger *zap.Logger) *PollingConfigManager {
+	return &PollingConfigManager{
+		configStore: configStore,
+		redis:       redisClient,
+		logger:      logger,
+	}
+}
+
+// Load 加载配置到内存缓存并同步到 Redis
+// 加载失败时保留原缓存不清空，确保可用性
+func (m *PollingConfigManager) Load(ctx context.Context) error {
+	configs, err := m.configStore.ListEnabled(ctx)
+	if err != nil {
+		m.logger.Error("加载轮询配置失败", zap.Error(err))
+		return err
+	}
+
+	m.mu.Lock()
+	m.configs = configs
+	m.mu.Unlock()
+
+	if syncErr := m.syncToRedis(ctx, configs); syncErr != nil {
+		m.logger.Warn("同步配置到 Redis 失败", zap.Error(syncErr))
+	}
+
+	m.logger.Info("轮询配置已加载", zap.Int("count", len(configs)))
+	return nil
+}
+
+// Start 启动定时刷新（每 5 分钟自动 Load 一次）
+// 使用 sync.Once 确保只启动一个刷新 goroutine
+func (m *PollingConfigManager) Start(ctx context.Context) {
+	m.refreshOnce.Do(func() {
+		go func() {
+			ticker := time.NewTicker(5 * time.Minute)
+			defer ticker.Stop()
+			m.logger.Info("配置管理器已启动，5分钟自动刷新")
+			for {
+				select {
+				case <-ctx.Done():
+					return
+				case <-ticker.C:
+					if err := m.Load(ctx); err != nil {
+						m.logger.Warn("定时刷新轮询配置失败，保留原配置", zap.Error(err))
+					}
+				}
+			}
+		}()
+	})
+}
+
+// MatchConfig 按优先级匹配第一个符合条件的轮询配置
+// 配置按 priority ASC 排序（DB 层保证），数字越小优先级越高
+func (m *PollingConfigManager) MatchConfig(card *model.IotCard) *model.PollingConfig {
+	m.mu.RLock()
+	defer m.mu.RUnlock()
+
+	for _, cfg := range m.configs {
+		if matchConfigConditions(cfg, card) {
+			return cfg
+		}
+	}
+	return nil
+}
+
+// matchConfigConditions 检查卡是否满足配置的匹配条件
+func matchConfigConditions(cfg *model.PollingConfig, card *model.IotCard) bool {
+	if cfg.CardCondition != "" {
+		if cfg.CardCondition != getCardCondition(card) {
+			return false
+		}
+	}
+	if cfg.CardCategory != "" {
+		if cfg.CardCategory != card.CardCategory {
+			return false
+		}
+	}
+	if cfg.CarrierID != nil {
+		if *cfg.CarrierID != card.CarrierID {
+			return false
+		}
+	}
+	return true
+}
+
+// getCardCondition 获取卡的状态条件（用于匹配轮询配置）
+// ⚠️ 注意判断顺序：停机优先，避免停机卡错误匹配 activated 或 not_real_name 配置
+// 停机卡需要继续轮询 carddata/package 以检测复机条件（套餐购买、流量重置、实名完成）
+func getCardCondition(card *model.IotCard) string {
+	if card.NetworkStatus == constants.NetworkStatusOffline {
+		return "suspended"
+	}
+	if card.RealNameStatus != constants.RealNameStatusVerified {
+		return "not_real_name"
+	}
+	return "activated"
+}
+
+// syncToRedis 将配置同步到 Redis Hash（TTL 24h）
+func (m *PollingConfigManager) syncToRedis(ctx context.Context, configs []*model.PollingConfig) error {
+	if len(configs) == 0 {
+		return nil
+	}
+	key := constants.RedisPollingConfigsCacheKey()
+	configData := make([]interface{}, 0, len(configs)*2)
+	for _, cfg := range configs {
+		jsonData, err := sonic.Marshal(cfg)
+		if err != nil {
+			m.logger.Warn("序列化轮询配置失败", zap.Uint("config_id", cfg.ID), zap.Error(err))
+			continue
+		}
+		configData = append(configData, cfg.ID, string(jsonData))
+	}
+	if len(configData) == 0 {
+		return nil
+	}
+	pipe := m.redis.Pipeline()
+	pipe.HSet(ctx, key, configData...)
+	pipe.Expire(ctx, key, 24*time.Hour)
+	_, err := pipe.Exec(ctx)
+	return err
+}
--- a/internal/polling/data_reset_handler.go
+++ b/internal/polling/data_reset_handler.go
@@ -15,7 +15,6 @@ type DataResetHandler struct {
 	resetService *packagepkg.ResetService
 	logger       *zap.Logger

-	// 上次执行时间（用于限流，避免重复执行）
 	lastDailyReset   time.Time
 	lastMonthlyReset time.Time
 	lastYearlyReset  time.Time
@@ -26,9 +25,13 @@ func NewDataResetHandler(
 	resetService *packagepkg.ResetService,
 	logger *zap.Logger,
 ) *DataResetHandler {
+	now := time.Now()
 	return &DataResetHandler{
-		resetService: resetService,
-		logger:       logger,
+		resetService:     resetService,
+		logger:           logger,
+		lastDailyReset:   now,
+		lastMonthlyReset: now,
+		lastYearlyReset:  now,
 	}
 }

--- a/internal/polling/initializer.go
+++ b/internal/polling/initializer.go
@@ -0,0 +1,297 @@
+package polling
+
+import (
+	"context"
+	"fmt"
+	"sync"
+	"sync/atomic"
+	"time"
+
+	"github.com/redis/go-redis/v9"
+	"go.uber.org/zap"
+
+	"github.com/break/junhong_cmp_fiber/internal/model"
+	"github.com/break/junhong_cmp_fiber/internal/store/postgres"
+	"github.com/break/junhong_cmp_fiber/pkg/constants"
+)
+
+// initProgress 初始化进度内部状态（字段通过 GetProgress 快照对外，避免暴露锁）
+type initProgress struct {
+	mu            sync.RWMutex
+	totalCards    int64
+	loadedCards   int64
+	startTime     time.Time
+	lastBatchTime time.Time
+	status        string
+	errorMessage  string
+}
+
+// InitProgress 初始化进度快照（GetProgress 返回的值拷贝，调用方无需加锁）
+type InitProgress struct {
+	TotalCards    int64     `json:"total_cards"`
+	LoadedCards   int64     `json:"loaded_cards"`
+	StartTime     time.Time `json:"start_time"`
+	LastBatchTime time.Time `json:"last_batch_time"`
+	Status        string    `json:"status"`
+	ErrorMessage  string    `json:"error_message"`
+}
+
+// pipelineFlushSize 单次 Pipeline Exec 最大命令数（每张卡最多 6 条）
+// 10000 条约 2MB 内存峰值；千万级卡下约 6000 次 Exec，RTT 总开销可忽略
+const pipelineFlushSize = 10000
+
+// PollingInitializer 分片渐进式初始化器
+// 启动时从 DB 分批加载全量卡数据到分片 Sorted Set
+// 使用 card_id % shardCount 分片，每 pipelineFlushSize 条命令 flush 一次 Pipeline
+type PollingInitializer struct {
+	iotCardStore *postgres.IotCardStore
+	redis        *redis.Client
+	configMgr    *PollingConfigManager
+	queueMgr     *PollingQueueManager
+	logger       *zap.Logger
+
+	progress      initProgress
+	initCompleted atomic.Bool
+
+	stopChan chan struct{}
+	wg       sync.WaitGroup
+}
+
+// NewPollingInitializer 创建初始化器
+func NewPollingInitializer(
+	iotCardStore *postgres.IotCardStore,
+	redisClient *redis.Client,
+	configMgr *PollingConfigManager,
+	queueMgr *PollingQueueManager,
+	logger *zap.Logger,
+) *PollingInitializer {
+	p := &PollingInitializer{
+		iotCardStore: iotCardStore,
+		redis:        redisClient,
+		configMgr:    configMgr,
+		queueMgr:     queueMgr,
+		logger:       logger,
+		stopChan:     make(chan struct{}),
+	}
+	p.progress.status = "pending"
+	return p
+}
+
+// StartBackground 启动后台渐进式初始化（非阻塞）
+func (p *PollingInitializer) StartBackground(ctx context.Context) {
+	p.wg.Add(1)
+	go p.run(ctx)
+}
+
+// Stop 停止初始化
+func (p *PollingInitializer) Stop() {
+	close(p.stopChan)
+	p.wg.Wait()
+}
+
+// IsCompleted 检查初始化是否完成
+func (p *PollingInitializer) IsCompleted() bool {
+	return p.initCompleted.Load()
+}
+
+// GetProgress 返回当前初始化进度快照（加锁读取，返回值拷贝）
+func (p *PollingInitializer) GetProgress() InitProgress {
+	p.progress.mu.RLock()
+	defer p.progress.mu.RUnlock()
+	return InitProgress{
+		TotalCards:    p.progress.totalCards,
+		LoadedCards:   p.progress.loadedCards,
+		StartTime:     p.progress.startTime,
+		LastBatchTime: p.progress.lastBatchTime,
+		Status:        p.progress.status,
+		ErrorMessage:  p.progress.errorMessage,
+	}
+}
+
+// run 执行渐进式初始化
+func (p *PollingInitializer) run(ctx context.Context) {
+	defer p.wg.Done()
+
+	p.setStatus("running", "")
+	p.progress.mu.Lock()
+	p.progress.startTime = time.Now()
+	p.progress.mu.Unlock()
+
+	p.logger.Info("开始分片渐进式初始化...")
+
+	totalCards, err := p.iotCardStore.CountForPolling(ctx)
+	if err != nil {
+		p.logger.Error("获取卡总数失败", zap.Error(err))
+		p.setStatus("failed", err.Error())
+		return
+	}
+
+	p.progress.mu.Lock()
+	p.progress.totalCards = totalCards
+	p.progress.mu.Unlock()
+
+	p.logger.Info("开始加载卡数据", zap.Int64("total_cards", totalCards))
+
+	const batchSize = 100000
+	const batchSleep = 500 * time.Millisecond
+	var lastID uint
+	batchCount := 0
+
+	for {
+		select {
+		case <-p.stopChan:
+			p.logger.Info("渐进式初始化被中断")
+			return
+		default:
+		}
+
+		cards, fetchErr := p.iotCardStore.ListForPollingBatch(ctx, lastID, batchSize)
+		if fetchErr != nil {
+			p.logger.Error("加载卡数据失败", zap.Error(fetchErr))
+			p.setStatus("failed", fetchErr.Error())
+			return
+		}
+
+		if len(cards) == 0 {
+			break
+		}
+
+		if initErr := p.initBatch(ctx, cards); initErr != nil {
+			p.logger.Warn("批量初始化失败", zap.Error(initErr))
+		}
+
+		lastID = cards[len(cards)-1].ID
+		batchCount++
+
+		p.progress.mu.Lock()
+		p.progress.loadedCards += int64(len(cards))
+		p.progress.lastBatchTime = time.Now()
+		loaded := p.progress.loadedCards
+		p.progress.mu.Unlock()
+
+		if batchCount%10 == 0 || len(cards) < batchSize {
+			p.logger.Info("初始化进度",
+				zap.Int("batch", batchCount),
+				zap.Int64("loaded", loaded),
+				zap.Int64("total", totalCards))
+		}
+
+		time.Sleep(batchSleep)
+	}
+
+	p.setStatus("completed", "")
+	p.initCompleted.Store(true)
+
+	snapshot := p.GetProgress()
+	p.logger.Info("分片渐进式初始化完成",
+		zap.Int64("total_loaded", snapshot.LoadedCards),
+		zap.Duration("duration", time.Since(snapshot.StartTime)))
+}
+
+// initBatch 使用 Pipeline 将一批卡写入分片队列和缓存
+// 每 pipelineFlushSize 条命令 Exec 一次，控制内存峰值并降低单次失败损失
+func (p *PollingInitializer) initBatch(ctx context.Context, cards []*model.IotCard) error {
+	if len(cards) == 0 {
+		return nil
+	}
+
+	now := time.Now()
+	cardCacheTTL := 7 * 24 * time.Hour
+	pipe := p.redis.Pipeline()
+	cmdCount := 0
+
+	flushPipe := func() {
+		if cmdCount == 0 {
+			return
+		}
+		if _, execErr := pipe.Exec(ctx); execErr != nil {
+			p.logger.Warn("Pipeline flush 失败，继续下一批", zap.Error(execErr))
+		}
+		pipe = p.redis.Pipeline()
+		cmdCount = 0
+	}
+
+	for _, card := range cards {
+		cfg := p.configMgr.MatchConfig(card)
+		if cfg == nil {
+			continue
+		}
+
+		shardID := int(card.ID) % p.queueMgr.shardCount
+		cardIDStr := fmt.Sprintf("%d", card.ID)
+
+		if cfg.RealnameCheckInterval != nil && *cfg.RealnameCheckInterval > 0 {
+			nextCheck := calculateNextCheckTime(card.LastRealNameCheckAt, *cfg.RealnameCheckInterval, now)
+			pipe.ZAdd(ctx, constants.RedisPollingShardQueueKey(shardID, constants.TaskTypePollingRealname), redis.Z{
+				Score: float64(nextCheck.Unix()), Member: cardIDStr,
+			})
+			cmdCount++
+		}
+		if cfg.CarddataCheckInterval != nil && *cfg.CarddataCheckInterval > 0 {
+			nextCheck := calculateNextCheckTime(card.LastDataCheckAt, *cfg.CarddataCheckInterval, now)
+			pipe.ZAdd(ctx, constants.RedisPollingShardQueueKey(shardID, constants.TaskTypePollingCarddata), redis.Z{
+				Score: float64(nextCheck.Unix()), Member: cardIDStr,
+			})
+			cmdCount++
+		}
+		if cfg.PackageCheckInterval != nil && *cfg.PackageCheckInterval > 0 {
+			nextCheck := calculateNextCheckTime(card.LastDataCheckAt, *cfg.PackageCheckInterval, now)
+			pipe.ZAdd(ctx, constants.RedisPollingShardQueueKey(shardID, constants.TaskTypePollingPackage), redis.Z{
+				Score: float64(nextCheck.Unix()), Member: cardIDStr,
+			})
+			cmdCount++
+		}
+		if cfg.ProtectCheckInterval != nil && *cfg.ProtectCheckInterval > 0 {
+			nextCheck := calculateNextCheckTime(card.LastProtectCheckAt, *cfg.ProtectCheckInterval, now)
+			pipe.ZAdd(ctx, constants.RedisPollingShardQueueKey(shardID, constants.TaskTypePollingProtect), redis.Z{
+				Score: float64(nextCheck.Unix()), Member: cardIDStr,
+			})
+			cmdCount++
+		}
+
+		cacheKey := constants.RedisPollingCardInfoKey(card.ID)
+		cacheData := map[string]interface{}{
+			"id": card.ID, "iccid": card.ICCID,
+			"card_category": card.CardCategory, "real_name_status": card.RealNameStatus,
+			"network_status": card.NetworkStatus, "carrier_id": card.CarrierID,
+			"current_month_usage_mb":  card.CurrentMonthUsageMB,
+			"last_gateway_reading_mb": card.LastGatewayReadingMB,
+			"data_usage_mb":           card.DataUsageMB,
+			"stop_reason":             card.StopReason, "is_standalone": boolToStr(card.IsStandalone),
+			"cached_at": now.Unix(),
+		}
+		if card.CurrentMonthStartDate != nil {
+			cacheData["current_month_start_date"] = card.CurrentMonthStartDate.Unix()
+		}
+		pipe.HSet(ctx, cacheKey, cacheData)
+		pipe.Expire(ctx, cacheKey, cardCacheTTL)
+		cmdCount += 2
+
+		if cmdCount >= pipelineFlushSize {
+			flushPipe()
+		}
+	}
+
+	flushPipe()
+	return nil
+}
+
+// calculateNextCheckTime 计算下次检查时间
+func calculateNextCheckTime(lastCheckAt *time.Time, intervalSeconds int, now time.Time) time.Time {
+	if lastCheckAt == nil {
+		jitter := time.Duration(now.UnixNano()%int64(intervalSeconds)) * time.Second / 10
+		return now.Add(jitter)
+	}
+	nextCheck := lastCheckAt.Add(time.Duration(intervalSeconds) * time.Second)
+	if nextCheck.Before(now) {
+		return now
+	}
+	return nextCheck
+}
+
+func (p *PollingInitializer) setStatus(status, errMsg string) {
+	p.progress.mu.Lock()
+	p.progress.status = status
+	p.progress.errorMessage = errMsg
+	p.progress.mu.Unlock()
+}
--- a/internal/polling/lifecycle_service.go
+++ b/internal/polling/lifecycle_service.go
@@ -0,0 +1,195 @@
+package polling
+
+import (
+	"context"
+	"math/rand"
+	"time"
+
+	"go.uber.org/zap"
+
+	"github.com/break/junhong_cmp_fiber/internal/model"
+	"github.com/break/junhong_cmp_fiber/internal/store/postgres"
+	"github.com/break/junhong_cmp_fiber/pkg/constants"
+)
+
+// PollingLifecycleService 卡生命周期轮询管理服务
+// 替代 callbacks.go 和 api_callback.go 中的生命周期方法
+// 实现 iot_card.PollingCallback 接口，两个进程（API 和 Worker）共享同一实现
+// 依赖：PollingQueueManager（队列操作）+ PollingConfigManager（配置匹配）
+type PollingLifecycleService struct {
+	queueMgr           *PollingQueueManager
+	configMgr          *PollingConfigManager
+	iotCardStore       *postgres.IotCardStore
+	deviceBindingStore *postgres.DeviceSimBindingStore
+	deviceStore        *postgres.DeviceStore
+	logger             *zap.Logger
+}
+
+// NewPollingLifecycleService 创建卡生命周期轮询管理服务
+func NewPollingLifecycleService(
+	queueMgr *PollingQueueManager,
+	configMgr *PollingConfigManager,
+	iotCardStore *postgres.IotCardStore,
+	deviceBindingStore *postgres.DeviceSimBindingStore,
+	deviceStore *postgres.DeviceStore,
+	logger *zap.Logger,
+) *PollingLifecycleService {
+	return &PollingLifecycleService{
+		queueMgr:           queueMgr,
+		configMgr:          configMgr,
+		iotCardStore:       iotCardStore,
+		deviceBindingStore: deviceBindingStore,
+		deviceStore:        deviceStore,
+		logger:             logger,
+	}
+}
+
+// OnCardCreated 新卡创建后初始化轮询
+func (s *PollingLifecycleService) OnCardCreated(ctx context.Context, card *model.IotCard) {
+	if card == nil {
+		return
+	}
+	if !s.shouldEnqueue(ctx, card) {
+		s.logger.Debug("卡禁用轮询，跳过入队", zap.Uint("card_id", card.ID))
+		return
+	}
+	s.enqueueCard(ctx, card)
+}
+
+// OnBatchCardsCreated 批量卡创建后批量初始化轮询
+func (s *PollingLifecycleService) OnBatchCardsCreated(ctx context.Context, cards []*model.IotCard) {
+	for _, card := range cards {
+		s.OnCardCreated(ctx, card)
+	}
+}
+
+// OnCardStatusChanged 卡状态变化后重新匹配配置并更新队列
+func (s *PollingLifecycleService) OnCardStatusChanged(ctx context.Context, cardID uint) {
+	if err := s.queueMgr.RemoveFromAllQueues(ctx, cardID); err != nil {
+		s.logger.Warn("卡状态变化：从队列移除失败", zap.Uint("card_id", cardID), zap.Error(err))
+	}
+	card, err := s.iotCardStore.GetByID(ctx, cardID)
+	if err != nil {
+		s.logger.Error("卡状态变化：加载卡信息失败", zap.Uint("card_id", cardID), zap.Error(err))
+		return
+	}
+	if !s.shouldEnqueue(ctx, card) {
+		return
+	}
+	s.enqueueCard(ctx, card)
+}
+
+// OnCardDeleted 卡删除后移除所有队列并清理缓存
+func (s *PollingLifecycleService) OnCardDeleted(ctx context.Context, cardID uint) {
+	if err := s.queueMgr.OnCardDeleted(ctx, cardID); err != nil {
+		s.logger.Warn("卡删除：清理队列和缓存失败", zap.Uint("card_id", cardID), zap.Error(err))
+	}
+}
+
+// OnCardEnabled 卡启用轮询后初始化
+func (s *PollingLifecycleService) OnCardEnabled(ctx context.Context, cardID uint) {
+	card, err := s.iotCardStore.GetByID(ctx, cardID)
+	if err != nil {
+		s.logger.Error("卡启用：加载卡信息失败", zap.Uint("card_id", cardID), zap.Error(err))
+		return
+	}
+	if !s.shouldEnqueue(ctx, card) {
+		return
+	}
+	s.enqueueCard(ctx, card)
+}
+
+// OnCardDisabled 卡禁用轮询后移除所有队列
+func (s *PollingLifecycleService) OnCardDisabled(ctx context.Context, cardID uint) {
+	if err := s.queueMgr.RemoveFromAllQueues(ctx, cardID); err != nil {
+		s.logger.Warn("卡禁用：从队列移除失败", zap.Uint("card_id", cardID), zap.Error(err))
+	}
+}
+
+// shouldEnqueue M3 修复：检查卡或其绑定设备是否允许轮询
+// 两层检查：先查卡级 enable_polling，再查设备级 enable_polling（IsStandalone=false 时）
+// 直接查 device.enable_polling，不依赖级联同步正确性，防止同步失败时生命周期事件绕过设备级禁用
+func (s *PollingLifecycleService) shouldEnqueue(ctx context.Context, card *model.IotCard) bool {
+	if !card.EnablePolling {
+		return false
+	}
+	if !card.IsStandalone && s.deviceBindingStore != nil && s.deviceStore != nil {
+		binding, err := s.deviceBindingStore.GetActiveBindingByCardID(ctx, card.ID)
+		if err == nil && binding != nil {
+			device, devErr := s.deviceStore.GetByID(ctx, binding.DeviceID)
+			if devErr == nil && !device.EnablePolling {
+				s.logger.Debug("设备已禁用轮询，跳过卡入队",
+					zap.Uint("card_id", card.ID), zap.Uint("device_id", binding.DeviceID))
+				return false
+			}
+		}
+	}
+	return true
+}
+
+// enqueueCard 按匹配配置将卡入队分片队列
+func (s *PollingLifecycleService) enqueueCard(ctx context.Context, card *model.IotCard) {
+	cfg := s.configMgr.MatchConfig(card)
+	if cfg == nil {
+		return
+	}
+	taskTypes := getEnabledTaskTypes(cfg)
+	for _, taskType := range taskTypes {
+		if err := s.queueMgr.Requeue(ctx, card.ID, taskType, calcInitialDelay(card, cfg, taskType)); err != nil {
+			s.logger.Warn("卡入队失败",
+				zap.Uint("card_id", card.ID), zap.String("task_type", taskType), zap.Error(err))
+		}
+	}
+}
+
+// getEnabledTaskTypes 返回配置中启用的任务类型列表
+func getEnabledTaskTypes(cfg *model.PollingConfig) []string {
+	var types []string
+	if cfg.RealnameCheckInterval != nil && *cfg.RealnameCheckInterval > 0 {
+		types = append(types, constants.TaskTypePollingRealname)
+	}
+	if cfg.CarddataCheckInterval != nil && *cfg.CarddataCheckInterval > 0 {
+		types = append(types, constants.TaskTypePollingCarddata)
+	}
+	if cfg.PackageCheckInterval != nil && *cfg.PackageCheckInterval > 0 {
+		types = append(types, constants.TaskTypePollingPackage)
+	}
+	if cfg.ProtectCheckInterval != nil && *cfg.ProtectCheckInterval > 0 {
+		types = append(types, constants.TaskTypePollingProtect)
+	}
+	return types
+}
+
+// calcInitialDelay 计算新入队卡的初始检查时间（加随机抖动避免惊群）
+// 抖动范围 [0, max(interval/10, 2)) 秒；下界取 2 保证 rand.Intn 有实际随机性
+// （rand.Intn(1) 永远返回 0，对 interval≤10 的配置会导致零抖动）
+func calcInitialDelay(_ *model.IotCard, cfg *model.PollingConfig, taskType string) time.Time {
+	now := time.Now()
+	var interval int
+	switch taskType {
+	case constants.TaskTypePollingRealname:
+		if cfg.RealnameCheckInterval != nil {
+			interval = *cfg.RealnameCheckInterval
+		}
+	case constants.TaskTypePollingCarddata:
+		if cfg.CarddataCheckInterval != nil {
+			interval = *cfg.CarddataCheckInterval
+		}
+	case constants.TaskTypePollingPackage:
+		if cfg.PackageCheckInterval != nil {
+			interval = *cfg.PackageCheckInterval
+		}
+	case constants.TaskTypePollingProtect:
+		if cfg.ProtectCheckInterval != nil {
+			interval = *cfg.ProtectCheckInterval
+		}
+	}
+	if interval <= 0 {
+		return now
+	}
+	jitterMax := interval / 10
+	if jitterMax < 2 {
+		jitterMax = 2
+	}
+	return now.Add(time.Duration(rand.Intn(jitterMax)) * time.Second)
+}
--- a/internal/polling/package_activation_handler.go
+++ b/internal/polling/package_activation_handler.go
@@ -113,8 +113,11 @@ func (h *PackageActivationHandler) findExpiredMainPackages(ctx context.Context)
 }

 // processExpiredPackage 处理单个过期套餐
+// triggerStopAfterExpiry 在事务提交后才调用，避免 goroutine 在 TX 提交前读到脏数据
 func (h *PackageActivationHandler) processExpiredPackage(ctx context.Context, pkg *model.PackageUsage) error {
-	return h.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
+	carrierType, carrierID := h.getCarrierInfo(pkg)
+
+	err := h.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
 		// 任务 19.3: 更新过期主套餐状态为 Expired (status=3)
 		if err := tx.Model(pkg).Update("status", constants.PackageUsageStatusExpired).Error; err != nil {
 			return err
@@ -129,11 +132,9 @@ func (h *PackageActivationHandler) processExpiredPackage(ctx context.Context, pk
 			h.logger.Warn("加油包级联失效失败",
 				zap.Uint("master_usage_id", pkg.ID),
 				zap.Error(err))
-			// 不返回错误，继续处理
 		}

 		// 任务 19.5: 查询并激活下一个待生效主套餐
-		carrierType, carrierID := h.getCarrierInfo(pkg)
 		if carrierType != "" && carrierID > 0 {
 			if err := h.activateNextPackage(ctx, tx, carrierType, carrierID); err != nil {
 				h.logger.Warn("激活下一个待生效套餐失败",
@@ -148,13 +149,21 @@ func (h *PackageActivationHandler) processExpiredPackage(ctx context.Context, pk
 					zap.Uint("carrier_id", carrierID),
 					zap.Error(err))
 			}
-
-			// 套餐过期后主动触发停机，消除依赖 carddata 轮询兜底的 60s 延迟窗口
-			h.triggerStopAfterExpiry(ctx, carrierType, carrierID)
 		}

 		return nil
 	})
+
+	if err != nil {
+		return err
+	}
+
+	// 事务提交后再触发异步停机，确保 CheckAndStopCard 读到最新的套餐状态
+	if carrierType != "" && carrierID > 0 {
+		h.triggerStopAfterExpiry(ctx, carrierType, carrierID)
+	}
+
+	return nil
 }

 // invalidateAddons 任务 19.4: 加油包级联失效
@@ -439,67 +448,43 @@ func (h *PackageActivationHandler) HandlePackageQueueActivation(ctx context.Cont
 }

 // HandlePackageFirstActivation 处理首次实名激活任务（Asynq Handler）
-// 任务 22: 由 Asynq 调用，执行首次实名后的套餐激活
+// 由 polling_realname_handler 在检测到首次实名时触发。
+// payload 中仅需 carrier_type + carrier_id，ActivateByRealname 内部自行查找
+// pending_realname_activation=true 的套餐，无需外部指定 PackageUsageID。
 func (h *PackageActivationHandler) HandlePackageFirstActivation(ctx context.Context, t *asynq.Task) error {
 	var payload PackageActivationPayload
 	if err := sonic.Unmarshal(t.Payload(), &payload); err != nil {
 		h.logger.Error("解析首次实名激活任务载荷失败", zap.Error(err))
-		return nil // 不重试
+		return nil
+	}
+
+	if payload.CarrierType == "" || payload.CarrierID == 0 {
+		h.logger.Error("首次实名激活任务 carrier 信息缺失",
+			zap.String("carrier_type", payload.CarrierType),
+			zap.Uint("carrier_id", payload.CarrierID))
+		return nil
 	}

 	h.logger.Info("开始执行首次实名激活",
-		zap.Uint("package_usage_id", payload.PackageUsageID),
 		zap.String("carrier_type", payload.CarrierType),
 		zap.Uint("carrier_id", payload.CarrierID))

-	// 任务 22.4: 幂等性检查
-	var pkg model.PackageUsage
-	if err := h.db.First(&pkg, payload.PackageUsageID).Error; err != nil {
-		if err == gorm.ErrRecordNotFound {
-			h.logger.Warn("套餐使用记录不存在", zap.Uint("package_usage_id", payload.PackageUsageID))
-			return nil
-		}
+	if h.activationService == nil {
+		h.logger.Warn("ActivationService 未注入，跳过首次实名激活")
+		return nil
+	}
+
+	if err := h.activationService.ActivateByRealname(ctx, payload.CarrierType, payload.CarrierID); err != nil {
+		h.logger.Error("首次实名激活失败",
+			zap.String("carrier_type", payload.CarrierType),
+			zap.Uint("carrier_id", payload.CarrierID),
+			zap.Error(err))
 		return err
 	}

-	// 检查 pending_realname_activation 是否已为 false（已处理过）
-	if !pkg.PendingRealnameActivation {
-		h.logger.Info("套餐已处理过首次实名激活，跳过",
-			zap.Uint("package_usage_id", payload.PackageUsageID))
-		return nil
-	}
-
-	// 如果已经是生效状态，跳过
-	if pkg.Status == constants.PackageUsageStatusActive {
-		h.logger.Info("套餐已激活，跳过",
-			zap.Uint("package_usage_id", payload.PackageUsageID))
-		return nil
-	}
-
-	// 任务 22.3: 调用 ActivationService.ActivateByRealname 激活套餐
-	if h.activationService != nil {
-		if err := h.activationService.ActivateByRealname(ctx, payload.CarrierType, payload.CarrierID); err != nil {
-			h.logger.Error("首次实名激活失败",
-				zap.Uint("package_usage_id", payload.PackageUsageID),
-				zap.String("carrier_type", payload.CarrierType),
-				zap.Uint("carrier_id", payload.CarrierID),
-				zap.Error(err))
-			return err
-		}
-	} else {
-		// ActivationService 未注入，直接更新状态（备用逻辑）
-		now := time.Now()
-		if err := h.db.Model(&pkg).Updates(map[string]any{
-			"status":                      constants.PackageUsageStatusActive,
-			"activated_at":                now,
-			"pending_realname_activation": false,
-		}).Error; err != nil {
-			return err
-		}
-	}
-
 	h.logger.Info("首次实名激活成功",
-		zap.Uint("package_usage_id", payload.PackageUsageID))
+		zap.String("carrier_type", payload.CarrierType),
+		zap.Uint("carrier_id", payload.CarrierID))

 	return nil
 }
--- a/internal/polling/queue_manager.go
+++ b/internal/polling/queue_manager.go
@@ -0,0 +1,159 @@
+package polling
+
+import (
+	"context"
+	"fmt"
+	"strconv"
+	"time"
+
+	"github.com/redis/go-redis/v9"
+	"go.uber.org/zap"
+
+	"github.com/break/junhong_cmp_fiber/pkg/constants"
+)
+
+// allTaskTypes 轮询系统的全部任务类型（用于 RemoveFromAllQueues 遍历）
+var allTaskTypes = []string{
+	constants.TaskTypePollingRealname,
+	constants.TaskTypePollingCarddata,
+	constants.TaskTypePollingPackage,
+	constants.TaskTypePollingProtect,
+}
+
+// dequeueScript Lua 脚本：原子出队（ZRANGEBYSCORE + ZREM 服务端原子执行）
+// 保留时间过滤语义：只取 score ≤ now 的到期卡，不触碰未来项
+// 分批 ZREM：Lua unpack() 受 LUAI_MAXCSTACK 约 8000 限制，按 7000 分批避免溢出
+var dequeueScript = redis.NewScript(`
+    local results = redis.call('ZRANGEBYSCORE', KEYS[1], '-inf', ARGV[1], 'LIMIT', 0, tonumber(ARGV[2]))
+    for i = 1, #results, 7000 do
+        local j = math.min(i + 6999, #results)
+        redis.call('ZREM', KEYS[1], unpack(results, i, j))
+    end
+    return results
+`)
+
+// CardEntry 出队卡信息
+type CardEntry struct {
+	CardID uint
+}
+
+// PollingQueueManager 统一 Redis 轮询队列操作
+// 两个进程（API 进程和 Worker 进程）共享，仅依赖 Redis Client
+// 支持分片 Sorted Set，实现千万级规模
+type PollingQueueManager struct {
+	redis      *redis.Client
+	shardCount int
+	logger     *zap.Logger
+}
+
+// NewPollingQueueManager 创建轮询队列管理器
+func NewPollingQueueManager(redisClient *redis.Client, shardCount int, logger *zap.Logger) *PollingQueueManager {
+	if shardCount <= 0 {
+		shardCount = constants.PollingShardCount
+	}
+	return &PollingQueueManager{
+		redis:      redisClient,
+		shardCount: shardCount,
+		logger:     logger,
+	}
+}
+
+// DequeueReady 原子出队到期卡（Lua 脚本：ZRANGEBYSCORE + ZREM 服务端原子执行）
+// 只取 score ≤ now 的到期卡，不触碰未来项
+// taskType: realname | carddata | package | protect
+// shardID: 0 到 shardCount-1
+func (m *PollingQueueManager) DequeueReady(ctx context.Context, shardID int, taskType string, batchSize int) ([]CardEntry, error) {
+	// 防御：batchSize 不超过 Lua unpack 栈限制
+	if batchSize <= 0 || batchSize > constants.PollingDequeueMaxBatchSize {
+		batchSize = constants.PollingDequeueMaxBatchSize
+	}
+	key := constants.RedisPollingShardQueueKey(shardID, taskType)
+	now := time.Now().Unix()
+
+	results, err := dequeueScript.Run(ctx, m.redis, []string{key}, now, batchSize).StringSlice()
+	if err != nil && err != redis.Nil {
+		return nil, err
+	}
+
+	entries := make([]CardEntry, 0, len(results))
+	for _, s := range results {
+		id, parseErr := strconv.ParseUint(s, 10, 64)
+		if parseErr != nil {
+			m.logger.Warn("解析卡ID失败", zap.String("value", s), zap.Error(parseErr))
+			continue
+		}
+		entries = append(entries, CardEntry{CardID: uint(id)})
+	}
+	return entries, nil
+}
+
+// Requeue 将卡重新入队（ZADD，score 为下次检查时间戳）
+func (m *PollingQueueManager) Requeue(ctx context.Context, cardID uint, taskType string, nextCheckAt time.Time) error {
+	shardID := int(cardID) % m.shardCount
+	key := constants.RedisPollingShardQueueKey(shardID, taskType)
+	return m.redis.ZAdd(ctx, key, redis.Z{
+		Score:  float64(nextCheckAt.Unix()),
+		Member: fmt.Sprintf("%d", cardID),
+	}).Err()
+}
+
+// RemoveFromAllQueues 从所有分片的所有4个队列（含protect）移除指定卡
+// 修复 Bug3：旧实现漏掉 protect 队列
+func (m *PollingQueueManager) RemoveFromAllQueues(ctx context.Context, cardID uint) error {
+	member := fmt.Sprintf("%d", cardID)
+	pipe := m.redis.Pipeline()
+	for i := 0; i < m.shardCount; i++ {
+		for _, taskType := range allTaskTypes {
+			key := constants.RedisPollingShardQueueKey(i, taskType)
+			pipe.ZRem(ctx, key, member)
+		}
+	}
+	_, err := pipe.Exec(ctx)
+	return err
+}
+
+// EnqueueManual 手动触发入队（List RPUSH，调度器优先消费）
+func (m *PollingQueueManager) EnqueueManual(ctx context.Context, cardID uint, taskType string) error {
+	key := constants.RedisPollingManualQueueKey(taskType)
+	return m.redis.RPush(ctx, key, fmt.Sprintf("%d", cardID)).Err()
+}
+
+// OnCardDeleted 卡删除事件处理（移除所有队列 + 清理卡信息缓存）
+func (m *PollingQueueManager) OnCardDeleted(ctx context.Context, cardID uint) error {
+	// 从所有分片队列移除
+	if err := m.RemoveFromAllQueues(ctx, cardID); err != nil {
+		return err
+	}
+	// 清理轮询卡信息缓存
+	cacheKey := constants.RedisPollingCardInfoKey(cardID)
+	return m.redis.Del(ctx, cacheKey).Err()
+}
+
+// GetQueueDepth 获取分片队列深度（用于背压检测）
+func (m *PollingQueueManager) GetQueueDepth(ctx context.Context, shardID int, taskType string) (int64, error) {
+	key := constants.RedisPollingShardQueueKey(shardID, taskType)
+	return m.redis.ZCard(ctx, key).Result()
+}
+
+// GetTotalQueueDepth 获取指定任务类型的总队列深度（聚合所有分片）
+// 供 MonitoringService 使用，替代直接读取旧的非分片 Redis Key
+// 若任意分片查询失败，返回已累计的部分总量和第一个错误，调用方可据此判断数据完整性
+func (m *PollingQueueManager) GetTotalQueueDepth(ctx context.Context, taskType string) (int64, error) {
+	var total int64
+	var firstErr error
+	for i := 0; i < m.shardCount; i++ {
+		depth, err := m.GetQueueDepth(ctx, i, taskType)
+		if err != nil {
+			m.logger.Warn("获取分片队列深度失败",
+				zap.Int("shard_id", i),
+				zap.String("task_type", taskType),
+				zap.Error(err))
+			if firstErr == nil {
+				firstErr = err
+			}
+			continue
+		}
+		total += depth
+	}
+	return total, firstErr
+}
--- a/internal/polling/scheduler.go
+++ b/internal/polling/scheduler.go
@@ -2,144 +2,81 @@ package polling

 import (
 	"context"
-	"encoding/json"
 	"sync"
-	"sync/atomic"
 	"time"

 	"github.com/hibiken/asynq"
 	"github.com/redis/go-redis/v9"
 	"go.uber.org/zap"
-	"gorm.io/gorm"

-	"github.com/break/junhong_cmp_fiber/internal/model"
 	packagepkg "github.com/break/junhong_cmp_fiber/internal/service/package"
-	"github.com/break/junhong_cmp_fiber/internal/store/postgres"
 	"github.com/break/junhong_cmp_fiber/pkg/constants"
 )

+// InitProgress 已迁移到 initializer.go
+
 // Scheduler 轮询调度器
-// 负责管理 IoT 卡的定期检查任务（实名、流量、套餐）
+// 职责：读取分片 Sorted Set 中到期的卡，生成 Asynq 任务
+// 不再负责：配置加载、卡初始化（分别由 PollingConfigManager、PollingInitializer 负责）
 type Scheduler struct {
-	db               *gorm.DB
-	redis            *redis.Client
-	queueClient      *asynq.Client
-	logger           *zap.Logger
-	configStore      *postgres.PollingConfigStore
-	iotCardStore     *postgres.IotCardStore
-	concurrencyStore *postgres.PollingConcurrencyConfigStore
+	redis       *redis.Client
+	queueClient *asynq.Client
+	logger      *zap.Logger
+	queueMgr    *PollingQueueManager
+	configMgr   *PollingConfigManager
+	cfg         *SchedulerConfig // 启动时固定，避免每次调度重新创建

-	// 任务 19: 套餐激活检查处理器
 	packageActivationHandler *PackageActivationHandler
-	// 任务 20: 流量重置调度处理器
-	dataResetHandler *DataResetHandler
+	dataResetHandler         *DataResetHandler

-	// 配置缓存
-	configCache     []*model.PollingConfig
-	configCacheLock sync.RWMutex
-	configCacheTime time.Time
-
-	// 初始化状态
-	initProgress  *InitProgress
-	initCompleted atomic.Bool
-
-	// 控制信号
 	stopChan chan struct{}
 	wg       sync.WaitGroup
 }

-// InitProgress 初始化进度
-type InitProgress struct {
-	mu            sync.RWMutex
-	TotalCards    int64     `json:"total_cards"`     // 总卡数
-	LoadedCards   int64     `json:"loaded_cards"`    // 已加载卡数
-	StartTime     time.Time `json:"start_time"`      // 开始时间
-	LastBatchTime time.Time `json:"last_batch_time"` // 最后一批处理时间
-	Status        string    `json:"status"`          // 状态: pending, running, completed, failed
-	ErrorMessage  string    `json:"error_message"`   // 错误信息
-}
-
 // SchedulerConfig 调度器配置
-// 设计目标：支持一亿张卡规模
 type SchedulerConfig struct {
-	ScheduleInterval       time.Duration // 调度循环间隔（默认 1 秒，支持高吞吐）
-	InitBatchSize          int           // 初始化每批加载数量（默认 100000）
-	InitBatchSleepDuration time.Duration // 初始化批次间休眠时间（默认 500ms）
-	ConfigCacheTTL         time.Duration // 配置缓存 TTL（默认 5 分钟）
-	CardCacheTTL           time.Duration // 卡信息缓存 TTL（默认 7 天）
-	ScheduleBatchSize      int           // 每次调度取出的卡数（默认 50000）
-	MaxManualBatchSize     int           // 手动触发每次处理数量（默认 1000）
+	ScheduleInterval   time.Duration
+	MaxManualBatchSize int
+	ScheduleBatchSize  int
 }

 // DefaultSchedulerConfig 默认调度器配置
-// 单 Worker 设计吞吐：50000 张/秒，支持多 Worker 水平扩展
 func DefaultSchedulerConfig() *SchedulerConfig {
 	return &SchedulerConfig{
-		ScheduleInterval:       1 * time.Second,        // 1秒调度一次，提高响应速度
-		InitBatchSize:          100000,                 // 10万张/批初始化
-		InitBatchSleepDuration: 500 * time.Millisecond, // 500ms 间隔，加快初始化
-		ConfigCacheTTL:         5 * time.Minute,
-		CardCacheTTL:           7 * 24 * time.Hour,
-		ScheduleBatchSize:      50000, // 每次取 5 万张，每秒可调度 5 万张
-		MaxManualBatchSize:     1000,  // 手动触发每次处理 1000 张
+		ScheduleInterval:   1 * time.Second,
+		MaxManualBatchSize: 1000,
+		ScheduleBatchSize:  constants.PollingDequeueMaxBatchSize,
 	}
 }

-// NewScheduler 创建调度器实例
+// NewScheduler 创建调度器
 func NewScheduler(
-	db *gorm.DB,
 	redisClient *redis.Client,
 	queueClient *asynq.Client,
+	queueMgr *PollingQueueManager,
+	configMgr *PollingConfigManager,
 	logger *zap.Logger,
+	packageActivationHandler *PackageActivationHandler,
+	dataResetHandler *DataResetHandler,
 ) *Scheduler {
 	return &Scheduler{
-		db:                       db,
 		redis:                    redisClient,
 		queueClient:              queueClient,
+		queueMgr:                 queueMgr,
+		configMgr:                configMgr,
 		logger:                   logger,
-		configStore:              postgres.NewPollingConfigStore(db),
-		iotCardStore:             postgres.NewIotCardStore(db, redisClient),
-		concurrencyStore:         postgres.NewPollingConcurrencyConfigStore(db),
-		packageActivationHandler: NewPackageActivationHandler(db, redisClient, queueClient, nil, nil, logger),
-		dataResetHandler:         NewDataResetHandler(nil, logger), // ResetService 需要通过 SetResetService 注入
-		initProgress: &InitProgress{
-			Status: "pending",
-		},
-		stopChan: make(chan struct{}),
+		cfg:                      DefaultSchedulerConfig(),
+		stopChan:                 make(chan struct{}),
+		packageActivationHandler: packageActivationHandler,
+		dataResetHandler:         dataResetHandler,
 	}
 }

-// Start 启动调度器
-// 快速启动：10秒内完成配置加载和调度器启动
+// Start 启动调度循环（快速启动，配置加载和初始化由外部完成）
 func (s *Scheduler) Start(ctx context.Context) error {
-	startTime := time.Now()
-	s.logger.Info("轮询调度器启动中...")
-
-	// 1. 加载轮询配置到缓存
-	if err := s.loadConfigs(ctx); err != nil {
-		s.logger.Error("加载轮询配置失败", zap.Error(err))
-		return err
-	}
-	s.logger.Info("轮询配置已加载", zap.Int("config_count", len(s.configCache)))
-
-	// 2. 初始化并发控制配置
-	if err := s.initConcurrencyConfigs(ctx); err != nil {
-		s.logger.Warn("初始化并发控制配置失败，使用默认值", zap.Error(err))
-	}
-
-	// 3. 启动调度循环（非阻塞）
 	s.wg.Add(1)
 	go s.scheduleLoop(ctx)
-
-	// 4. 启动后台渐进式初始化（非阻塞）
-	s.wg.Add(1)
-	go s.progressiveInit(ctx)
-
-	elapsed := time.Since(startTime)
-	s.logger.Info("轮询调度器已启动",
-		zap.Duration("startup_time", elapsed),
-		zap.Bool("fast_start", elapsed < 10*time.Second))
-
+	s.logger.Info("轮询调度器已启动")
 	return nil
 }

@@ -151,115 +88,116 @@ func (s *Scheduler) Stop() {
 	s.logger.Info("轮询调度器已停止")
 }

-// loadConfigs 加载轮询配置到缓存
-func (s *Scheduler) loadConfigs(ctx context.Context) error {
-	configs, err := s.configStore.ListEnabled(ctx)
-	if err != nil {
-		return err
+// RefreshConfigs 刷新配置缓存
+func (s *Scheduler) RefreshConfigs(ctx context.Context) error {
+	if s.configMgr == nil {
+		return nil
 	}
-
-	s.configCacheLock.Lock()
-	s.configCache = configs
-	s.configCacheTime = time.Now()
-	s.configCacheLock.Unlock()
-
-	// 同步到 Redis 缓存
-	return s.syncConfigsToRedis(ctx, configs)
+	return s.configMgr.Load(ctx)
 }

-// syncConfigsToRedis 同步配置到 Redis
-func (s *Scheduler) syncConfigsToRedis(ctx context.Context, configs []*model.PollingConfig) error {
-	key := constants.RedisPollingConfigsCacheKey()
-
-	// 序列化配置列表为 JSON
-	configData := make([]interface{}, 0, len(configs)*2)
-	for _, cfg := range configs {
-		jsonData, err := json.Marshal(cfg)
-		if err != nil {
-			s.logger.Warn("序列化轮询配置失败", zap.Uint("config_id", cfg.ID), zap.Error(err))
-			continue
-		}
-		configData = append(configData, cfg.ID, string(jsonData))
+// SetStopResumeCallback 注入停复机回调（在 Start 前调用）
+func (s *Scheduler) SetStopResumeCallback(callback packagepkg.StopResumeCallback) {
+	if s.packageActivationHandler != nil {
+		s.packageActivationHandler.stopResumeCallback = callback
 	}
-
-	if len(configData) > 0 {
-		pipe := s.redis.Pipeline()
-		pipe.Del(ctx, key)
-		// 使用 HSET 存储配置
-		pipe.HSet(ctx, key, configData...)
-		pipe.Expire(ctx, key, 24*time.Hour)
-		_, err := pipe.Exec(ctx)
-		return err
-	}
-
-	return nil
-}
-
-// initConcurrencyConfigs 初始化并发控制配置到 Redis
-func (s *Scheduler) initConcurrencyConfigs(ctx context.Context) error {
-	configs, err := s.concurrencyStore.List(ctx)
-	if err != nil {
-		return err
-	}
-
-	for _, cfg := range configs {
-		key := constants.RedisPollingConcurrencyConfigKey(cfg.TaskType)
-		if err := s.redis.Set(ctx, key, cfg.MaxConcurrency, 0).Err(); err != nil {
-			s.logger.Warn("设置并发配置失败",
-				zap.String("task_type", cfg.TaskType),
-				zap.Error(err))
-		}
-	}
-
-	return nil
 }

 // scheduleLoop 调度循环
-// 每 10 秒执行一次，从 Redis Sorted Set 获取到期的卡，生成 Asynq 任务
 func (s *Scheduler) scheduleLoop(ctx context.Context) {
 	defer s.wg.Done()

-	config := DefaultSchedulerConfig()
-	ticker := time.NewTicker(config.ScheduleInterval)
+	ticker := time.NewTicker(s.cfg.ScheduleInterval)
+	activationTicker := time.NewTicker(10 * time.Second)
 	defer ticker.Stop()
+	defer activationTicker.Stop()

-	s.logger.Info("调度循环已启动", zap.Duration("interval", config.ScheduleInterval))
+	s.logger.Info("调度循环已启动", zap.Duration("interval", s.cfg.ScheduleInterval))

 	for {
 		select {
 		case <-s.stopChan:
 			s.logger.Info("调度循环收到停止信号")
 			return
+		case <-ctx.Done():
+			s.logger.Info("调度循环收到 ctx 取消信号")
+			return
 		case <-ticker.C:
-			s.processSchedule(ctx)
+			s.processShardSchedule(ctx)
+		case <-activationTicker.C:
+			s.processActivationTasks(ctx)
 		}
 	}
 }

-// processSchedule 处理一次调度
-func (s *Scheduler) processSchedule(ctx context.Context) {
-	now := time.Now().Unix()
+// processShardSchedule 处理手动队列和分片定时队列（每 1 秒触发）
+// 使用 90% 的 tick 间隔作为超时，确保单分片 Redis 挂起时不阻塞下一个 tick
+func (s *Scheduler) processShardSchedule(ctx context.Context) {
+	for _, taskType := range allTaskTypes {
+		s.processManualQueue(ctx, taskType, s.cfg.MaxManualBatchSize)
+	}

-	// 1. 优先处理手动触发队列
-	s.processManualQueue(ctx, constants.TaskTypePollingRealname)
-	s.processManualQueue(ctx, constants.TaskTypePollingCarddata)
-	s.processManualQueue(ctx, constants.TaskTypePollingPackage)
-	s.processManualQueue(ctx, constants.TaskTypePollingProtect)
+	if s.queueMgr == nil {
+		return
+	}

-	// 2. 处理定时队列
-	s.processTimedQueue(ctx, constants.RedisPollingQueueRealnameKey(), constants.TaskTypePollingRealname, now)
-	s.processTimedQueue(ctx, constants.RedisPollingQueueCarddataKey(), constants.TaskTypePollingCarddata, now)
-	s.processTimedQueue(ctx, constants.RedisPollingQueuePackageKey(), constants.TaskTypePollingPackage, now)
-	s.processTimedQueue(ctx, constants.RedisPollingQueueProtectKey(), constants.TaskTypePollingProtect, now)
+	timeout := s.cfg.ScheduleInterval * 9 / 10
+	tickCtx, cancel := context.WithTimeout(ctx, timeout)
+	defer cancel()

-	// 任务 19.6: 套餐激活检查（每次调度都执行，内部会限流）
+	var wg sync.WaitGroup
+	for shardID := 0; shardID < s.queueMgr.shardCount; shardID++ {
+		wg.Add(1)
+		go func(sid int) {
+			defer wg.Done()
+			defer func() {
+				if r := recover(); r != nil {
+					s.logger.Error("分片处理 panic，已恢复",
+						zap.Int("shard_id", sid), zap.Any("panic", r))
+				}
+			}()
+			s.processOneShard(tickCtx, sid)
+		}(shardID)
+	}
+	wg.Wait()
+}
+
+// processOneShard 处理单个分片的所有任务类型出队并推入 Asynq
+func (s *Scheduler) processOneShard(ctx context.Context, shardID int) {
+	for _, taskType := range allTaskTypes {
+		depth, err := s.queueMgr.GetQueueDepth(ctx, shardID, taskType)
+		if err != nil {
+			s.logger.Warn("获取分片队列深度失败",
+				zap.Int("shard_id", shardID), zap.String("task_type", taskType), zap.Error(err))
+		} else if depth > constants.PollingBackpressureThreshold {
+			s.logger.Debug("背压：分片队列积压过深，跳过本轮出队",
+				zap.Int("shard_id", shardID), zap.String("task_type", taskType), zap.Int64("depth", depth))
+			continue
+		}
+
+		entries, err := s.queueMgr.DequeueReady(ctx, shardID, taskType, s.cfg.ScheduleBatchSize)
+		if err != nil {
+			s.logger.Error("分片出队失败",
+				zap.Int("shard_id", shardID), zap.String("task_type", taskType), zap.Error(err))
+			continue
+		}
+		if len(entries) > 0 {
+			cardIDs := make([]string, len(entries))
+			for i, e := range entries {
+				cardIDs[i] = formatUint(e.CardID)
+			}
+			s.enqueueBatch(ctx, taskType, cardIDs)
+		}
+	}
+}
+
+// processActivationTasks 套餐激活检查和流量重置调度（每 10 秒触发）
+func (s *Scheduler) processActivationTasks(ctx context.Context) {
 	if s.packageActivationHandler != nil {
 		if err := s.packageActivationHandler.HandlePackageActivationCheck(ctx); err != nil {
 			s.logger.Warn("套餐激活检查失败", zap.Error(err))
 		}
 	}
-
-	// 任务 20.6: 流量重置调度（每次调度都执行，内部会限流）
 	if s.dataResetHandler != nil {
 		if err := s.dataResetHandler.HandleDataReset(ctx); err != nil {
 			s.logger.Warn("流量重置调度失败", zap.Error(err))
@@ -268,497 +206,43 @@ func (s *Scheduler) processSchedule(ctx context.Context) {
 }

 // processManualQueue 处理手动触发队列
-// 优化：批量读取和提交，提高吞吐
-func (s *Scheduler) processManualQueue(ctx context.Context, taskType string) {
-	config := DefaultSchedulerConfig()
+func (s *Scheduler) processManualQueue(ctx context.Context, taskType string, maxBatch int) {
 	key := constants.RedisPollingManualQueueKey(taskType)
-
-	// 批量读取手动触发任务
-	cardIDs := make([]string, 0, config.MaxManualBatchSize)
-	for i := 0; i < config.MaxManualBatchSize; i++ {
-		cardIDStr, err := s.redis.LPop(ctx, key).Result()
-		if err != nil {
-			if err != redis.Nil {
-				s.logger.Error("读取手动触发队列失败",
-					zap.String("task_type", taskType),
-					zap.Error(err))
-			}
-			break
-		}
-		cardIDs = append(cardIDs, cardIDStr)
-	}
-
-	// 批量提交任务
-	if len(cardIDs) > 0 {
-		s.enqueueBatch(ctx, taskType, cardIDs, true)
+	cardIDs, err := s.redis.LPopCount(ctx, key, maxBatch).Result()
+	if err != nil || len(cardIDs) == 0 {
+		return
 	}
+	s.enqueueBatch(ctx, taskType, cardIDs)
 }

-// processTimedQueue 处理定时队列
-// 优化：支持大批量处理，每次最多取 ScheduleBatchSize 张卡
-func (s *Scheduler) processTimedQueue(ctx context.Context, queueKey, taskType string, now int64) {
-	config := DefaultSchedulerConfig()
-
-	// 获取所有到期的卡（score <= now）
-	// 使用 ZRANGEBYSCORE 获取，每次最多取 ScheduleBatchSize 张
-	cardIDs, err := s.redis.ZRangeByScore(ctx, queueKey, &redis.ZRangeBy{
-		Min:   "-inf",
-		Max:   formatInt64(now),
-		Count: int64(config.ScheduleBatchSize),
-	}).Result()
-
-	if err != nil {
-		if err != redis.Nil {
-			s.logger.Error("读取定时队列失败",
-				zap.String("queue_key", queueKey),
-				zap.Error(err))
+// enqueueBatch 批量提交任务到 Asynq 队列；入队失败时回退至分片队列防止卡永久丢失
+func (s *Scheduler) enqueueBatch(ctx context.Context, taskType string, cardIDs []string) {
+	for _, cardID := range cardIDs {
+		payload := map[string]interface{}{
+			"card_id":   cardID,
+			"is_manual": false,
+			"timestamp": time.Now().Unix(),
 		}
-		return
-	}
-
-	if len(cardIDs) == 0 {
-		return
-	}
-
-	// 只在数量较大时打印日志，避免日志过多
-	if len(cardIDs) >= 1000 {
-		s.logger.Info("处理定时队列",
-			zap.String("task_type", taskType),
-			zap.Int("card_count", len(cardIDs)))
-	}
-
-	// 移除已取出的卡（使用最后一个卡的 score 作为边界，更精确）
-	if err := s.redis.ZRemRangeByScore(ctx, queueKey, "-inf", formatInt64(now)).Err(); err != nil {
-		s.logger.Error("移除已处理的卡失败", zap.Error(err))
-	}
-
-	// 批量提交任务（使用 goroutine 并行提交，提高吞吐）
-	s.enqueueBatch(ctx, taskType, cardIDs, false)
-}
-
-// enqueueBatch 批量提交任务到 Asynq 队列
-// 使用多 goroutine 并行提交，提高吞吐量
-func (s *Scheduler) enqueueBatch(ctx context.Context, taskType string, cardIDs []string, isManual bool) {
-	if len(cardIDs) == 0 {
-		return
-	}
-
-	// 分批并行提交，每批 1000 个，最多 10 个并行
-	batchSize := 1000
-	maxParallel := 10
-	sem := make(chan struct{}, maxParallel)
-	var wg sync.WaitGroup
-
-	for i := 0; i < len(cardIDs); i += batchSize {
-		end := i + batchSize
-		if end > len(cardIDs) {
-			end = len(cardIDs)
+		payloadBytes, marshalErr := marshalJSON(payload)
+		if marshalErr != nil {
+			s.logger.Error("序列化任务载荷失败，跳过该卡",
+				zap.String("task_type", taskType), zap.String("card_id", cardID), zap.Error(marshalErr))
+			continue
 		}
-		batch := cardIDs[i:end]
-
-		wg.Add(1)
-		sem <- struct{}{} // 获取信号量
-
-		go func(batch []string) {
-			defer wg.Done()
-			defer func() { <-sem }() // 释放信号量
-
-			for _, cardID := range batch {
-				if err := s.enqueueTask(ctx, taskType, cardID, isManual); err != nil {
-					s.logger.Warn("提交任务失败",
-						zap.String("task_type", taskType),
-						zap.String("card_id", cardID),
-						zap.Error(err))
+		task := asynq.NewTask(taskType, payloadBytes,
+			asynq.MaxRetry(0),
+			asynq.Timeout(30*time.Second),
+			asynq.Queue(constants.QueueDefault),
+		)
+		if _, err := s.queueClient.Enqueue(task); err != nil {
+			s.logger.Error("提交任务失败，回退至分片队列防止卡永久丢失",
+				zap.String("task_type", taskType), zap.String("card_id", cardID), zap.Error(err))
+			if id, parseErr := parseUint(cardID); parseErr == nil {
+				if reqErr := s.queueMgr.Requeue(ctx, id, taskType, time.Now()); reqErr != nil {
+					s.logger.Error("回退入队失败，卡可能永久丢失",
+						zap.String("card_id", cardID), zap.Error(reqErr))
 				}
 			}
-		}(batch)
-	}
-
-	wg.Wait()
-}
-
-// enqueueTask 提交任务到 Asynq 队列
-func (s *Scheduler) enqueueTask(ctx context.Context, taskType, cardID string, isManual bool) error {
-	payload := map[string]interface{}{
-		"card_id":   cardID,
-		"is_manual": isManual,
-		"timestamp": time.Now().Unix(),
-	}
-
-	task := asynq.NewTask(taskType, mustMarshal(payload),
-		asynq.MaxRetry(0),             // 不重试，失败后重新入队
-		asynq.Timeout(30*time.Second), // 30秒超时
-		asynq.Queue(constants.QueueDefault),
-	)
-
-	_, err := s.queueClient.Enqueue(task)
-	return err
-}
-
-// progressiveInit 渐进式初始化
-// 分批加载卡数据到 Redis，每批 10 万张，sleep 1 秒
-func (s *Scheduler) progressiveInit(ctx context.Context) {
-	defer s.wg.Done()
-
-	config := DefaultSchedulerConfig()
-
-	s.initProgress.mu.Lock()
-	s.initProgress.Status = "running"
-	s.initProgress.StartTime = time.Now()
-	s.initProgress.mu.Unlock()
-
-	s.logger.Info("开始渐进式初始化...")
-
-	// 获取总卡数
-	var totalCards int64
-	if err := s.db.Model(&model.IotCard{}).Count(&totalCards).Error; err != nil {
-		s.logger.Error("获取卡总数失败", zap.Error(err))
-		s.setInitError(err.Error())
-		return
-	}
-
-	s.initProgress.mu.Lock()
-	s.initProgress.TotalCards = totalCards
-	s.initProgress.mu.Unlock()
-
-	s.logger.Info("开始加载卡数据", zap.Int64("total_cards", totalCards))
-
-	// 使用游标分批加载
-	var lastID uint = 0
-	batchCount := 0
-
-	for {
-		select {
-		case <-s.stopChan:
-			s.logger.Info("渐进式初始化被中断")
-			return
-		default:
-		}
-
-		// 加载一批卡
-		var cards []*model.IotCard
-		err := s.db.WithContext(ctx).
-			Where("id > ?", lastID).
-			Order("id ASC").
-			Limit(config.InitBatchSize).
-			Find(&cards).Error
-
-		if err != nil {
-			s.logger.Error("加载卡数据失败", zap.Error(err))
-			s.setInitError(err.Error())
-			return
-		}
-
-		if len(cards) == 0 {
-			break
-		}
-
-		// 批量处理这批卡（使用 Pipeline 提高性能）
-		if err := s.initCardsBatch(ctx, cards); err != nil {
-			s.logger.Warn("批量初始化卡轮询失败", zap.Error(err))
-		}
-
-		lastID = cards[len(cards)-1].ID
-		batchCount++
-
-		s.initProgress.mu.Lock()
-		s.initProgress.LoadedCards += int64(len(cards))
-		s.initProgress.LastBatchTime = time.Now()
-		s.initProgress.mu.Unlock()
-
-		s.logger.Info("完成一批卡初始化",
-			zap.Int("batch", batchCount),
-			zap.Int("batch_size", len(cards)),
-			zap.Int64("loaded", s.initProgress.LoadedCards),
-			zap.Int64("total", totalCards))
-
-		// 批次间休眠，避免打爆数据库
-		time.Sleep(config.InitBatchSleepDuration)
-	}
-
-	s.initProgress.mu.Lock()
-	s.initProgress.Status = "completed"
-	s.initProgress.mu.Unlock()
-	s.initCompleted.Store(true)
-
-	s.logger.Info("渐进式初始化完成",
-		zap.Int64("total_loaded", s.initProgress.LoadedCards),
-		zap.Duration("duration", time.Since(s.initProgress.StartTime)))
-}
-
-// initCardsBatch 批量初始化卡的轮询
-// 使用 Redis Pipeline 批量写入，大幅提高初始化性能
-// 10万张卡从 ~60秒 优化到 ~5秒
-func (s *Scheduler) initCardsBatch(ctx context.Context, cards []*model.IotCard) error {
-	if len(cards) == 0 {
-		return nil
-	}
-
-	config := DefaultSchedulerConfig()
-	now := time.Now()
-	pipe := s.redis.Pipeline()
-
-	for _, card := range cards {
-		// 匹配配置
-		cfg := s.MatchConfig(card)
-		if cfg == nil {
-			continue // 无匹配配置，不需要轮询
-		}
-
-		// 添加到相应的轮询队列
-		if cfg.RealnameCheckInterval != nil && *cfg.RealnameCheckInterval > 0 {
-			nextCheck := s.calculateNextCheckTime(card.LastRealNameCheckAt, *cfg.RealnameCheckInterval)
-			pipe.ZAdd(ctx, constants.RedisPollingQueueRealnameKey(), redis.Z{
-				Score:  float64(nextCheck.Unix()),
-				Member: card.ID,
-			})
-		}
-
-		if cfg.CarddataCheckInterval != nil && *cfg.CarddataCheckInterval > 0 {
-			nextCheck := s.calculateNextCheckTime(card.LastDataCheckAt, *cfg.CarddataCheckInterval)
-			pipe.ZAdd(ctx, constants.RedisPollingQueueCarddataKey(), redis.Z{
-				Score:  float64(nextCheck.Unix()),
-				Member: card.ID,
-			})
-		}
-
-		if cfg.PackageCheckInterval != nil && *cfg.PackageCheckInterval > 0 {
-			nextCheck := s.calculateNextCheckTime(card.LastDataCheckAt, *cfg.PackageCheckInterval)
-			pipe.ZAdd(ctx, constants.RedisPollingQueuePackageKey(), redis.Z{
-				Score:  float64(nextCheck.Unix()),
-				Member: card.ID,
-			})
-		}
-
-		if cfg.ProtectCheckInterval != nil && *cfg.ProtectCheckInterval > 0 {
-			nextCheck := s.calculateNextCheckTime(card.LastProtectCheckAt, *cfg.ProtectCheckInterval)
-			pipe.ZAdd(ctx, constants.RedisPollingQueueProtectKey(), redis.Z{
-				Score:  float64(nextCheck.Unix()),
-				Member: card.ID,
-			})
-		}
-
-		// 缓存卡信息到 Redis
-		cacheKey := constants.RedisPollingCardInfoKey(card.ID)
-		cacheData := map[string]interface{}{
-			"id":               card.ID,
-			"iccid":            card.ICCID,
-			"card_category":    card.CardCategory,
-			"real_name_status": card.RealNameStatus,
-			"network_status":   card.NetworkStatus,
-			"carrier_id":       card.CarrierID,
-			"stop_reason":      card.StopReason,
-			"cached_at":        now.Unix(),
-		}
-		pipe.HSet(ctx, cacheKey, cacheData)
-		pipe.Expire(ctx, cacheKey, config.CardCacheTTL)
-	}
-
-	// 执行 Pipeline
-	_, err := pipe.Exec(ctx)
-	return err
-}
-
-// initCardPolling 初始化单张卡的轮询（保留用于懒加载场景）
-func (s *Scheduler) initCardPolling(ctx context.Context, card *model.IotCard) error {
-	// 匹配配置
-	config := s.MatchConfig(card)
-	if config == nil {
-		return nil // 无匹配配置，不需要轮询
-	}
-
-	now := time.Now()
-
-	// 添加到相应的轮询队列
-	if config.RealnameCheckInterval != nil && *config.RealnameCheckInterval > 0 {
-		nextCheck := s.calculateNextCheckTime(card.LastRealNameCheckAt, *config.RealnameCheckInterval)
-		if err := s.addToQueue(ctx, constants.RedisPollingQueueRealnameKey(), card.ID, nextCheck); err != nil {
-			return err
 		}
 	}
-
-	if config.CarddataCheckInterval != nil && *config.CarddataCheckInterval > 0 {
-		nextCheck := s.calculateNextCheckTime(card.LastDataCheckAt, *config.CarddataCheckInterval)
-		if err := s.addToQueue(ctx, constants.RedisPollingQueueCarddataKey(), card.ID, nextCheck); err != nil {
-			return err
-		}
-	}
-
-	if config.PackageCheckInterval != nil && *config.PackageCheckInterval > 0 {
-		// 套餐检查使用流量检查时间作为参考
-		nextCheck := s.calculateNextCheckTime(card.LastDataCheckAt, *config.PackageCheckInterval)
-		if err := s.addToQueue(ctx, constants.RedisPollingQueuePackageKey(), card.ID, nextCheck); err != nil {
-			return err
-		}
-	}
-
-	if config.ProtectCheckInterval != nil && *config.ProtectCheckInterval > 0 {
-		nextCheck := s.calculateNextCheckTime(card.LastProtectCheckAt, *config.ProtectCheckInterval)
-		if err := s.addToQueue(ctx, constants.RedisPollingQueueProtectKey(), card.ID, nextCheck); err != nil {
-			return err
-		}
-	}
-
-	// 缓存卡信息到 Redis
-	return s.cacheCardInfo(ctx, card, now)
-}
-
-// MatchConfig 匹配轮询配置
-// 按优先级返回第一个匹配的配置
-func (s *Scheduler) MatchConfig(card *model.IotCard) *model.PollingConfig {
-	s.configCacheLock.RLock()
-	defer s.configCacheLock.RUnlock()
-
-	for _, cfg := range s.configCache {
-		if s.matchConfigConditions(cfg, card) {
-			return cfg
-		}
-	}
-
-	return nil
-}
-
-// matchConfigConditions 检查卡是否匹配配置条件
-func (s *Scheduler) matchConfigConditions(cfg *model.PollingConfig, card *model.IotCard) bool {
-	// 检查卡状态条件
-	if cfg.CardCondition != "" {
-		cardCondition := s.getCardCondition(card)
-		if cfg.CardCondition != cardCondition {
-			return false
-		}
-	}
-
-	// 检查卡业务类型
-	if cfg.CardCategory != "" {
-		if cfg.CardCategory != card.CardCategory {
-			return false
-		}
-	}
-
-	// 检查运营商
-	if cfg.CarrierID != nil {
-		if *cfg.CarrierID != card.CarrierID {
-			return false
-		}
-	}
-
-	return true
-}
-
-// getCardCondition 获取卡的状态条件
-func (s *Scheduler) getCardCondition(card *model.IotCard) string {
-	if card.RealNameStatus != constants.RealNameStatusVerified {
-		return "not_real_name"
-	}
-	if card.NetworkStatus == 1 {
-		return "activated"
-	}
-	return "real_name"
-}
-
-// calculateNextCheckTime 计算下次检查时间
-func (s *Scheduler) calculateNextCheckTime(lastCheckAt *time.Time, intervalSeconds int) time.Time {
-	now := time.Now()
-
-	if lastCheckAt == nil {
-		// 首次检查，立即执行（加上随机抖动避免集中）
-		jitter := time.Duration(now.UnixNano()%int64(intervalSeconds)) * time.Second / 10
-		return now.Add(jitter)
-	}
-
-	// 计算下次检查时间
-	nextCheck := lastCheckAt.Add(time.Duration(intervalSeconds) * time.Second)
-	if nextCheck.Before(now) {
-		// 如果已过期，立即执行
-		return now
-	}
-
-	return nextCheck
-}
-
-// addToQueue 添加卡到轮询队列
-func (s *Scheduler) addToQueue(ctx context.Context, queueKey string, cardID uint, nextCheck time.Time) error {
-	score := float64(nextCheck.Unix())
-	member := formatUint(cardID)
-
-	return s.redis.ZAdd(ctx, queueKey, redis.Z{
-		Score:  score,
-		Member: member,
-	}).Err()
-}
-
-// cacheCardInfo 缓存卡信息到 Redis
-func (s *Scheduler) cacheCardInfo(ctx context.Context, card *model.IotCard, cachedAt time.Time) error {
-	key := constants.RedisPollingCardInfoKey(card.ID)
-	config := DefaultSchedulerConfig()
-
-	data := map[string]interface{}{
-		"id":               card.ID,
-		"iccid":            card.ICCID,
-		"card_category":    card.CardCategory,
-		"real_name_status": card.RealNameStatus,
-		"network_status":   card.NetworkStatus,
-		"carrier_id":       card.CarrierID,
-		"stop_reason":      card.StopReason,
-		"cached_at":        cachedAt.Unix(),
-	}
-
-	pipe := s.redis.Pipeline()
-	pipe.HSet(ctx, key, data)
-	pipe.Expire(ctx, key, config.CardCacheTTL)
-	_, err := pipe.Exec(ctx)
-
-	return err
-}
-
-// setInitError 设置初始化错误
-func (s *Scheduler) setInitError(msg string) {
-	s.initProgress.mu.Lock()
-	s.initProgress.Status = "failed"
-	s.initProgress.ErrorMessage = msg
-	s.initProgress.mu.Unlock()
-}
-
-// GetInitProgress 获取初始化进度
-func (s *Scheduler) GetInitProgress() InitProgress {
-	s.initProgress.mu.RLock()
-	defer s.initProgress.mu.RUnlock()
-
-	return InitProgress{
-		TotalCards:    s.initProgress.TotalCards,
-		LoadedCards:   s.initProgress.LoadedCards,
-		StartTime:     s.initProgress.StartTime,
-		LastBatchTime: s.initProgress.LastBatchTime,
-		Status:        s.initProgress.Status,
-		ErrorMessage:  s.initProgress.ErrorMessage,
-	}
-}
-
-// IsInitCompleted 检查初始化是否完成
-func (s *Scheduler) IsInitCompleted() bool {
-	return s.initCompleted.Load()
-}
-
-// RefreshConfigs 刷新配置缓存
-func (s *Scheduler) RefreshConfigs(ctx context.Context) error {
-	return s.loadConfigs(ctx)
-}
-
-// SetResetService 设置流量重置服务（用于依赖注入）
-func (s *Scheduler) SetResetService(resetService interface{}) {
-	if rs, ok := resetService.(*DataResetHandler); ok {
-		s.dataResetHandler = rs
-	}
-}
-
-// SetActivationService 设置套餐激活服务（用于依赖注入）
-func (s *Scheduler) SetActivationService(activationHandler *PackageActivationHandler) {
-	s.packageActivationHandler = activationHandler
-}
-
-// SetStopResumeCallback 注入停复机回调（用于套餐过期后主动触发停机）
-func (s *Scheduler) SetStopResumeCallback(callback packagepkg.StopResumeCallback) {
-	if s.packageActivationHandler != nil {
-		s.packageActivationHandler.stopResumeCallback = callback
-	}
 }
--- a/internal/polling/utils.go
+++ b/internal/polling/utils.go
@@ -6,23 +6,13 @@ import (
 	"github.com/bytedance/sonic"
 )

-// formatInt64 将 int64 转换为字符串
-func formatInt64(n int64) string {
-	return strconv.FormatInt(n, 10)
-}
-
 // formatUint 将 uint 转换为字符串
 func formatUint(n uint) string {
 	return strconv.FormatUint(uint64(n), 10)
 }

-// mustMarshal 序列化为 JSON，失败时 panic
-func mustMarshal(v interface{}) []byte {
-	data, err := sonic.Marshal(v)
-	if err != nil {
-		panic(err)
-	}
-	return data
+func marshalJSON(v interface{}) ([]byte, error) {
+	return sonic.Marshal(v)
 }

 // parseUint 将字符串解析为 uint
@@ -33,3 +23,11 @@ func parseUint(s string) (uint, error) {
 	}
 	return uint(n), nil
 }
+
+// boolToStr 布尔值转字符串（Redis Hash 存储用）
+func boolToStr(b bool) string {
+	if b {
+		return "1"
+	}
+	return "0"
+}
--- a/internal/routes/asset.go
+++ b/internal/routes/asset.go
@@ -109,4 +109,13 @@ func registerAssetRoutes(router fiber.Router, handler *admin.AssetHandler, walle
 		Output:      new(dto.AssetWalletTransactionListResponse),
 		Auth:        true,
 	})
+
+	Register(assets, doc, groupPath, "PATCH", "/:asset_type/:id/polling-status", handler.UpdatePollingStatus, RouteSpec{
+		Summary:     "更新资产轮询状态",
+		Description: "启用或禁用指定资产（IoT卡或设备）的定期状态轮询。asset_type 为 iot_card 或 device。",
+		Tags:        []string{"资产管理"},
+		Input:       new(dto.UpdateAssetPollingStatusRequest),
+		Output:      new(dto.UpdateAssetPollingStatusResponse),
+		Auth:        true,
+	})
 }
--- a/internal/service/iot_card/stop_resume_service.go
+++ b/internal/service/iot_card/stop_resume_service.go
@@ -17,12 +17,22 @@ import (
 	"github.com/break/junhong_cmp_fiber/pkg/errors"
 )

+// StopResumeServiceInterface 停复机服务接口
+// 供 4 个 Task Handler 通过接口注入，避免循环依赖
+type StopResumeServiceInterface interface {
+	// EvaluateAndAct 停复机统一入口，根据卡的当前状态自动判断并执行停机或复机
+	EvaluateAndAct(ctx context.Context, card *model.IotCard) error
+}
+
+// 编译时验证 StopResumeService 实现了 StopResumeServiceInterface
+var _ StopResumeServiceInterface = (*StopResumeService)(nil)
+
 // StopResumeService 停复机服务
 // 处理 IoT 卡的自动停机、复机和手动停复机逻辑
 type StopResumeService struct {
-	db                    *gorm.DB
 	redis                 *redis.Client
 	iotCardStore          *postgres.IotCardStore
+	packageUsageStore     *postgres.PackageUsageStore
 	deviceSimBindingStore *postgres.DeviceSimBindingStore
 	gatewayClient         *gateway.Client
 	logger                *zap.Logger
@@ -33,17 +43,17 @@ type StopResumeService struct {

 // NewStopResumeService 创建停复机服务
 func NewStopResumeService(
-	db *gorm.DB,
 	redis *redis.Client,
 	iotCardStore *postgres.IotCardStore,
+	packageUsageStore *postgres.PackageUsageStore,
 	deviceSimBindingStore *postgres.DeviceSimBindingStore,
 	gatewayClient *gateway.Client,
 	logger *zap.Logger,
 ) *StopResumeService {
 	return &StopResumeService{
-		db:                    db,
 		redis:                 redis,
 		iotCardStore:          iotCardStore,
+		packageUsageStore:     packageUsageStore,
 		deviceSimBindingStore: deviceSimBindingStore,
 		gatewayClient:         gatewayClient,
 		logger:                logger,
@@ -52,79 +62,297 @@ func NewStopResumeService(
 	}
 }

-// CheckAndStopCard 任务 24.3: 检查流量耗尽并停机
-// 当所有套餐流量用完时，调用运营商接口停机
+// EvaluateAndAct 停复机统一入口
+// 根据卡的当前网络状态，自动判断并执行停机或复机操作
+// 设备/单卡维度通过 card.IsStandalone 推导（false 则为设备维度，停/复机覆盖设备下所有卡）
+func (s *StopResumeService) EvaluateAndAct(ctx context.Context, card *model.IotCard) error {
+	switch card.NetworkStatus {
+	case constants.NetworkStatusOnline:
+		// 卡在线，检查是否需要停机
+		reasons, err := s.checkStopReasons(ctx, card)
+		if err != nil {
+			return err
+		}
+		if len(reasons) == 0 {
+			return nil
+		}
+		// 取最高优先级原因（第一个）
+		primaryReason := reasons[0]
+		if !card.IsStandalone {
+			deviceID, bound, lookupErr := s.getCardDeviceID(ctx, card)
+			if lookupErr != nil {
+				s.logger.Error("查询设备绑定关系失败，降级为单卡停机",
+					zap.Uint("card_id", card.ID), zap.Error(lookupErr))
+				// 降级：查不到绑定时按单卡处理
+			} else if bound {
+				s.stopDeviceCards(ctx, deviceID, primaryReason)
+				return nil
+			}
+		}
+		return s.stopCardWithRetry(ctx, card, primaryReason)
+
+	case constants.NetworkStatusOffline:
+		// 卡停机，检查是否可以复机
+		// 只处理轮询系统引起的停机原因（手动停机等不自动复机）
+		if !isPollingStopReason(card.StopReason) {
+			return nil
+		}
+		shouldResume, err := s.shouldResume(ctx, card)
+		if err != nil {
+			return err
+		}
+		if !shouldResume {
+			return nil
+		}
+		if !card.IsStandalone {
+			deviceID, bound, lookupErr := s.getCardDeviceID(ctx, card)
+			if lookupErr != nil {
+				s.logger.Error("查询设备绑定关系失败，降级为单卡复机",
+					zap.Uint("card_id", card.ID), zap.Error(lookupErr))
+			} else if bound {
+				s.resumeDeviceCards(ctx, deviceID)
+				return nil
+			}
+		}
+		return s.resumeSingleCard(ctx, card.ID)
+
+	default:
+		return nil
+	}
+}
+
+// isPollingStopReason 判断停机原因是否为轮询系统引起（可自动复机）
+func isPollingStopReason(reason string) bool {
+	switch reason {
+	case constants.StopReasonTrafficExhausted,
+		constants.StopReasonNoPackage,
+		constants.StopReasonNotRealname:
+		return true
+	}
+	return false
+}
+
+// getCardDeviceID 获取卡所属设备ID（非独立卡时有效）
+// 返回：deviceID, isDeviceBound, error
+func (s *StopResumeService) getCardDeviceID(ctx context.Context, card *model.IotCard) (uint, bool, error) {
+	if card.IsStandalone {
+		return 0, false, nil
+	}
+	binding, err := s.deviceSimBindingStore.GetActiveBindingByCardID(ctx, card.ID)
+	if err != nil {
+		if stderrors.Is(err, gorm.ErrRecordNotFound) {
+			return 0, false, nil
+		}
+		return 0, false, err
+	}
+	if binding == nil {
+		return 0, false, nil
+	}
+	return binding.DeviceID, true, nil
+}
+
+// hasValidPackage 检查卡是否有有效套餐（status IN 0,1）
+// 修复Bug1：绑定设备的卡查 device_id，独立卡查 iot_card_id
+func (s *StopResumeService) hasValidPackage(ctx context.Context, card *model.IotCard) (bool, error) {
+	if !card.IsStandalone {
+		deviceID, bound, lookupErr := s.getCardDeviceID(ctx, card)
+		if lookupErr != nil {
+			return false, lookupErr
+		}
+		if bound {
+			return s.packageUsageStore.HasValidByCarrier(ctx, "device", deviceID)
+		}
+	}
+	return s.packageUsageStore.HasValidByCarrier(ctx, "iot_card", card.ID)
+}
+
+// isTrafficExhausted 检查卡的流量是否已耗尽
+// 条件：活跃套餐 status=2（已用完），或 data_usage_mb >= data_limit_mb（data_limit_mb > 0）
+// 业务约定：data_limit_mb=0 表示无限流量套餐，永远不判定为耗尽
+func (s *StopResumeService) isTrafficExhausted(ctx context.Context, card *model.IotCard) (bool, error) {
+	carrierType := "iot_card"
+	carrierID := card.ID
+
+	if !card.IsStandalone {
+		deviceID, bound, lookupErr := s.getCardDeviceID(ctx, card)
+		if lookupErr != nil {
+			return false, lookupErr
+		}
+		if bound {
+			carrierType = "device"
+			carrierID = deviceID
+		}
+	}
+
+	pkg, err := s.packageUsageStore.GetActiveOrDepletedByCarrier(ctx, carrierType, carrierID)
+	if err != nil {
+		if stderrors.Is(err, gorm.ErrRecordNotFound) {
+			return false, nil
+		}
+		return false, err
+	}
+
+	if pkg.Status == constants.PackageUsageStatusDepleted {
+		return true, nil
+	}
+	return pkg.DataLimitMB > 0 && pkg.DataUsageMB >= pkg.DataLimitMB, nil
+}
+
+// isRealnameOK 检查卡是否满足实名要求
+// 行业卡（card_category='industry'）无需实名；其他卡需 real_name_status=1
+func (s *StopResumeService) isRealnameOK(card *model.IotCard) bool {
+	return card.CardCategory == constants.CardCategoryIndustry ||
+		card.RealNameStatus == constants.RealNameStatusVerified
+}
+
+// checkStopReasons 检查卡的停机原因列表，按优先级排序
+// 优先级：no_package > traffic_exhausted > not_realname
+func (s *StopResumeService) checkStopReasons(ctx context.Context, card *model.IotCard) ([]string, error) {
+	var reasons []string
+
+	// 条件A：无有效套餐（优先级最高）
+	hasPackage, err := s.hasValidPackage(ctx, card)
+	if err != nil {
+		return nil, err
+	}
+	if !hasPackage {
+		reasons = append(reasons, constants.StopReasonNoPackage)
+	}
+
+	// 条件B：虚流量耗尽
+	exhausted, err := s.isTrafficExhausted(ctx, card)
+	if err != nil {
+		return nil, err
+	}
+	if exhausted {
+		reasons = append(reasons, constants.StopReasonTrafficExhausted)
+	}
+
+	// 条件C：非行业卡且未实名
+	if !s.isRealnameOK(card) {
+		reasons = append(reasons, constants.StopReasonNotRealname)
+	}
+
+	return reasons, nil
+}
+
+// shouldResume 检查停机卡是否满足复机条件
+// 须同时满足：有有效套餐 + 流量未耗尽 + 实名OK
+func (s *StopResumeService) shouldResume(ctx context.Context, card *model.IotCard) (bool, error) {
+	hasPackage, err := s.hasValidPackage(ctx, card)
+	if err != nil {
+		return false, err
+	}
+	if !hasPackage {
+		return false, nil
+	}
+
+	exhausted, err := s.isTrafficExhausted(ctx, card)
+	if err != nil {
+		return false, err
+	}
+	if exhausted {
+		return false, nil
+	}
+
+	return s.isRealnameOK(card), nil
+}
+
+// stopDeviceCards 停机设备下所有在线卡（含设备维度幂等锁）
+// 防止设备下多张卡并发触发 EvaluateAndAct 导致重复 Gateway 停机调用
+func (s *StopResumeService) stopDeviceCards(ctx context.Context, deviceID uint, stopReason string) {
+	// 设备维度幂等锁：防止多协程同时对同一设备停机
+	lockKey := constants.RedisPollingDeviceOpLockKey(deviceID)
+	locked, _ := s.redis.SetNX(ctx, lockKey, "1", 30*time.Second).Result()
+	if !locked {
+		s.logger.Debug("设备停机操作已在进行中，跳过重复调用",
+			zap.Uint("device_id", deviceID))
+		return
+	}
+	defer s.redis.Del(ctx, lockKey)
+
+	// 查询设备下所有在线卡
+	cards, err := s.iotCardStore.ListByDeviceIDAndNetworkStatus(ctx, deviceID, constants.NetworkStatusOnline)
+	if err != nil {
+		s.logger.Error("查询设备在线卡失败",
+			zap.Uint("device_id", deviceID), zap.Error(err))
+		return
+	}
+
+	for _, card := range cards {
+		if stopErr := s.stopCardWithRetry(ctx, card, stopReason); stopErr != nil {
+			s.logger.Warn("设备卡停机失败，继续处理其他卡",
+				zap.Uint("device_id", deviceID),
+				zap.Uint("card_id", card.ID),
+				zap.Error(stopErr))
+		}
+	}
+}
+
+// resumeDeviceCards 复机设备下满足条件的停机卡（含设备维度幂等锁）
+// 遍历时对每张卡检查实名状态：未实名普通卡更新 stop_reason='not_realname' 后跳过
+func (s *StopResumeService) resumeDeviceCards(ctx context.Context, deviceID uint) {
+	// 设备维度幂等锁：与 stopDeviceCards 共用，防止停/复机并发
+	lockKey := constants.RedisPollingDeviceOpLockKey(deviceID)
+	locked, _ := s.redis.SetNX(ctx, lockKey, "1", 30*time.Second).Result()
+	if !locked {
+		s.logger.Debug("设备复机操作已在进行中，跳过重复调用",
+			zap.Uint("device_id", deviceID))
+		return
+	}
+	defer s.redis.Del(ctx, lockKey)
+
+	// 查询设备下因轮询原因停机的卡
+	cards, err := s.iotCardStore.ListByDeviceIDAndPollingStopReasons(ctx, deviceID)
+	if err != nil {
+		s.logger.Error("查询设备停机卡失败",
+			zap.Uint("device_id", deviceID), zap.Error(err))
+		return
+	}
+
+	for _, card := range cards {
+		if !s.isRealnameOK(card) {
+			if updateErr := s.iotCardStore.UpdateStopReason(ctx, card.ID, constants.StopReasonNotRealname); updateErr != nil {
+				s.logger.Warn("更新未实名卡停机原因失败",
+					zap.Uint("card_id", card.ID), zap.Error(updateErr))
+			}
+			continue
+		}
+		if resumeErr := s.resumeSingleCard(ctx, card.ID); resumeErr != nil {
+			s.logger.Warn("设备卡复机失败，继续处理其他卡",
+				zap.Uint("device_id", deviceID),
+				zap.Uint("card_id", card.ID),
+				zap.Error(resumeErr))
+		}
+	}
+}
+
+// CheckAndStopCard 检查流量耗尽并停机（旧入口，保留兼容性）
+// 新代码应优先使用 EvaluateAndAct
 func (s *StopResumeService) CheckAndStopCard(ctx context.Context, cardID uint) error {
-	// 查询卡信息
 	card, err := s.iotCardStore.GetByID(ctx, cardID)
 	if err != nil {
 		return err
 	}
-
-	// 如果已经是停机状态，跳过
-	if card.NetworkStatus == constants.NetworkStatusOffline {
-		s.logger.Debug("卡已处于停机状态，跳过",
-			zap.Uint("card_id", cardID))
-		return nil
-	}
-
-	// 检查是否有可用套餐（status=1 生效中 或 status=0 待生效）
-	hasAvailablePackage, err := s.hasAvailablePackage(ctx, cardID)
-	if err != nil {
-		return err
-	}
-
-	// 如果还有可用套餐，不停机
-	if hasAvailablePackage {
-		return nil
-	}
-
-	// 任务 24.5: 调用运营商停机接口（带重试机制）
-	if err := s.stopCardWithRetry(ctx, card); err != nil {
-		s.logger.Error("调用运营商停机接口失败",
-			zap.Uint("card_id", cardID),
-			zap.String("iccid", card.ICCID),
-			zap.Error(err))
-		return err
-	}
-
-	// 更新卡状态
-	now := time.Now()
-	if err := s.db.WithContext(ctx).Model(card).Updates(map[string]any{
-		"network_status": constants.NetworkStatusOffline,
-		"stopped_at":     now,
-		"stop_reason":    constants.StopReasonTrafficExhausted,
-	}).Error; err != nil {
-		return err
-	}
-
-	// 失效轮询缓存，确保下次轮询从 DB 读取最新状态
-	s.invalidatePollingCache(cardID)
-
-	s.logger.Info("卡因流量耗尽已停机",
-		zap.Uint("card_id", cardID),
-		zap.String("iccid", card.ICCID))
-
-	return nil
+	return s.EvaluateAndAct(ctx, card)
 }

 // ResumeCardIfStopped 套餐激活或流量重置后自动复机入口
-// 支持 iot_card 和 device 两种载体类型：
-//   - iot_card：对单张卡执行实名检查 → 停机原因检查 → 分布式锁 → Gateway → 更新 DB
-//   - device：查询设备下所有已绑定卡，逐一执行单卡复机逻辑
+// 支持 iot_card 和 device 两种载体类型
 func (s *StopResumeService) ResumeCardIfStopped(ctx context.Context, carrierType string, carrierID uint) error {
 	switch carrierType {
 	case "iot_card":
 		return s.resumeSingleCard(ctx, carrierID)
 	case "device":
-		return s.resumeDeviceCards(ctx, carrierID)
+		s.resumeDeviceCards(ctx, carrierID)
+		return nil
 	default:
 		return nil
 	}
 }

 // resumeSingleCard 对单张卡执行复机逻辑
-// 依次检查：已开机则跳过 → 未实名则跳过（WARN）→ 非流量耗尽停机则跳过 → 加锁 → 调 Gateway → 更新 DB
+// 依次检查：已开机则跳过 → 非轮询停机原因则跳过 → 不满足复机条件则跳过 → 加锁 → 调 Gateway → 更新 DB
 func (s *StopResumeService) resumeSingleCard(ctx context.Context, cardID uint) error {
 	card, err := s.iotCardStore.GetByID(ctx, cardID)
 	if err != nil {
@@ -135,17 +363,20 @@ func (s *StopResumeService) resumeSingleCard(ctx context.Context, cardID uint) e
 		return nil
 	}

-	if card.RealNameStatus != constants.RealNameStatusVerified {
-		s.logger.Warn("未实名卡跳过自动复机",
+	// 只处理轮询系统引起的停机
+	if !isPollingStopReason(card.StopReason) {
+		s.logger.Debug("卡非轮询停机原因，不自动复机",
 			zap.Uint("card_id", cardID),
-			zap.String("iccid", card.ICCID))
+			zap.String("stop_reason", card.StopReason))
 		return nil
 	}

-	if card.StopReason != constants.StopReasonTrafficExhausted {
-		s.logger.Debug("卡非流量耗尽停机，不自动复机",
-			zap.Uint("card_id", cardID),
-			zap.String("stop_reason", card.StopReason))
+	// 检查复机条件
+	resume, err := s.shouldResume(ctx, card)
+	if err != nil {
+		return err
+	}
+	if !resume {
 		return nil
 	}

@@ -173,12 +404,11 @@ func (s *StopResumeService) resumeSingleCard(ctx context.Context, cardID uint) e
 	}

 	now := time.Now()
-	if err := s.db.WithContext(ctx).Model(card).Updates(map[string]any{
+	if err := s.iotCardStore.UpdateFields(ctx, cardID, map[string]any{
 		"network_status": constants.NetworkStatusOnline,
 		"resumed_at":     now,
 		"stop_reason":    "",
-	}).Error; err != nil {
-		// Gateway 成功但 DB 更新失败：记录 ERROR 供人工排查，不阻断流程
+	}); err != nil {
 		s.logger.Error("复机 Gateway 成功但 DB 更新失败",
 			zap.Uint("card_id", cardID),
 			zap.String("iccid", card.ICCID),
@@ -186,7 +416,7 @@ func (s *StopResumeService) resumeSingleCard(ctx context.Context, cardID uint) e
 		return nil
 	}

-	s.invalidatePollingCache(cardID)
+	s.invalidatePollingCache(ctx, card.ID)

 	s.logger.Info("卡已自动复机",
 		zap.Uint("card_id", cardID),
@@ -195,56 +425,16 @@ func (s *StopResumeService) resumeSingleCard(ctx context.Context, cardID uint) e
 	return nil
 }

-// resumeDeviceCards 对设备绑定的所有已绑定卡逐一执行复机逻辑
-// 部分卡实名、部分未实名时：已实名卡复机，未实名卡跳过，互不影响
-func (s *StopResumeService) resumeDeviceCards(ctx context.Context, deviceID uint) error {
-	bindings, err := s.deviceSimBindingStore.ListByDeviceID(ctx, deviceID)
-	if err != nil {
-		s.logger.Warn("查询设备绑定卡失败",
-			zap.Uint("device_id", deviceID),
-			zap.Error(err))
-		return nil
-	}
-
-	for _, binding := range bindings {
-		if resumeErr := s.resumeSingleCard(ctx, binding.IotCardID); resumeErr != nil {
-			s.logger.Warn("设备绑定卡复机失败，继续处理其他卡",
-				zap.Uint("device_id", deviceID),
-				zap.Uint("card_id", binding.IotCardID),
-				zap.Error(resumeErr))
-		}
-	}
-
-	return nil
-}
-
-// hasAvailablePackage 检查是否有可用套餐
-func (s *StopResumeService) hasAvailablePackage(ctx context.Context, cardID uint) (bool, error) {
-	var count int64
-	err := s.db.WithContext(ctx).Model(&model.PackageUsage{}).
-		Where("iot_card_id = ?", cardID).
-		Where("status IN ?", []int{
-			constants.PackageUsageStatusPending, // 待生效
-			constants.PackageUsageStatusActive,  // 生效中
-		}).
-		Count(&count).Error
-
-	if err != nil {
-		return false, err
-	}
-
-	return count > 0, nil
-}
-
-// stopCardWithRetry 任务 24.5: 调用运营商停机接口（带重试机制）
-func (s *StopResumeService) stopCardWithRetry(ctx context.Context, card *model.IotCard) error {
+// stopCardWithRetry 调用运营商停机接口（带重试机制），并更新 DB 停机原因
+func (s *StopResumeService) stopCardWithRetry(ctx context.Context, card *model.IotCard, stopReason string) error {
 	if s.gatewayClient == nil {
 		return errors.New(errors.CodeInternalError, "Gateway 未配置，停复机操作不可用")
 	}

 	s.logger.Info("调用网关停机",
 		zap.Uint("card_id", card.ID),
-		zap.String("iccid", card.ICCID))
+		zap.String("iccid", card.ICCID),
+		zap.String("stop_reason", stopReason))

 	var lastErr error
 	for i := 0; i < s.maxRetries; i++ {
@@ -262,6 +452,20 @@ func (s *StopResumeService) stopCardWithRetry(ctx context.Context, card *model.I
 			s.logger.Info("网关停机成功",
 				zap.Uint("card_id", card.ID),
 				zap.String("iccid", card.ICCID))
+
+			now := time.Now()
+			if updateErr := s.iotCardStore.UpdateFields(ctx, card.ID, map[string]any{
+				"network_status": constants.NetworkStatusOffline,
+				"stopped_at":     now,
+				"stop_reason":    stopReason,
+			}); updateErr != nil {
+				s.logger.Error("停机 Gateway 成功但 DB 更新失败",
+					zap.Uint("card_id", card.ID),
+					zap.String("iccid", card.ICCID),
+					zap.Error(updateErr))
+			}
+
+			s.invalidatePollingCache(ctx, card.ID)
 			return nil
 		}

@@ -275,7 +479,7 @@ func (s *StopResumeService) stopCardWithRetry(ctx context.Context, card *model.I
 	return lastErr
 }

-// resumeCardWithRetry 任务 24.5: 调用运营商复机接口（带重试机制）
+// resumeCardWithRetry 调用运营商复机接口（带重试机制）
 func (s *StopResumeService) resumeCardWithRetry(ctx context.Context, card *model.IotCard) error {
 	if s.gatewayClient == nil {
 		return errors.New(errors.CodeInternalError, "Gateway 未配置，停复机操作不可用")
@@ -338,21 +542,10 @@ func (s *StopResumeService) ManualStopCard(ctx context.Context, iccid string) er
 		}
 	}

-	if err := s.stopCardWithRetry(ctx, card); err != nil {
+	if err := s.stopCardWithRetry(ctx, card, constants.StopReasonManual); err != nil {
 		return errors.Wrap(errors.CodeGatewayError, err, "调用运营商停机失败，请稍后重试")
 	}

-	now := time.Now()
-	if err := s.db.WithContext(ctx).Model(card).Updates(map[string]any{
-		"network_status": constants.NetworkStatusOffline,
-		"stopped_at":     now,
-		"stop_reason":    constants.StopReasonManual,
-	}).Error; err != nil {
-		return errors.Wrap(errors.CodeDatabaseError, err, "更新卡状态失败")
-	}
-
-	s.invalidatePollingCache(card.ID)
-
 	return nil
 }

@@ -385,26 +578,26 @@ func (s *StopResumeService) ManualStartCard(ctx context.Context, iccid string) e
 	}

 	now := time.Now()
-	if err := s.db.WithContext(ctx).Model(card).Updates(map[string]any{
+	if err := s.iotCardStore.UpdateFields(ctx, card.ID, map[string]any{
 		"network_status": constants.NetworkStatusOnline,
 		"resumed_at":     now,
 		"stop_reason":    "",
-	}).Error; err != nil {
+	}); err != nil {
 		return errors.Wrap(errors.CodeDatabaseError, err, "更新卡状态失败")
 	}

-	s.invalidatePollingCache(card.ID)
+	s.invalidatePollingCache(ctx, card.ID)

 	return nil
 }

 // invalidatePollingCache 删除轮询卡缓存，下次轮询自动从 DB 重建
-func (s *StopResumeService) invalidatePollingCache(cardID uint) {
+func (s *StopResumeService) invalidatePollingCache(ctx context.Context, cardID uint) {
 	if s.redis == nil {
 		return
 	}
 	key := constants.RedisPollingCardInfoKey(cardID)
-	if err := s.redis.Del(context.Background(), key).Err(); err != nil {
-		s.logger.Warn("删除轮询卡缓存失败", zap.Uint("card_id", cardID), zap.Error(err))
+	if err := s.redis.Del(ctx, key).Err(); err != nil {
+		s.logger.Warn("删除轮询卡缓存失败", zap.Uint("card_id", cardID))
 	}
 }
--- a/internal/service/polling/asset_polling_service.go
+++ b/internal/service/polling/asset_polling_service.go
@@ -0,0 +1,89 @@
+package polling
+
+import (
+	"context"
+
+	"go.uber.org/zap"
+
+	"github.com/break/junhong_cmp_fiber/internal/polling"
+	iotCardSvc "github.com/break/junhong_cmp_fiber/internal/service/iot_card"
+	"github.com/break/junhong_cmp_fiber/internal/store/postgres"
+	"github.com/break/junhong_cmp_fiber/pkg/constants"
+	"github.com/break/junhong_cmp_fiber/pkg/errors"
+)
+
+// AssetPollingService 资产轮询管控服务
+// 管理 IoT 卡和设备的轮询启用状态
+// S2 修复：card 类型委托给 IotCardService（含 DB 写入 + callback 通知），避免绕过生命周期
+type AssetPollingService struct {
+	deviceStore        *postgres.DeviceStore
+	deviceBindingStore *postgres.DeviceSimBindingStore
+	iotCardService     *iotCardSvc.Service
+	queueMgr           *polling.PollingQueueManager
+	logger             *zap.Logger
+}
+
+// NewAssetPollingService 创建资产轮询管控服务
+func NewAssetPollingService(
+	deviceStore *postgres.DeviceStore,
+	deviceBindingStore *postgres.DeviceSimBindingStore,
+	iotCardService *iotCardSvc.Service,
+	queueMgr *polling.PollingQueueManager,
+	logger *zap.Logger,
+) *AssetPollingService {
+	return &AssetPollingService{
+		deviceStore:        deviceStore,
+		deviceBindingStore: deviceBindingStore,
+		iotCardService:     iotCardService,
+		queueMgr:           queueMgr,
+		logger:             logger,
+	}
+}
+
+// UpdatePollingStatus 更新资产轮询状态
+// assetType: "card" 或 "device"
+// assetID: 资产ID
+// enablePolling: 是否启用轮询
+func (s *AssetPollingService) UpdatePollingStatus(ctx context.Context, assetType string, assetID uint, enablePolling bool) error {
+	switch assetType {
+	case constants.AssetTypeIotCard:
+		// S2 修复：委托给 IotCardService，确保 DB 写入 + PollingCallback 回调一并触发
+		return s.iotCardService.UpdatePollingStatus(ctx, assetID, enablePolling)
+
+	case constants.AssetTypeDevice:
+		// 1. 更新设备的 enable_polling 字段
+		if err := s.deviceStore.UpdatePollingStatus(ctx, assetID, enablePolling); err != nil {
+			return err
+		}
+		bindings, err := s.deviceBindingStore.ListByDeviceID(ctx, assetID)
+		if err != nil {
+			s.logger.Warn("查询设备绑定卡失败，绑定卡轮询状态同步可能不完整",
+				zap.Uint("device_id", assetID), zap.Error(err))
+			return nil
+		}
+		if len(bindings) == 0 {
+			return nil
+		}
+		cardIDs := make([]uint, len(bindings))
+		for i, b := range bindings {
+			cardIDs[i] = b.IotCardID
+		}
+		// 2. M3 修复：级联同步绑定卡的 enable_polling，防止生命周期事件绕过设备级设置
+		if syncErr := s.iotCardService.BatchUpdatePollingStatus(ctx, cardIDs, enablePolling); syncErr != nil {
+			s.logger.Warn("批量同步绑定卡轮询状态失败",
+				zap.Uint("device_id", assetID), zap.Error(syncErr))
+		}
+		if !enablePolling {
+			for _, b := range bindings {
+				if rmErr := s.queueMgr.RemoveFromAllQueues(ctx, b.IotCardID); rmErr != nil {
+					s.logger.Warn("从队列移除卡失败",
+						zap.Uint("card_id", b.IotCardID), zap.Error(rmErr))
+				}
+			}
+		}
+		return nil
+
+	default:
+		return errors.New(errors.CodeInvalidParam, "资产类型无效，支持 card 或 device")
+	}
+}
--- a/internal/service/polling/monitoring_service.go
+++ b/internal/service/polling/monitoring_service.go
@@ -5,19 +5,34 @@ import (
 	"time"

 	"github.com/redis/go-redis/v9"
+	"go.uber.org/zap"

+	"github.com/break/junhong_cmp_fiber/internal/polling"
 	"github.com/break/junhong_cmp_fiber/pkg/constants"
 	"github.com/break/junhong_cmp_fiber/pkg/errors"
 )

 // MonitoringService 轮询监控服务
 type MonitoringService struct {
-	redis *redis.Client
+	redis    *redis.Client
+	queueMgr *polling.PollingQueueManager
 }

 // NewMonitoringService 创建轮询监控服务实例
-func NewMonitoringService(redis *redis.Client) *MonitoringService {
-	return &MonitoringService{redis: redis}
+// queueMgr 可选（nil 时降级到旧非分片 Key 兼容模式）
+func NewMonitoringService(redis *redis.Client, opts ...interface{}) *MonitoringService {
+	svc := &MonitoringService{redis: redis}
+	for _, opt := range opts {
+		if qm, ok := opt.(*polling.PollingQueueManager); ok {
+			svc.queueMgr = qm
+		}
+	}
+	return svc
+}
+
+// NewMonitoringServiceWithQueueMgr 创建注入了 PollingQueueManager 的监控服务（推荐）
+func NewMonitoringServiceWithQueueMgr(redis *redis.Client, queueMgr *polling.PollingQueueManager, _ *zap.Logger) *MonitoringService {
+	return &MonitoringService{redis: redis, queueMgr: queueMgr}
 }

 // OverviewStats 总览统计
@@ -84,10 +99,15 @@ func (s *MonitoringService) GetOverview(ctx context.Context) (*OverviewStats, er
 	}
 	stats.IsInitializing = stats.InitializedCards < stats.TotalCards && stats.TotalCards > 0

-	// 获取队列大小
-	stats.RealnameQueueSize, _ = s.redis.ZCard(ctx, constants.RedisPollingQueueRealnameKey()).Result()
-	stats.CarddataQueueSize, _ = s.redis.ZCard(ctx, constants.RedisPollingQueueCarddataKey()).Result()
-	stats.PackageQueueSize, _ = s.redis.ZCard(ctx, constants.RedisPollingQueuePackageKey()).Result()
+	if s.queueMgr != nil {
+		stats.RealnameQueueSize, _ = s.queueMgr.GetTotalQueueDepth(ctx, constants.TaskTypePollingRealname)
+		stats.CarddataQueueSize, _ = s.queueMgr.GetTotalQueueDepth(ctx, constants.TaskTypePollingCarddata)
+		stats.PackageQueueSize, _ = s.queueMgr.GetTotalQueueDepth(ctx, constants.TaskTypePollingPackage)
+	} else {
+		stats.RealnameQueueSize, _ = s.redis.ZCard(ctx, constants.RedisPollingQueueRealnameKey()).Result()
+		stats.CarddataQueueSize, _ = s.redis.ZCard(ctx, constants.RedisPollingQueueCarddataKey()).Result()
+		stats.PackageQueueSize, _ = s.redis.ZCard(ctx, constants.RedisPollingQueuePackageKey()).Result()
+	}

 	return stats, nil
 }
@@ -120,8 +140,11 @@ func (s *MonitoringService) GetQueueStatuses(ctx context.Context) ([]*QueueStatu
 			queueKey = constants.RedisPollingQueuePackageKey()
 		}

-		// 获取队列大小
-		status.QueueSize, _ = s.redis.ZCard(ctx, queueKey).Result()
+		if s.queueMgr != nil {
+			status.QueueSize, _ = s.queueMgr.GetTotalQueueDepth(ctx, taskType)
+		} else {
+			status.QueueSize, _ = s.redis.ZCard(ctx, queueKey).Result()
+		}

 		// 获取到期数量（score <= now）
 		status.DueCount, _ = s.redis.ZCount(ctx, queueKey, "-inf", formatInt64(now)).Result()
--- a/internal/store/postgres/carrier_store.go
+++ b/internal/store/postgres/carrier_store.go
@@ -81,3 +81,17 @@ func (s *CarrierStore) List(ctx context.Context, opts *store.QueryOptions, filte

 	return carriers, total, nil
 }
+
+// GetDataResetDay 获取运营商上游流量重置日（1-28），查询失败默认返回 1
+func (s *CarrierStore) GetDataResetDay(ctx context.Context, carrierID uint) int {
+	var day int
+	err := s.db.WithContext(ctx).
+		Model(&model.Carrier{}).
+		Select("data_reset_day").
+		Where("id = ?", carrierID).
+		Scan(&day).Error
+	if err != nil || day == 0 {
+		return 1
+	}
+	return day
+}
--- a/internal/store/postgres/device_store.go
+++ b/internal/store/postgres/device_store.go
@@ -243,3 +243,10 @@ func (s *DeviceStore) UpdateRechargeTrackingFields(ctx context.Context, deviceID
 			"first_recharge_triggered_by_series": triggeredJSON,
 		}).Error
 }
+
+// UpdatePollingStatus 更新设备的轮询启用状态
+func (s *DeviceStore) UpdatePollingStatus(ctx context.Context, deviceID uint, enablePolling bool) error {
+	return s.db.WithContext(ctx).Model(&model.Device{}).
+		Where("id = ?", deviceID).
+		Update("enable_polling", enablePolling).Error
+}
--- a/internal/store/postgres/iot_card_store.go
+++ b/internal/store/postgres/iot_card_store.go
@@ -110,6 +110,20 @@ func (s *IotCardStore) Update(ctx context.Context, card *model.IotCard) error {
 	return s.db.WithContext(ctx).Save(card).Error
 }

+// UpdateFields 按 ID 部分更新卡字段，供轮询系统的 Handler 使用
+func (s *IotCardStore) UpdateFields(ctx context.Context, cardID uint, fields map[string]any) error {
+	return s.db.WithContext(ctx).Model(&model.IotCard{}).
+		Where("id = ?", cardID).
+		Updates(fields).Error
+}
+
+// UpdatePollingStatus 更新卡的轮询启用状态
+func (s *IotCardStore) UpdatePollingStatus(ctx context.Context, cardID uint, enablePolling bool) error {
+	return s.db.WithContext(ctx).Model(&model.IotCard{}).
+		Where("id = ?", cardID).
+		Update("enable_polling", enablePolling).Error
+}
+
 func (s *IotCardStore) Delete(ctx context.Context, id uint) error {
 	return s.db.WithContext(ctx).Delete(&model.IotCard{}, id).Error
 }
@@ -927,6 +941,65 @@ func (s *IotCardStore) ExistsByVirtualNoBatch(ctx context.Context, virtualNos []
 	return result, nil
 }

+// ==================== 轮询系统专用查询 ====================
+
+// ListByDeviceIDAndNetworkStatus 查询设备下指定网络状态的所有卡
+// 通过 tb_device_sim_binding 关联查询（项目禁止外键约束，用子查询实现）
+func (s *IotCardStore) ListByDeviceIDAndNetworkStatus(ctx context.Context, deviceID uint, networkStatus int) ([]*model.IotCard, error) {
+	var cards []*model.IotCard
+	err := s.db.WithContext(ctx).
+		Where("id IN (SELECT iot_card_id FROM tb_device_sim_binding WHERE device_id = ? AND bind_status = 1 AND deleted_at IS NULL)", deviceID).
+		Where("network_status = ? AND deleted_at IS NULL", networkStatus).
+		Find(&cards).Error
+	return cards, err
+}
+
+// ListByDeviceIDAndPollingStopReasons 查询设备下因轮询原因停机的所有卡
+// 用于 resumeDeviceCards：只复机由轮询系统停机的卡（不干预手动停机）
+func (s *IotCardStore) ListByDeviceIDAndPollingStopReasons(ctx context.Context, deviceID uint) ([]*model.IotCard, error) {
+	pollingReasons := []string{
+		constants.StopReasonTrafficExhausted,
+		constants.StopReasonNoPackage,
+		constants.StopReasonNotRealname,
+	}
+	var cards []*model.IotCard
+	err := s.db.WithContext(ctx).
+		Where("id IN (SELECT iot_card_id FROM tb_device_sim_binding WHERE device_id = ? AND bind_status = 1 AND deleted_at IS NULL)", deviceID).
+		Where("network_status = 0 AND stop_reason IN ? AND deleted_at IS NULL", pollingReasons).
+		Find(&cards).Error
+	return cards, err
+}
+
+// UpdateStopReason 更新卡的停机原因字段
+func (s *IotCardStore) UpdateStopReason(ctx context.Context, cardID uint, reason string) error {
+	return s.db.WithContext(ctx).
+		Model(&model.IotCard{}).
+		Where("id = ?", cardID).
+		Update("stop_reason", reason).Error
+}
+
+// CountForPolling 统计启用轮询的卡总数（仅供轮询初始化使用，不应用数据权限过滤）
+func (s *IotCardStore) CountForPolling(ctx context.Context) (int64, error) {
+	var total int64
+	err := s.db.WithContext(ctx).
+		Model(&model.IotCard{}).
+		Where("enable_polling = true AND deleted_at IS NULL").
+		Count(&total).Error
+	return total, err
+}
+
+// ListForPollingBatch 分批查询启用轮询的卡，按 id ASC 游标翻页（仅供轮询初始化使用，不应用数据权限过滤）
+// lastID: 上批最后一条卡的 id（首次传 0）；limit: 每批大小
+func (s *IotCardStore) ListForPollingBatch(ctx context.Context, lastID uint, limit int) ([]*model.IotCard, error) {
+	var cards []*model.IotCard
+	err := s.db.WithContext(ctx).
+		Where("id > ? AND enable_polling = true AND deleted_at IS NULL", lastID).
+		Order("id ASC").
+		Limit(limit).
+		Find(&cards).Error
+	return cards, err
+}
+
 // ==================== 列表计数缓存 ====================

 func (s *IotCardStore) getCachedCount(ctx context.Context, table string, filters map[string]any) (int64, bool) {
--- a/internal/store/postgres/package_usage_store.go
+++ b/internal/store/postgres/package_usage_store.go
@@ -172,6 +172,51 @@ func (s *PackageUsageStore) ResetDataUsage(ctx context.Context, id uint, lastRes
 		}).Error
 }

+// HasValidByCarrier 检查载体是否有有效套餐（status IN 待生效/生效中）
+// 修复Bug1：通过 carrierType 动态切换 device_id / iot_card_id 查询
+// carrierType: "iot_card" 或 "device"
+func (s *PackageUsageStore) HasValidByCarrier(ctx context.Context, carrierType string, carrierID uint) (bool, error) {
+	var count int64
+	validStatuses := []int{
+		constants.PackageUsageStatusPending, // 待生效
+		constants.PackageUsageStatusActive,  // 生效中
+	}
+	query := s.db.WithContext(ctx).Model(&model.PackageUsage{}).
+		Where("status IN ?", validStatuses)
+	if carrierType == "device" {
+		query = query.Where("device_id = ?", carrierID)
+	} else {
+		query = query.Where("iot_card_id = ?", carrierID)
+	}
+	if err := query.Count(&count).Error; err != nil {
+		return false, err
+	}
+	return count > 0, nil
+}
+
+// GetActiveOrDepletedByCarrier 查询载体的活跃或耗尽套餐（用于流量耗尽检测）
+// ORDER BY status ASC 优先返回活跃套餐（status=1），有活跃套餐时先评估活跃套餐的流量上限
+// 返回 gorm.ErrRecordNotFound 表示无活跃或耗尽套餐（不判定为流量耗尽）
+func (s *PackageUsageStore) GetActiveOrDepletedByCarrier(ctx context.Context, carrierType string, carrierID uint) (*model.PackageUsage, error) {
+	var pkg model.PackageUsage
+	query := s.db.WithContext(ctx).Model(&model.PackageUsage{}).
+		Where("status IN ?", []int{
+			constants.PackageUsageStatusActive,   // 生效中
+			constants.PackageUsageStatusDepleted, // 已用完
+		}).
+		Order("status ASC").
+		Limit(1)
+	if carrierType == "device" {
+		query = query.Where("device_id = ?", carrierID)
+	} else {
+		query = query.Where("iot_card_id = ?", carrierID)
+	}
+	if err := query.First(&pkg).Error; err != nil {
+		return nil, err
+	}
+	return &pkg, nil
+}
+
 // ListByCarrier 查询载体的所有套餐使用记录（包括所有状态）
 func (s *PackageUsageStore) ListByCarrier(ctx context.Context, carrierType string, carrierID uint) ([]*model.PackageUsage, error) {
 	var usages []*model.PackageUsage
--- a/internal/task/polling_base.go
+++ b/internal/task/polling_base.go
@@ -0,0 +1,118 @@
+package task
+
+import (
+	"context"
+	"time"
+
+	"github.com/redis/go-redis/v9"
+	"go.uber.org/zap"
+
+	"github.com/break/junhong_cmp_fiber/internal/polling"
+	"github.com/break/junhong_cmp_fiber/internal/store/postgres"
+	"github.com/break/junhong_cmp_fiber/pkg/constants"
+)
+
+// acquireConcurrencyScript 原子获取并发信号量的 Lua 脚本
+// INCR + EXPIRE 合并为单个服务端操作，消除二者之间的崩溃窗口：
+// 若 Worker 在 INCR 后、EXPIRE 前崩溃，key 将永久留在 Redis 导致计数器卡死。
+// KEYS[1]: 当前并发计数 key
+// ARGV[1]: 最大并发数；ARGV[2]: key TTL（秒）
+// 返回 -1 表示超额拒绝，>0 表示成功获取后的计数值
+var acquireConcurrencyScript = redis.NewScript(`
+    local current = redis.call('INCR', KEYS[1])
+    if tonumber(current) > tonumber(ARGV[1]) then
+        redis.call('DECR', KEYS[1])
+        return -1
+    end
+    redis.call('EXPIRE', KEYS[1], tonumber(ARGV[2]))
+    return current
+`)
+
+// PollingBase 轮询共享基类
+// 封装并发控制、卡缓存、重入队、配置间隔查询等公共方法，4 个 Handler 共享
+type PollingBase struct {
+	redis        *redis.Client
+	queueMgr     *polling.PollingQueueManager
+	configMgr    *polling.PollingConfigManager
+	iotCardStore *postgres.IotCardStore
+	logger       *zap.Logger
+}
+
+// NewPollingBase 创建轮询共享基类
+func NewPollingBase(
+	redisClient *redis.Client,
+	queueMgr *polling.PollingQueueManager,
+	configMgr *polling.PollingConfigManager,
+	iotCardStore *postgres.IotCardStore,
+	logger *zap.Logger,
+) *PollingBase {
+	return &PollingBase{
+		redis:        redisClient,
+		queueMgr:     queueMgr,
+		configMgr:    configMgr,
+		iotCardStore: iotCardStore,
+		logger:       logger,
+	}
+}
+
+// acquireConcurrency 原子获取并发信号量
+// 使用 Lua 脚本将 INCR 与 EXPIRE 合并为单个服务端操作，消除非原子窗口：
+// 旧实现中若 Worker 在 INCR 后、EXPIRE 前崩溃，key 永久留在 Redis，计数器卡死。
+func (b *PollingBase) acquireConcurrency(ctx context.Context, taskType string) bool {
+	shortType := shortTaskType(taskType)
+	configKey := constants.RedisPollingConcurrencyConfigKey(shortType)
+	currentKey := constants.RedisPollingConcurrencyCurrentKey(taskType)
+
+	maxConcurrency, err := b.redis.Get(ctx, configKey).Int()
+	if err != nil {
+		maxConcurrency = constants.PollingDefaultMaxConcurrency
+	}
+
+	result, err := acquireConcurrencyScript.Run(
+		ctx, b.redis, []string{currentKey},
+		maxConcurrency, constants.PollingConcurrencyKeyTTL,
+	).Int64()
+	if err != nil {
+		b.logger.Warn("获取并发计数失败，放行任务", zap.Error(err))
+		return true
+	}
+
+	return result != -1
+}
+
+// releaseConcurrency 释放并发信号量
+func (b *PollingBase) releaseConcurrency(ctx context.Context, taskType string) {
+	currentKey := constants.RedisPollingConcurrencyCurrentKey(taskType)
+	if err := b.redis.Decr(ctx, currentKey).Err(); err != nil {
+		b.logger.Warn("释放并发计数失败", zap.Error(err))
+	}
+}
+
+// requeueCard 将卡按匹配配置间隔重新入队分片 Sorted Set
+// ⚠️ 关键：Lua 脚本原子出队后卡已从队列移除，若并发满时直接 return 会导致卡永久丢失
+// 调用方必须在 acquireConcurrency 返回 false 时调用此方法入队后再返回
+func (b *PollingBase) requeueCard(ctx context.Context, cardID uint, taskType string) error {
+	card, err := b.getCardWithCache(ctx, cardID)
+	if err != nil {
+		b.logger.Warn("重入队：获取卡信息失败", zap.Uint("card_id", cardID), zap.Error(err))
+		// 获取卡失败时立即重入队（下次仍然尝试处理）
+		return b.queueMgr.Requeue(ctx, cardID, taskType, time.Now().Add(30*time.Second))
+	}
+
+	cfg := b.configMgr.MatchConfig(card)
+	if cfg == nil {
+		// 兜底：配置未加载（DB 暂时不可达）时延迟 30 秒重入队，防止卡从轮询永久消失
+		b.logger.Warn("无匹配轮询配置，30秒后重入队（配置可能未加载）",
+			zap.Uint("card_id", cardID), zap.String("task_type", taskType))
+		return b.queueMgr.Requeue(ctx, cardID, taskType, time.Now().Add(30*time.Second))
+	}
+
+	interval := getIntervalByTaskType(cfg, taskType)
+	if interval <= 0 {
+		b.logger.Debug("轮询间隔为 NULL，不入队", zap.Uint("card_id", cardID), zap.String("task_type", taskType))
+		return nil
+	}
+
+	nextCheckAt := time.Now().Add(time.Duration(interval) * time.Second)
+	return b.queueMgr.Requeue(ctx, cardID, taskType, nextCheckAt)
+}
--- a/internal/task/polling_card_cache.go
+++ b/internal/task/polling_card_cache.go
@@ -0,0 +1,136 @@
+package task
+
+import (
+	"context"
+	"strconv"
+	"time"
+
+	"go.uber.org/zap"
+
+	"github.com/break/junhong_cmp_fiber/internal/model"
+	"github.com/break/junhong_cmp_fiber/pkg/constants"
+)
+
+// getCardWithCache 优先从 Redis 缓存获取卡信息，缓存 miss 时查 DB 并异步写缓存
+func (b *PollingBase) getCardWithCache(ctx context.Context, cardID uint) (*model.IotCard, error) {
+	key := constants.RedisPollingCardInfoKey(cardID)
+
+	result, err := b.redis.HGetAll(ctx, key).Result()
+	if err == nil && len(result) > 0 {
+		return parseCardFromCache(cardID, result), nil
+	}
+
+	card, err := b.iotCardStore.GetByID(ctx, cardID)
+	if err != nil {
+		return nil, err
+	}
+
+	go writeCardToCache(b, key, card)
+	return card, nil
+}
+
+// updateCardCache 更新 Redis 卡信息缓存中的指定字段
+func (b *PollingBase) updateCardCache(ctx context.Context, cardID uint, updates map[string]any) {
+	key := constants.RedisPollingCardInfoKey(cardID)
+	args := make([]any, 0, len(updates)*2)
+	for k, v := range updates {
+		args = append(args, k, v)
+	}
+	if len(args) > 0 {
+		if err := b.redis.HSet(ctx, key, args...).Err(); err != nil {
+			b.logger.Warn("更新卡缓存失败", zap.Uint("card_id", cardID), zap.Error(err))
+		}
+	}
+}
+
+// parseCardFromCache 从 Redis Hash 反序列化卡信息
+func parseCardFromCache(cardID uint, result map[string]string) *model.IotCard {
+	card := &model.IotCard{}
+	card.ID = cardID
+	if v, ok := result["iccid"]; ok {
+		card.ICCID = v
+	}
+	if v, ok := result["card_category"]; ok {
+		card.CardCategory = v
+	}
+	if v, ok := result["real_name_status"]; ok {
+		if status, err := strconv.Atoi(v); err == nil {
+			card.RealNameStatus = status
+		}
+	}
+	if v, ok := result["network_status"]; ok {
+		if status, err := strconv.Atoi(v); err == nil {
+			card.NetworkStatus = status
+		}
+	}
+	if v, ok := result["carrier_id"]; ok {
+		if id, err := strconv.ParseUint(v, 10, 64); err == nil {
+			card.CarrierID = uint(id)
+		}
+	}
+	if v, ok := result["current_month_usage_mb"]; ok {
+		if usage, err := strconv.ParseFloat(v, 64); err == nil {
+			card.CurrentMonthUsageMB = usage
+		}
+	}
+	if v, ok := result["last_gateway_reading_mb"]; ok {
+		if reading, err := strconv.ParseFloat(v, 64); err == nil {
+			card.LastGatewayReadingMB = reading
+		}
+	}
+	if v, ok := result["data_usage_mb"]; ok {
+		if usage, err := strconv.ParseInt(v, 10, 64); err == nil {
+			card.DataUsageMB = usage
+		}
+	}
+	if v, ok := result["stop_reason"]; ok {
+		card.StopReason = v
+	}
+	if v, ok := result["is_standalone"]; ok {
+		card.IsStandalone = v == "1" || v == "true"
+	} else {
+		card.IsStandalone = true
+	}
+	if v, ok := result["series_id"]; ok {
+		if id, err := strconv.ParseUint(v, 10, 64); err == nil {
+			seriesID := uint(id)
+			card.SeriesID = &seriesID
+		}
+	}
+	if v, ok := result["current_month_start_date"]; ok {
+		if ts, err := strconv.ParseInt(v, 10, 64); err == nil {
+			t := time.Unix(ts, 0)
+			card.CurrentMonthStartDate = &t
+		}
+	}
+	return card
+}
+
+// writeCardToCache 将卡信息异步写入 Redis 缓存（7 天 TTL）
+func writeCardToCache(b *PollingBase, key string, card *model.IotCard) {
+	cacheCtx := context.Background()
+	cacheData := map[string]any{
+		"id":                      card.ID,
+		"iccid":                   card.ICCID,
+		"card_category":           card.CardCategory,
+		"real_name_status":        card.RealNameStatus,
+		"network_status":          card.NetworkStatus,
+		"carrier_id":              card.CarrierID,
+		"current_month_usage_mb":  card.CurrentMonthUsageMB,
+		"last_gateway_reading_mb": card.LastGatewayReadingMB,
+		"data_usage_mb":           card.DataUsageMB,
+		"stop_reason":             card.StopReason,
+		"is_standalone":           boolToStr(card.IsStandalone),
+		"cached_at":               time.Now().Unix(),
+	}
+	if card.SeriesID != nil {
+		cacheData["series_id"] = *card.SeriesID
+	}
+	if card.CurrentMonthStartDate != nil {
+		cacheData["current_month_start_date"] = card.CurrentMonthStartDate.Unix()
+	}
+	pipe := b.redis.Pipeline()
+	pipe.HSet(cacheCtx, key, cacheData)
+	pipe.Expire(cacheCtx, key, 7*24*time.Hour)
+	_, _ = pipe.Exec(cacheCtx)
+}
--- a/internal/task/polling_carddata_handler.go
+++ b/internal/task/polling_carddata_handler.go
@@ -0,0 +1,188 @@
+package task
+
+import (
+	"context"
+	"time"
+
+	"github.com/hibiken/asynq"
+	"go.uber.org/zap"
+	"gorm.io/gorm"
+
+	"github.com/break/junhong_cmp_fiber/internal/gateway"
+	"github.com/break/junhong_cmp_fiber/internal/model"
+	iot_card_svc "github.com/break/junhong_cmp_fiber/internal/service/iot_card"
+	packagepkg "github.com/break/junhong_cmp_fiber/internal/service/package"
+	"github.com/break/junhong_cmp_fiber/internal/store/postgres"
+	"github.com/break/junhong_cmp_fiber/pkg/constants"
+)
+
+// PollingCarddataHandler 流量检查任务处理器
+// 职责：调 Gateway 查流量 → 写 DB → 扣减套餐流量 → 调 EvaluateAndAct 判断停复机
+// 不做：直接停复机决策，委托给 StopResumeService.EvaluateAndAct
+type PollingCarddataHandler struct {
+	base          *PollingBase
+	gateway       *gateway.Client
+	iotCardStore  *postgres.IotCardStore
+	carrierStore  *postgres.CarrierStore
+	usageService  *packagepkg.UsageService
+	stopResumeSvc iot_card_svc.StopResumeServiceInterface
+}
+
+// NewPollingCarddataHandler 创建流量检查任务处理器
+func NewPollingCarddataHandler(
+	base *PollingBase,
+	gw *gateway.Client,
+	iotCardStore *postgres.IotCardStore,
+	carrierStore *postgres.CarrierStore,
+	usageService *packagepkg.UsageService,
+	stopResumeSvc iot_card_svc.StopResumeServiceInterface,
+) *PollingCarddataHandler {
+	return &PollingCarddataHandler{
+		base:          base,
+		gateway:       gw,
+		iotCardStore:  iotCardStore,
+		carrierStore:  carrierStore,
+		usageService:  usageService,
+		stopResumeSvc: stopResumeSvc,
+	}
+}
+
+// Handle 处理流量检查任务
+func (h *PollingCarddataHandler) Handle(ctx context.Context, t *asynq.Task) error {
+	startTime := time.Now()
+
+	cardID, ok := parseTaskPayload(t.Payload(), h.base.logger)
+	if !ok {
+		return nil
+	}
+
+	if !h.base.acquireConcurrency(ctx, constants.TaskTypePollingCarddata) {
+		h.base.logger.Debug("并发已满，重新入队", zap.Uint("card_id", cardID))
+		return h.base.requeueCard(ctx, cardID, constants.TaskTypePollingCarddata)
+	}
+	defer h.base.releaseConcurrency(ctx, constants.TaskTypePollingCarddata)
+
+	card, err := h.base.getCardWithCache(ctx, cardID)
+	if err != nil {
+		if isNotFound(err) {
+			return nil
+		}
+		h.base.logger.Error("获取卡信息失败", zap.Uint("card_id", cardID), zap.Error(err))
+		h.base.updateStats(ctx, constants.TaskTypePollingCarddata, false, time.Since(startTime))
+		return h.base.requeueCard(ctx, cardID, constants.TaskTypePollingCarddata)
+	}
+
+	var gatewayFlowMB float64
+	if h.gateway != nil {
+		result, gwErr := h.gateway.QueryFlow(ctx, &gateway.FlowQueryReq{CardNo: card.ICCID})
+		if gwErr != nil {
+			h.base.logger.Warn("查询流量失败",
+				zap.Uint("card_id", cardID), zap.String("iccid", card.ICCID), zap.Error(gwErr))
+			h.base.updateStats(ctx, constants.TaskTypePollingCarddata, false, time.Since(startTime))
+			return h.base.requeueCard(ctx, cardID, constants.TaskTypePollingCarddata)
+		}
+		gatewayFlowMB = result.Used
+	} else {
+		gatewayFlowMB = card.CurrentMonthUsageMB
+	}
+
+	now := time.Now()
+	resetDay := h.carrierStore.GetDataResetDay(ctx, card.CarrierID)
+	updates, flowIncrementMB, isCrossMonth := h.calculateFlowUpdates(card, gatewayFlowMB, now, resetDay)
+	updates["last_data_check_at"] = now
+
+	if updateErr := h.iotCardStore.UpdateFields(ctx, cardID, updates); updateErr != nil {
+		h.base.logger.Error("更新卡流量信息失败", zap.Uint("card_id", cardID), zap.Error(updateErr))
+	}
+
+	go h.base.insertDataUsageRecord(context.Background(), cardID, flowIncrementMB, now)
+
+	cacheUpdates := map[string]any{"last_gateway_reading_mb": gatewayFlowMB}
+	if isCrossMonth {
+		// 跨月时同步更新缓存中的本月开始日期和本月用量，避免下次从缓存读取时再次误判跨月
+		currentMonthStart := time.Date(now.Year(), now.Month(), 1, 0, 0, 0, 0, now.Location())
+		cacheUpdates["current_month_start_date"] = currentMonthStart.Unix()
+		if flowIncrementMB > 0 {
+			cacheUpdates["current_month_usage_mb"] = flowIncrementMB
+		} else {
+			cacheUpdates["current_month_usage_mb"] = float64(0)
+		}
+	}
+	h.base.updateCardCache(ctx, cardID, cacheUpdates)
+
+	if flowIncrementMB > 0 && h.usageService != nil {
+		if deductErr := h.usageService.DeductDataUsage(ctx, "iot_card", cardID, int64(flowIncrementMB)); deductErr != nil {
+			h.base.logger.Warn("套餐流量扣减失败",
+				zap.Uint("card_id", cardID), zap.Float64("increment_mb", flowIncrementMB), zap.Error(deductErr))
+		}
+	}
+
+	if h.stopResumeSvc != nil {
+		freshCard, loadErr := h.iotCardStore.GetByID(ctx, cardID)
+		if loadErr == nil {
+			if evalErr := h.stopResumeSvc.EvaluateAndAct(ctx, freshCard); evalErr != nil {
+				h.base.logger.Warn("流量检查后停复机评估失败",
+					zap.Uint("card_id", cardID), zap.Error(evalErr))
+			}
+		}
+	}
+
+	h.base.updateStats(ctx, constants.TaskTypePollingCarddata, true, time.Since(startTime))
+	return h.base.requeueCard(ctx, cardID, constants.TaskTypePollingCarddata)
+}
+
+// calculateFlowUpdates 计算流量更新字段、增量和是否跨月
+// 决策13：完整迁移跨月流量边界检测逻辑（月份切换检测、上月总量保存、当月计数器重置）
+// 第三个返回值 isCrossMonth 供调用方同步更新 Redis 缓存，避免下次误判跨月
+func (h *PollingCarddataHandler) calculateFlowUpdates(card *model.IotCard, gatewayFlowMB float64, now time.Time, resetDay int) (map[string]any, float64, bool) {
+	updates := make(map[string]any)
+
+	increment := gatewayFlowMB - card.LastGatewayReadingMB
+	if increment < 0 {
+		if isResetWindow(now, resetDay) {
+			increment = gatewayFlowMB
+			h.base.logger.Info("检测到上游运营商重置",
+				zap.Uint("card_id", card.ID),
+				zap.Float64("gateway_flow", gatewayFlowMB),
+				zap.Float64("last_reading", card.LastGatewayReadingMB),
+				zap.Int("reset_day", resetDay))
+		} else {
+			h.base.logger.Warn("流量异常：非重置日出现值下降",
+				zap.Uint("card_id", card.ID),
+				zap.Float64("gateway_flow", gatewayFlowMB),
+				zap.Float64("last_reading", card.LastGatewayReadingMB))
+			increment = 0
+		}
+	}
+
+	updates["last_gateway_reading_mb"] = gatewayFlowMB
+
+	currentMonthStart := time.Date(now.Year(), now.Month(), 1, 0, 0, 0, 0, now.Location())
+	isCrossMonth := card.CurrentMonthStartDate == nil ||
+		card.CurrentMonthStartDate.Before(currentMonthStart)
+
+	if isCrossMonth {
+		h.base.logger.Info("检测到跨月，重置流量计数",
+			zap.Uint("card_id", card.ID),
+			zap.Float64("last_month_total", card.CurrentMonthUsageMB))
+		updates["last_month_total_mb"] = card.CurrentMonthUsageMB
+		updates["current_month_start_date"] = currentMonthStart
+		if increment > 0 {
+			updates["current_month_usage_mb"] = increment
+		} else {
+			updates["current_month_usage_mb"] = float64(0)
+		}
+	} else if increment > 0 {
+		updates["current_month_usage_mb"] = gorm.Expr("current_month_usage_mb + ?", increment)
+	}
+
+	if increment > 0 {
+		updates["data_usage_mb"] = gorm.Expr("data_usage_mb + ?", int64(increment))
+	}
+
+	if card.CurrentMonthStartDate == nil {
+		updates["current_month_start_date"] = currentMonthStart
+	}
+
+	return updates, increment, isCrossMonth
+}
--- a/internal/task/polling_handler.go
+++ b/internal/task/polling_handler.go
--- a/internal/task/polling_package_handler.go
+++ b/internal/task/polling_package_handler.go
@@ -0,0 +1,76 @@
+package task
+
+import (
+	"context"
+	"time"
+
+	"github.com/hibiken/asynq"
+	"go.uber.org/zap"
+
+	iot_card_svc "github.com/break/junhong_cmp_fiber/internal/service/iot_card"
+	"github.com/break/junhong_cmp_fiber/internal/store/postgres"
+	"github.com/break/junhong_cmp_fiber/pkg/constants"
+)
+
+// PollingPackageHandler 套餐检查任务处理器
+// 职责：触发 EvaluateAndAct 检查套餐状态并判断停复机
+// 不做：直接停复机决策，委托给 StopResumeService.EvaluateAndAct
+// 注：套餐状态由 PackageActivationHandler/DataResetHandler/UsageService 维护，
+// 本 Handler 无需查 Gateway，只负责周期性触发再评估。
+type PollingPackageHandler struct {
+	base          *PollingBase
+	iotCardStore  *postgres.IotCardStore
+	stopResumeSvc iot_card_svc.StopResumeServiceInterface
+}
+
+// NewPollingPackageHandler 创建套餐检查任务处理器
+func NewPollingPackageHandler(
+	base *PollingBase,
+	iotCardStore *postgres.IotCardStore,
+	stopResumeSvc iot_card_svc.StopResumeServiceInterface,
+) *PollingPackageHandler {
+	return &PollingPackageHandler{
+		base:          base,
+		iotCardStore:  iotCardStore,
+		stopResumeSvc: stopResumeSvc,
+	}
+}
+
+// Handle 处理套餐检查任务
+func (h *PollingPackageHandler) Handle(ctx context.Context, t *asynq.Task) error {
+	startTime := time.Now()
+
+	cardID, ok := parseTaskPayload(t.Payload(), h.base.logger)
+	if !ok {
+		return nil
+	}
+
+	if !h.base.acquireConcurrency(ctx, constants.TaskTypePollingPackage) {
+		h.base.logger.Debug("并发已满，重新入队", zap.Uint("card_id", cardID))
+		return h.base.requeueCard(ctx, cardID, constants.TaskTypePollingPackage)
+	}
+	defer h.base.releaseConcurrency(ctx, constants.TaskTypePollingPackage)
+
+	if _, cacheErr := h.base.getCardWithCache(ctx, cardID); cacheErr != nil {
+		if isNotFound(cacheErr) {
+			return nil
+		}
+		h.base.logger.Error("获取卡信息失败", zap.Uint("card_id", cardID), zap.Error(cacheErr))
+		h.base.updateStats(ctx, constants.TaskTypePollingPackage, false, time.Since(startTime))
+		return h.base.requeueCard(ctx, cardID, constants.TaskTypePollingPackage)
+	}
+
+	if h.stopResumeSvc != nil {
+		// EvaluateAndAct 需要完整新鲜数据（含 DeviceID），从 DB 获取
+		freshCard, loadErr := h.iotCardStore.GetByID(ctx, cardID)
+		if loadErr == nil {
+			if evalErr := h.stopResumeSvc.EvaluateAndAct(ctx, freshCard); evalErr != nil {
+				h.base.logger.Warn("套餐检查后停复机评估失败",
+					zap.Uint("card_id", cardID), zap.Error(evalErr))
+			}
+		}
+	}
+
+	h.base.updateStats(ctx, constants.TaskTypePollingPackage, true, time.Since(startTime))
+	return h.base.requeueCard(ctx, cardID, constants.TaskTypePollingPackage)
+}
--- a/internal/task/polling_protect_handler.go
+++ b/internal/task/polling_protect_handler.go
@@ -0,0 +1,151 @@
+package task
+
+import (
+	"context"
+	"time"
+
+	"github.com/hibiken/asynq"
+	"go.uber.org/zap"
+
+	"github.com/break/junhong_cmp_fiber/internal/gateway"
+	iot_card_svc "github.com/break/junhong_cmp_fiber/internal/service/iot_card"
+	"github.com/break/junhong_cmp_fiber/internal/store/postgres"
+	"github.com/break/junhong_cmp_fiber/pkg/constants"
+)
+
+// PollingProtectHandler 保护期一致性检查任务处理器
+// 保护期内：直接调 Gateway 强制停/复机（绕过 EvaluateAndAct 三条件判断）
+// 保护期结束：调 EvaluateAndAct 重新评估正常停复机条件
+// 两种路径不可混淆：保护期内=强制修正；保护期结束=重新评估
+type PollingProtectHandler struct {
+	base                  *PollingBase
+	gateway               *gateway.Client
+	iotCardStore          *postgres.IotCardStore
+	deviceSimBindingStore *postgres.DeviceSimBindingStore
+	stopResumeSvc         iot_card_svc.StopResumeServiceInterface
+}
+
+// NewPollingProtectHandler 创建保护期一致性检查任务处理器
+func NewPollingProtectHandler(
+	base *PollingBase,
+	gw *gateway.Client,
+	iotCardStore *postgres.IotCardStore,
+	deviceSimBindingStore *postgres.DeviceSimBindingStore,
+	stopResumeSvc iot_card_svc.StopResumeServiceInterface,
+) *PollingProtectHandler {
+	return &PollingProtectHandler{
+		base:                  base,
+		gateway:               gw,
+		iotCardStore:          iotCardStore,
+		deviceSimBindingStore: deviceSimBindingStore,
+		stopResumeSvc:         stopResumeSvc,
+	}
+}
+
+// Handle 处理保护期一致性检查任务
+func (h *PollingProtectHandler) Handle(ctx context.Context, t *asynq.Task) error {
+	startTime := time.Now()
+
+	cardID, ok := parseTaskPayload(t.Payload(), h.base.logger)
+	if !ok {
+		return nil
+	}
+
+	if !h.base.acquireConcurrency(ctx, constants.TaskTypePollingProtect) {
+		h.base.logger.Debug("并发已满，重新入队", zap.Uint("card_id", cardID))
+		return h.base.requeueCard(ctx, cardID, constants.TaskTypePollingProtect)
+	}
+	defer h.base.releaseConcurrency(ctx, constants.TaskTypePollingProtect)
+
+	card, err := h.iotCardStore.GetByID(ctx, cardID)
+	if err != nil {
+		if isNotFound(err) {
+			return nil
+		}
+		h.base.logger.Error("查询卡信息失败", zap.Uint("card_id", cardID), zap.Error(err))
+		return h.base.requeueCard(ctx, cardID, constants.TaskTypePollingProtect)
+	}
+
+	// 独立卡（未绑设备）跳过保护期检查
+	if card.IsStandalone {
+		return h.base.requeueCard(ctx, cardID, constants.TaskTypePollingProtect)
+	}
+
+	// 未实名卡跳过保护期检查
+	if card.RealNameStatus != constants.RealNameStatusVerified {
+		return h.base.requeueCard(ctx, cardID, constants.TaskTypePollingProtect)
+	}
+
+	binding, err := h.deviceSimBindingStore.GetActiveBindingByCardID(ctx, card.ID)
+	if err != nil || binding == nil {
+		return h.base.requeueCard(ctx, cardID, constants.TaskTypePollingProtect)
+	}
+	deviceID := binding.DeviceID
+
+	stopProtect := h.base.redis.Exists(ctx, constants.RedisDeviceProtectKey(deviceID, "stop")).Val() > 0
+	startProtect := h.base.redis.Exists(ctx, constants.RedisDeviceProtectKey(deviceID, "start")).Val() > 0
+
+	switch {
+	case stopProtect && card.NetworkStatus == constants.NetworkStatusOnline:
+		// 保护期内：停机保护期发现开机卡 → 强制停机（绕过 EvaluateAndAct）
+		h.base.logger.Info("保护期一致性：停机保护期内发现开机卡，强制停机",
+			zap.Uint("card_id", card.ID), zap.Uint("device_id", deviceID))
+		if h.gateway == nil {
+			break
+		}
+		if err := h.gateway.StopCard(ctx, &gateway.CardOperationReq{CardNo: card.ICCID}); err != nil {
+			h.base.logger.Error("保护期强制停机失败",
+				zap.Uint("card_id", card.ID), zap.Error(err))
+			h.base.updateStats(ctx, constants.TaskTypePollingProtect, false, time.Since(startTime))
+			return h.base.requeueCard(ctx, cardID, constants.TaskTypePollingProtect)
+		}
+		if updateErr := h.iotCardStore.UpdateFields(ctx, cardID, map[string]any{
+			"network_status": constants.NetworkStatusOffline,
+			"stopped_at":     time.Now(),
+			"stop_reason":    constants.StopReasonProtectPeriod,
+		}); updateErr != nil {
+			h.base.logger.Warn("保护期停机 DB 更新失败", zap.Uint("card_id", cardID), zap.Error(updateErr))
+		}
+		h.base.updateCardCache(ctx, cardID, map[string]any{"network_status": constants.NetworkStatusOffline})
+
+	case startProtect && card.NetworkStatus == constants.NetworkStatusOffline:
+		// 保护期内：复机保护期发现停机卡 → 强制复机（绕过 EvaluateAndAct）
+		h.base.logger.Info("保护期一致性：复机保护期内发现停机卡，强制复机",
+			zap.Uint("card_id", card.ID), zap.Uint("device_id", deviceID))
+		if h.gateway == nil {
+			break
+		}
+		if err := h.gateway.StartCard(ctx, &gateway.CardOperationReq{CardNo: card.ICCID}); err != nil {
+			h.base.logger.Error("保护期强制复机失败",
+				zap.Uint("card_id", card.ID), zap.Error(err))
+			h.base.updateStats(ctx, constants.TaskTypePollingProtect, false, time.Since(startTime))
+			return h.base.requeueCard(ctx, cardID, constants.TaskTypePollingProtect)
+		}
+		if updateErr := h.iotCardStore.UpdateFields(ctx, cardID, map[string]any{
+			"network_status": constants.NetworkStatusOnline,
+			"resumed_at":     time.Now(),
+			"stop_reason":    "",
+		}); updateErr != nil {
+			h.base.logger.Warn("保护期复机 DB 更新失败", zap.Uint("card_id", cardID), zap.Error(updateErr))
+		}
+		h.base.updateCardCache(ctx, cardID, map[string]any{"network_status": constants.NetworkStatusOnline})
+
+	case !stopProtect && !startProtect:
+		// 保护期结束：调 EvaluateAndAct 重新评估正常停复机条件
+		if h.stopResumeSvc != nil {
+			if evalErr := h.stopResumeSvc.EvaluateAndAct(ctx, card); evalErr != nil {
+				h.base.logger.Warn("保护期结束后停复机评估失败",
+					zap.Uint("card_id", cardID), zap.Error(evalErr))
+			}
+		}
+	}
+
+	if updateErr := h.iotCardStore.UpdateFields(ctx, cardID, map[string]any{
+		"last_protect_check_at": time.Now(),
+	}); updateErr != nil {
+		h.base.logger.Warn("更新保护期检查时间失败", zap.Uint("card_id", cardID), zap.Error(updateErr))
+	}
+
+	h.base.updateStats(ctx, constants.TaskTypePollingProtect, true, time.Since(startTime))
+	return h.base.requeueCard(ctx, cardID, constants.TaskTypePollingProtect)
+}
--- a/internal/task/polling_realname_handler.go
+++ b/internal/task/polling_realname_handler.go
@@ -0,0 +1,172 @@
+package task
+
+import (
+	"context"
+	"time"
+
+	"github.com/bytedance/sonic"
+	"github.com/hibiken/asynq"
+	"go.uber.org/zap"
+
+	"github.com/break/junhong_cmp_fiber/internal/gateway"
+	iot_card_svc "github.com/break/junhong_cmp_fiber/internal/service/iot_card"
+	"github.com/break/junhong_cmp_fiber/internal/store/postgres"
+	"github.com/break/junhong_cmp_fiber/pkg/constants"
+)
+
+// PollingRealnameHandler 实名检查任务处理器
+// 职责：调 Gateway 查实名状态 → 写 DB → 触发首次实名激活任务
+// 不做：停复机决策（实名状态 0→1 时通过 EvaluateAndAct 触发 not_realname 复机）
+type PollingRealnameHandler struct {
+	base          *PollingBase
+	gateway       *gateway.Client
+	iotCardStore  *postgres.IotCardStore
+	asynqClient   *asynq.Client
+	stopResumeSvc iot_card_svc.StopResumeServiceInterface
+}
+
+// NewPollingRealnameHandler 创建实名检查任务处理器
+func NewPollingRealnameHandler(
+	base *PollingBase,
+	gw *gateway.Client,
+	iotCardStore *postgres.IotCardStore,
+	asynqClient *asynq.Client,
+	stopResumeSvc iot_card_svc.StopResumeServiceInterface,
+) *PollingRealnameHandler {
+	return &PollingRealnameHandler{
+		base:          base,
+		gateway:       gw,
+		iotCardStore:  iotCardStore,
+		asynqClient:   asynqClient,
+		stopResumeSvc: stopResumeSvc,
+	}
+}
+
+// Handle 处理实名检查任务
+func (h *PollingRealnameHandler) Handle(ctx context.Context, t *asynq.Task) error {
+	startTime := time.Now()
+
+	cardID, ok := parseTaskPayload(t.Payload(), h.base.logger)
+	if !ok {
+		return nil
+	}
+
+	if !h.base.acquireConcurrency(ctx, constants.TaskTypePollingRealname) {
+		h.base.logger.Debug("并发已满，重新入队", zap.Uint("card_id", cardID))
+		return h.base.requeueCard(ctx, cardID, constants.TaskTypePollingRealname)
+	}
+	defer h.base.releaseConcurrency(ctx, constants.TaskTypePollingRealname)
+
+	card, err := h.base.getCardWithCache(ctx, cardID)
+	if err != nil {
+		if isNotFound(err) {
+			return nil
+		}
+		h.base.logger.Error("获取卡信息失败", zap.Uint("card_id", cardID), zap.Error(err))
+		h.base.updateStats(ctx, constants.TaskTypePollingRealname, false, time.Since(startTime))
+		return h.base.requeueCard(ctx, cardID, constants.TaskTypePollingRealname)
+	}
+
+	if card.CardCategory == constants.CardCategoryIndustry {
+		return h.base.requeueCard(ctx, cardID, constants.TaskTypePollingRealname)
+	}
+
+	var newStatus int
+	if h.gateway != nil {
+		result, gwErr := h.gateway.QueryRealnameStatus(ctx, &gateway.CardStatusReq{CardNo: card.ICCID})
+		if gwErr != nil {
+			h.base.logger.Warn("查询实名状态失败",
+				zap.Uint("card_id", cardID), zap.String("iccid", card.ICCID), zap.Error(gwErr))
+			h.base.updateStats(ctx, constants.TaskTypePollingRealname, false, time.Since(startTime))
+			return h.base.requeueCard(ctx, cardID, constants.TaskTypePollingRealname)
+		}
+		if result.RealStatus {
+			newStatus = constants.RealNameStatusVerified
+		} else {
+			newStatus = constants.RealNameStatusNotVerified
+		}
+	} else {
+		newStatus = card.RealNameStatus
+	}
+
+	statusChanged := newStatus != card.RealNameStatus
+	isFirstRealname := statusChanged &&
+		card.RealNameStatus != constants.RealNameStatusVerified &&
+		newStatus == constants.RealNameStatusVerified
+
+	now := time.Now()
+	fields := map[string]any{"last_real_name_check_at": now}
+	if statusChanged {
+		fields["real_name_status"] = newStatus
+	}
+	if isFirstRealname {
+		fields["first_realname_at"] = now
+	}
+	if err := h.iotCardStore.UpdateFields(ctx, cardID, fields); err != nil {
+		h.base.logger.Error("更新卡实名信息失败", zap.Uint("card_id", cardID), zap.Error(err))
+	}
+
+	if statusChanged {
+		h.base.updateCardCache(ctx, cardID, map[string]any{"real_name_status": newStatus})
+		h.base.logger.Info("实名状态已变化",
+			zap.Uint("card_id", cardID),
+			zap.Int("old_status", card.RealNameStatus),
+			zap.Int("new_status", newStatus))
+
+		if isFirstRealname {
+			// 0→1：首次实名，触发套餐激活并立即复机评估（不等待下一个 carddata/package 周期）
+			h.triggerFirstRealnameActivation(ctx, cardID)
+			if h.stopResumeSvc != nil {
+				freshCard, loadErr := h.iotCardStore.GetByID(ctx, cardID)
+				if loadErr == nil {
+					if evalErr := h.stopResumeSvc.EvaluateAndAct(ctx, freshCard); evalErr != nil {
+						h.base.logger.Warn("实名完成后触发复机评估失败",
+							zap.Uint("card_id", cardID), zap.Error(evalErr))
+					}
+				}
+			}
+		} else if newStatus == constants.RealNameStatusNotVerified {
+			// 1→0：实名逆转，立即触发停机评估（不等待下一个 carddata/package 周期，否则最长延迟 1 小时）
+			h.base.logger.Warn("检测到实名逆转，立即触发停机评估",
+				zap.Uint("card_id", cardID))
+			if h.stopResumeSvc != nil {
+				freshCard, loadErr := h.iotCardStore.GetByID(ctx, cardID)
+				if loadErr == nil {
+					if evalErr := h.stopResumeSvc.EvaluateAndAct(ctx, freshCard); evalErr != nil {
+						h.base.logger.Warn("实名逆转后触发停机评估失败",
+							zap.Uint("card_id", cardID), zap.Error(evalErr))
+					}
+				}
+			}
+		}
+	}
+
+	h.base.updateStats(ctx, constants.TaskTypePollingRealname, true, time.Since(startTime))
+	return h.base.requeueCard(ctx, cardID, constants.TaskTypePollingRealname)
+}
+
+// triggerFirstRealnameActivation 首次实名后触发套餐激活任务
+func (h *PollingRealnameHandler) triggerFirstRealnameActivation(ctx context.Context, cardID uint) {
+	if h.asynqClient == nil {
+		return
+	}
+	payload := map[string]any{
+		"carrier_type":    "iot_card",
+		"carrier_id":      cardID,
+		"activation_type": "realname",
+		"timestamp":       time.Now().Unix(),
+	}
+	payloadBytes, err := sonic.Marshal(payload)
+	if err != nil {
+		h.base.logger.Warn("序列化首次实名激活任务载荷失败", zap.Uint("card_id", cardID), zap.Error(err))
+		return
+	}
+	task := asynq.NewTask(constants.TaskTypePackageFirstActivation, payloadBytes,
+		asynq.MaxRetry(3),
+		asynq.Timeout(30*time.Second),
+		asynq.Queue(constants.QueueDefault),
+	)
+	if _, err := h.asynqClient.EnqueueContext(ctx, task); err != nil {
+		h.base.logger.Warn("提交首次实名激活任务失败", zap.Uint("card_id", cardID), zap.Error(err))
+	}
+}
--- a/internal/task/polling_stats.go
+++ b/internal/task/polling_stats.go
@@ -0,0 +1,39 @@
+package task
+
+import (
+	"context"
+	"time"
+
+	"go.uber.org/zap"
+
+	"github.com/break/junhong_cmp_fiber/pkg/constants"
+)
+
+// updateStats 更新监控统计（成功/失败计数 + 耗时）
+func (b *PollingBase) updateStats(ctx context.Context, taskType string, success bool, duration time.Duration) {
+	key := constants.RedisPollingStatsKey(taskType)
+	pipe := b.redis.Pipeline()
+	if success {
+		pipe.HIncrBy(ctx, key, "success_count_1h", 1)
+	} else {
+		pipe.HIncrBy(ctx, key, "failure_count_1h", 1)
+	}
+	pipe.HIncrBy(ctx, key, "total_duration_1h", duration.Milliseconds())
+	pipe.Expire(ctx, key, 2*time.Hour)
+	_, _ = pipe.Exec(ctx)
+}
+
+// insertDataUsageRecord 写入日流量缓冲到 Redis（INCRBYFLOAT + 48h TTL）
+func (b *PollingBase) insertDataUsageRecord(ctx context.Context, cardID uint, incrementMB float64, checkTime time.Time) {
+	if incrementMB <= 0 {
+		return
+	}
+	dateStr := checkTime.Format("2006-01-02")
+	key := constants.RedisCardDailyTrafficKey(cardID, dateStr)
+	if err := b.redis.IncrByFloat(ctx, key, incrementMB).Err(); err != nil {
+		b.logger.Warn("写入日流量缓冲失败",
+			zap.Uint("card_id", cardID), zap.Float64("increment_mb", incrementMB), zap.Error(err))
+		return
+	}
+	b.redis.Expire(ctx, key, 48*time.Hour)
+}
--- a/internal/task/polling_utils.go
+++ b/internal/task/polling_utils.go
@@ -0,0 +1,88 @@
+package task
+
+import (
+	"strconv"
+	"time"
+
+	"github.com/bytedance/sonic"
+	"go.uber.org/zap"
+	"gorm.io/gorm"
+
+	"github.com/break/junhong_cmp_fiber/internal/model"
+	"github.com/break/junhong_cmp_fiber/pkg/constants"
+)
+
+// getIntervalByTaskType 从配置中提取指定任务类型的轮询间隔（秒）
+func getIntervalByTaskType(cfg *model.PollingConfig, taskType string) int {
+	switch taskType {
+	case constants.TaskTypePollingRealname:
+		if cfg.RealnameCheckInterval != nil && *cfg.RealnameCheckInterval > 0 {
+			return *cfg.RealnameCheckInterval
+		}
+	case constants.TaskTypePollingCarddata:
+		if cfg.CarddataCheckInterval != nil && *cfg.CarddataCheckInterval > 0 {
+			return *cfg.CarddataCheckInterval
+		}
+	case constants.TaskTypePollingPackage:
+		if cfg.PackageCheckInterval != nil && *cfg.PackageCheckInterval > 0 {
+			return *cfg.PackageCheckInterval
+		}
+	case constants.TaskTypePollingProtect:
+		if cfg.ProtectCheckInterval != nil && *cfg.ProtectCheckInterval > 0 {
+			return *cfg.ProtectCheckInterval
+		}
+	}
+	return 0
+}
+
+// shortTaskType 从完整任务类型中提取简短名称（如 polling:carddata → carddata）
+func shortTaskType(fullTaskType string) string {
+	for i := len(fullTaskType) - 1; i >= 0; i-- {
+		if fullTaskType[i] == ':' {
+			return fullTaskType[i+1:]
+		}
+	}
+	return fullTaskType
+}
+
+// parseTaskPayload 解析轮询任务载荷，返回 cardID
+func parseTaskPayload(payload []byte, logger *zap.Logger) (uint, bool) {
+	var p struct {
+		CardID string `json:"card_id"`
+	}
+	if err := sonic.Unmarshal(payload, &p); err != nil {
+		logger.Error("解析任务载荷失败", zap.Error(err))
+		return 0, false
+	}
+	id, parseErr := strconv.ParseUint(p.CardID, 10, 64)
+	if parseErr != nil {
+		logger.Error("解析卡ID失败", zap.String("card_id", p.CardID), zap.Error(parseErr))
+		return 0, false
+	}
+	return uint(id), true
+}
+
+// boolToStr 布尔值转字符串（Redis hash 存储用）
+func boolToStr(b bool) string {
+	if b {
+		return "1"
+	}
+	return "0"
+}
+
+// isNotFound 判断是否为 GORM 记录不存在错误
+func isNotFound(err error) bool {
+	return err == gorm.ErrRecordNotFound
+}
+
+// isResetWindow 判断今天是否在运营商流量重置日窗口内
+// 窗口 = 重置日当天 + 前一天（容错网关数据延迟上报）
+func isResetWindow(now time.Time, resetDay int) bool {
+	today := now.Day()
+	if today == resetDay {
+		return true
+	}
+	resetDate := time.Date(now.Year(), now.Month(), resetDay, 0, 0, 0, 0, now.Location())
+	prevDay := resetDate.AddDate(0, 0, -1).Day()
+	return today == prevDay
+}