All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 9m46s
【核心变更】
1. 停复机逻辑统一(StopResumeService)
- 新增 EvaluateAndAct 统一入口,封装三条件停复机判断
- 停机条件:无套餐(no_package) / 流量耗尽(traffic_exhausted) / 未实名(not_realname)
- 复机条件:stop_reason 合规 + 有套餐且未耗尽 + 已实名或行业卡
- 修复设备套餐 Bug:hasValidPackage 按 device_id 查套餐,而非仅 iot_card_id
- 设备维度停复机加幂等锁(Redis SetNX,TTL 30s),防止多卡并发重复调 Gateway
2. Redis 分片队列(PollingQueueManager)
- 新建 queue_manager.go,封装所有轮询 Redis 操作
- 16 分片 Sorted Set,Key 格式:polling:shard:{shardID}:queue:{taskType}
- Lua 脚本原子出队(ZRANGEBYSCORE + 分批 ZREM),消除竞态窗口
- 新增背压检测:队列深度超 50 万时 Scheduler 跳过该分片
- RemoveFromAllQueues 覆盖 4 种任务类型(含 protect)
3. Handler 拆分(polling_handler.go 1360行 → 5个专注文件)
- polling_base.go:共享基类(并发控制/卡缓存/重入队)
- polling_realname_handler.go:实名采集,实名 0→1 时立即触发复机
- polling_carddata_handler.go:流量采集,保留跨月边界检测逻辑
- polling_package_handler.go:套餐采集,委托 EvaluateAndAct 决策
- polling_protect_handler.go:保护期一致性检查,保护期内强制修正
4. 配置管理(PollingConfigManager)
- 新建 config_manager.go,从 scheduler.go 提取配置职责
- 内存缓存 + 5 分钟定时刷新,刷新失败保留原缓存
- 修复 getCardCondition:停机卡返回 suspended,不再错配 activated 配置
5. 渐进式初始化(CardInitializer)
- 新建 initializer.go,分批加载(每批 10 万),批次间 sleep 500ms
- 过滤 enable_polling=false 的卡,初始化完成前 Scheduler 不出队
6. 卡生命周期服务(PollingLifecycleService)
- 新建 lifecycle_service.go,替代已删除的 callbacks.go 和 api_callback.go
- OnCardCreated/OnCardEnabled/OnCardStatusChanged 入队前检查 enable_polling
7. Scheduler 精简(1000+行 → 227行)
- 保留纯调度循环:scheduleLoop + processShardSchedule + enqueueBatch
- 保留每 10 秒触发套餐过期检测和流量重置
- 移除所有 DB 操作、配置加载、卡初始化逻辑
8. 轮询管控 API(enable_polling)
- 新增 PUT /api/admin/assets/:id/polling-status 接口
- 支持对设备/卡维度开关轮询,关闭后从所有分片队列移除
9. 数据库迁移
- 000103:tb_device 新增 enable_polling 字段(boolean, NOT NULL, DEFAULT true)
- 000104:新增 suspended 轮询配置,为 activated 配置补全 protect_check_interval
【文件统计】
- 新增:19 个文件(handler × 5、polling 组件 × 4、迁移 × 3 等)
- 修改:20 个文件(bootstrap 注入、store 接口、monitoring 适配分片等)
- 删除:3 个文件(polling_handler.go、callbacks.go、api_callback.go)
Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)
Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
122 lines
5.0 KiB
Go
122 lines
5.0 KiB
Go
package routes
|
||
|
||
import (
|
||
"github.com/gofiber/fiber/v2"
|
||
|
||
"github.com/break/junhong_cmp_fiber/internal/handler/admin"
|
||
"github.com/break/junhong_cmp_fiber/internal/model/dto"
|
||
"github.com/break/junhong_cmp_fiber/pkg/openapi"
|
||
)
|
||
|
||
func registerAssetRoutes(router fiber.Router, handler *admin.AssetHandler, walletHandler *admin.AssetWalletHandler, doc *openapi.Generator, basePath string) {
|
||
assets := router.Group("/assets")
|
||
groupPath := basePath + "/assets"
|
||
|
||
Register(assets, doc, groupPath, "GET", "/resolve/:identifier", handler.Resolve, RouteSpec{
|
||
Summary: "解析资产",
|
||
Description: "通过虚拟号/ICCID/IMEI/SN/MSISDN 解析设备或卡的完整详情。企业账号禁止调用。",
|
||
Tags: []string{"资产管理"},
|
||
Input: new(dto.AssetResolveRequest),
|
||
Output: new(dto.AssetResolveResponse),
|
||
Auth: true,
|
||
})
|
||
|
||
Register(assets, doc, groupPath, "GET", "/:asset_type/:id/realtime-status", handler.RealtimeStatus, RouteSpec{
|
||
Summary: "资产实时状态",
|
||
Description: "读取 DB/Redis 中的持久化状态,不调网关。asset_type 为 card 或 device。",
|
||
Tags: []string{"资产管理"},
|
||
Input: new(dto.AssetTypeIDRequest),
|
||
Output: new(dto.AssetRealtimeStatusResponse),
|
||
Auth: true,
|
||
})
|
||
|
||
Register(assets, doc, groupPath, "POST", "/:asset_type/:id/refresh", handler.Refresh, RouteSpec{
|
||
Summary: "刷新资产状态",
|
||
Description: "主动调网关同步最新状态。设备有30秒冷却期。",
|
||
Tags: []string{"资产管理"},
|
||
Input: new(dto.AssetTypeIDRequest),
|
||
Output: new(dto.AssetRealtimeStatusResponse),
|
||
Auth: true,
|
||
})
|
||
|
||
Register(assets, doc, groupPath, "GET", "/:asset_type/:id/packages", handler.Packages, RouteSpec{
|
||
Summary: "资产套餐列表",
|
||
Description: "查询该资产所有套餐记录,含虚流量换算结果。支持分页(默认 page=1, page_size=50, 最大100)。",
|
||
Tags: []string{"资产管理"},
|
||
Input: new(dto.AssetPackagesRequest),
|
||
Output: new(dto.AssetPackagesResult),
|
||
Auth: true,
|
||
})
|
||
|
||
Register(assets, doc, groupPath, "GET", "/:asset_type/:id/current-package", handler.CurrentPackage, RouteSpec{
|
||
Summary: "当前生效套餐",
|
||
Tags: []string{"资产管理"},
|
||
Input: new(dto.AssetTypeIDRequest),
|
||
Output: new(dto.AssetPackageResponse),
|
||
Auth: true,
|
||
})
|
||
|
||
Register(assets, doc, groupPath, "POST", "/device/:device_id/stop", handler.StopDevice, RouteSpec{
|
||
Summary: "设备停机",
|
||
Description: "批量停机设备下所有已实名卡。设置1小时停机保护期。",
|
||
Tags: []string{"资产管理"},
|
||
Input: new(dto.DeviceIDRequest),
|
||
Output: new(dto.DeviceSuspendResponse),
|
||
Auth: true,
|
||
})
|
||
|
||
Register(assets, doc, groupPath, "POST", "/device/:device_id/start", handler.StartDevice, RouteSpec{
|
||
Summary: "设备复机",
|
||
Description: "批量复机设备下所有已实名卡。设置1小时复机保护期。",
|
||
Tags: []string{"资产管理"},
|
||
Input: new(dto.DeviceIDRequest),
|
||
Output: nil,
|
||
Auth: true,
|
||
})
|
||
|
||
Register(assets, doc, groupPath, "POST", "/card/:iccid/stop", handler.StopCard, RouteSpec{
|
||
Summary: "单卡停机",
|
||
Description: "手动停机单张卡(通过ICCID)。受设备保护期约束。",
|
||
Tags: []string{"资产管理"},
|
||
Input: new(dto.CardICCIDRequest),
|
||
Output: nil,
|
||
Auth: true,
|
||
})
|
||
|
||
Register(assets, doc, groupPath, "POST", "/card/:iccid/start", handler.StartCard, RouteSpec{
|
||
Summary: "单卡复机",
|
||
Description: "手动复机单张卡(通过ICCID)。受设备保护期约束。",
|
||
Tags: []string{"资产管理"},
|
||
Input: new(dto.CardICCIDRequest),
|
||
Output: nil,
|
||
Auth: true,
|
||
})
|
||
|
||
Register(assets, doc, groupPath, "GET", "/:asset_type/:id/wallet", walletHandler.GetWallet, RouteSpec{
|
||
Summary: "资产钱包概况",
|
||
Description: "查询指定卡或设备的钱包余额概况。企业账号禁止调用。",
|
||
Tags: []string{"资产管理"},
|
||
Input: new(dto.AssetTypeIDRequest),
|
||
Output: new(dto.AssetWalletResponse),
|
||
Auth: true,
|
||
})
|
||
|
||
Register(assets, doc, groupPath, "GET", "/:asset_type/:id/wallet/transactions", walletHandler.ListTransactions, RouteSpec{
|
||
Summary: "资产钱包流水列表",
|
||
Description: "分页查询指定资产的钱包收支流水,含充值/扣款来源编号。企业账号禁止调用。",
|
||
Tags: []string{"资产管理"},
|
||
Input: new(dto.AssetWalletTransactionListRequest),
|
||
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,
|
||
})
|
||
}
|