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>
253 lines
8.0 KiB
Go
253 lines
8.0 KiB
Go
package postgres
|
||
|
||
import (
|
||
"context"
|
||
"time"
|
||
|
||
"github.com/break/junhong_cmp_fiber/internal/model"
|
||
"github.com/break/junhong_cmp_fiber/internal/store"
|
||
"github.com/break/junhong_cmp_fiber/pkg/constants"
|
||
"github.com/break/junhong_cmp_fiber/pkg/middleware"
|
||
"github.com/redis/go-redis/v9"
|
||
"gorm.io/gorm"
|
||
)
|
||
|
||
type DeviceStore struct {
|
||
db *gorm.DB
|
||
redis *redis.Client
|
||
}
|
||
|
||
func NewDeviceStore(db *gorm.DB, redis *redis.Client) *DeviceStore {
|
||
return &DeviceStore{
|
||
db: db,
|
||
redis: redis,
|
||
}
|
||
}
|
||
|
||
func (s *DeviceStore) Create(ctx context.Context, device *model.Device) error {
|
||
return s.db.WithContext(ctx).Create(device).Error
|
||
}
|
||
|
||
func (s *DeviceStore) CreateBatch(ctx context.Context, devices []*model.Device) error {
|
||
if len(devices) == 0 {
|
||
return nil
|
||
}
|
||
return s.db.WithContext(ctx).CreateInBatches(devices, 100).Error
|
||
}
|
||
|
||
func (s *DeviceStore) GetByID(ctx context.Context, id uint) (*model.Device, error) {
|
||
var device model.Device
|
||
query := s.db.WithContext(ctx).Where("id = ?", id)
|
||
// 应用数据权限过滤(NULL shop_id 对代理用户不可见)
|
||
query = middleware.ApplyShopFilter(ctx, query)
|
||
if err := query.First(&device).Error; err != nil {
|
||
return nil, err
|
||
}
|
||
return &device, nil
|
||
}
|
||
|
||
func (s *DeviceStore) GetByDeviceNo(ctx context.Context, deviceNo string) (*model.Device, error) {
|
||
var device model.Device
|
||
query := s.db.WithContext(ctx).Where("virtual_no = ?", deviceNo)
|
||
// 应用数据权限过滤(NULL shop_id 对代理用户不可见)
|
||
query = middleware.ApplyShopFilter(ctx, query)
|
||
if err := query.First(&device).Error; err != nil {
|
||
return nil, err
|
||
}
|
||
return &device, nil
|
||
}
|
||
|
||
// GetByIdentifier 通过任意标识符查找设备
|
||
// 支持 virtual_no(虚拟号)、imei、sn 三个字段的自动匹配
|
||
func (s *DeviceStore) GetByIdentifier(ctx context.Context, identifier string) (*model.Device, error) {
|
||
var device model.Device
|
||
query := s.db.WithContext(ctx).Where("virtual_no = ? OR imei = ? OR sn = ?", identifier, identifier, identifier)
|
||
// 应用数据权限过滤(NULL shop_id 对代理用户不可见)
|
||
query = middleware.ApplyShopFilter(ctx, query)
|
||
if err := query.First(&device).Error; err != nil {
|
||
return nil, err
|
||
}
|
||
return &device, nil
|
||
}
|
||
|
||
func (s *DeviceStore) GetByIDs(ctx context.Context, ids []uint) ([]*model.Device, error) {
|
||
var devices []*model.Device
|
||
if len(ids) == 0 {
|
||
return devices, nil
|
||
}
|
||
query := s.db.WithContext(ctx).Where("id IN ?", ids)
|
||
// 应用数据权限过滤(NULL shop_id 对代理用户不可见)
|
||
query = middleware.ApplyShopFilter(ctx, query)
|
||
if err := query.Find(&devices).Error; err != nil {
|
||
return nil, err
|
||
}
|
||
return devices, nil
|
||
}
|
||
|
||
func (s *DeviceStore) Update(ctx context.Context, device *model.Device) error {
|
||
return s.db.WithContext(ctx).Save(device).Error
|
||
}
|
||
|
||
func (s *DeviceStore) Delete(ctx context.Context, id uint) error {
|
||
return s.db.WithContext(ctx).Delete(&model.Device{}, id).Error
|
||
}
|
||
|
||
func (s *DeviceStore) List(ctx context.Context, opts *store.QueryOptions, filters map[string]any) ([]*model.Device, int64, error) {
|
||
var devices []*model.Device
|
||
var total int64
|
||
|
||
query := s.db.WithContext(ctx).Model(&model.Device{})
|
||
// 应用数据权限过滤(NULL shop_id 对代理用户不可见)
|
||
query = middleware.ApplyShopFilter(ctx, query)
|
||
|
||
if virtualNo, ok := filters["virtual_no"].(string); ok && virtualNo != "" {
|
||
query = query.Where("virtual_no LIKE ?", "%"+virtualNo+"%")
|
||
}
|
||
if deviceName, ok := filters["device_name"].(string); ok && deviceName != "" {
|
||
query = query.Where("device_name LIKE ?", "%"+deviceName+"%")
|
||
}
|
||
if status, ok := filters["status"].(int); ok && status > 0 {
|
||
query = query.Where("status = ?", status)
|
||
}
|
||
if shopID, ok := filters["shop_id"].(*uint); ok {
|
||
if shopID == nil {
|
||
query = query.Where("shop_id IS NULL")
|
||
} else {
|
||
query = query.Where("shop_id = ?", *shopID)
|
||
}
|
||
}
|
||
if batchNo, ok := filters["batch_no"].(string); ok && batchNo != "" {
|
||
query = query.Where("batch_no = ?", batchNo)
|
||
}
|
||
if deviceType, ok := filters["device_type"].(string); ok && deviceType != "" {
|
||
query = query.Where("device_type = ?", deviceType)
|
||
}
|
||
if manufacturer, ok := filters["manufacturer"].(string); ok && manufacturer != "" {
|
||
query = query.Where("manufacturer LIKE ?", "%"+manufacturer+"%")
|
||
}
|
||
if createdAtStart, ok := filters["created_at_start"].(time.Time); ok && !createdAtStart.IsZero() {
|
||
query = query.Where("created_at >= ?", createdAtStart)
|
||
}
|
||
if createdAtEnd, ok := filters["created_at_end"].(time.Time); ok && !createdAtEnd.IsZero() {
|
||
query = query.Where("created_at <= ?", createdAtEnd)
|
||
}
|
||
if seriesID, ok := filters["series_id"].(uint); ok && seriesID > 0 {
|
||
query = query.Where("series_id = ?", seriesID)
|
||
}
|
||
|
||
if err := query.Count(&total).Error; err != nil {
|
||
return nil, 0, err
|
||
}
|
||
|
||
if opts == nil {
|
||
opts = &store.QueryOptions{
|
||
Page: 1,
|
||
PageSize: constants.DefaultPageSize,
|
||
}
|
||
}
|
||
offset := (opts.Page - 1) * opts.PageSize
|
||
query = query.Offset(offset).Limit(opts.PageSize)
|
||
|
||
if opts.OrderBy != "" {
|
||
query = query.Order(opts.OrderBy)
|
||
} else {
|
||
query = query.Order("created_at DESC")
|
||
}
|
||
|
||
if err := query.Find(&devices).Error; err != nil {
|
||
return nil, 0, err
|
||
}
|
||
|
||
return devices, total, nil
|
||
}
|
||
|
||
func (s *DeviceStore) UpdateShopID(ctx context.Context, id uint, shopID *uint) error {
|
||
return s.db.WithContext(ctx).Model(&model.Device{}).Where("id = ?", id).Update("shop_id", shopID).Error
|
||
}
|
||
|
||
func (s *DeviceStore) BatchUpdateShopIDAndStatus(ctx context.Context, ids []uint, shopID *uint, status int) error {
|
||
if len(ids) == 0 {
|
||
return nil
|
||
}
|
||
updates := map[string]any{
|
||
"shop_id": shopID,
|
||
"status": status,
|
||
"updated_at": time.Now(),
|
||
}
|
||
return s.db.WithContext(ctx).Model(&model.Device{}).Where("id IN ?", ids).Updates(updates).Error
|
||
}
|
||
|
||
func (s *DeviceStore) ExistsByDeviceNoBatch(ctx context.Context, deviceNos []string) (map[string]bool, error) {
|
||
result := make(map[string]bool)
|
||
if len(deviceNos) == 0 {
|
||
return result, nil
|
||
}
|
||
|
||
var existingDevices []struct {
|
||
VirtualNo string
|
||
}
|
||
if err := s.db.WithContext(ctx).Model(&model.Device{}).
|
||
Select("virtual_no").
|
||
Where("virtual_no IN ?", deviceNos).
|
||
Find(&existingDevices).Error; err != nil {
|
||
return nil, err
|
||
}
|
||
|
||
for _, d := range existingDevices {
|
||
result[d.VirtualNo] = true
|
||
}
|
||
return result, nil
|
||
}
|
||
|
||
func (s *DeviceStore) GetByDeviceNos(ctx context.Context, deviceNos []string) ([]*model.Device, error) {
|
||
var devices []*model.Device
|
||
if len(deviceNos) == 0 {
|
||
return devices, nil
|
||
}
|
||
query := s.db.WithContext(ctx).Where("virtual_no IN ?", deviceNos)
|
||
// 应用数据权限过滤(NULL shop_id 对代理用户不可见)
|
||
query = middleware.ApplyShopFilter(ctx, query)
|
||
if err := query.Find(&devices).Error; err != nil {
|
||
return nil, err
|
||
}
|
||
return devices, nil
|
||
}
|
||
|
||
// BatchUpdateSeriesID 批量更新设备的套餐系列ID
|
||
func (s *DeviceStore) BatchUpdateSeriesID(ctx context.Context, deviceIDs []uint, seriesID *uint) error {
|
||
if len(deviceIDs) == 0 {
|
||
return nil
|
||
}
|
||
return s.db.WithContext(ctx).Model(&model.Device{}).
|
||
Where("id IN ?", deviceIDs).
|
||
Update("series_id", seriesID).Error
|
||
}
|
||
|
||
// ListBySeriesID 根据套餐系列ID查询设备列表
|
||
func (s *DeviceStore) ListBySeriesID(ctx context.Context, seriesID uint) ([]*model.Device, error) {
|
||
var devices []*model.Device
|
||
query := s.db.WithContext(ctx).Where("series_id = ?", seriesID)
|
||
// 应用数据权限过滤(NULL shop_id 对代理用户不可见)
|
||
query = middleware.ApplyShopFilter(ctx, query)
|
||
if err := query.Find(&devices).Error; err != nil {
|
||
return nil, err
|
||
}
|
||
return devices, nil
|
||
}
|
||
|
||
func (s *DeviceStore) UpdateRechargeTrackingFields(ctx context.Context, deviceID uint, accumulatedJSON, triggeredJSON string) error {
|
||
return s.db.WithContext(ctx).Model(&model.Device{}).
|
||
Where("id = ?", deviceID).
|
||
Updates(map[string]interface{}{
|
||
"accumulated_recharge_by_series": accumulatedJSON,
|
||
"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
|
||
}
|