feat(手机号资产关联): AUG26-009 手机号—资产关联、十项上限与后台解绑
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 9m2s
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 9m2s
- 新增成对迁移 000223(tb_phone_asset_association,含有效关系部分唯一索引与 down 守卫)与 000224(解绑导入任务表),不回填历史 - H5:need_bind_phone 三支判定(开关关闭完全短路);已有主号幂等建联;十项上限按手机号 advisory 串行化(含换绑到全新号的并发场景);换绑原子迁移与冲突整单回滚;不写遗留列 - 后台:关联列表、单项/批量解绑、CSV 导入解绑(B1–B16),超管/平台 gate + 资产数据范围复核,三态统一文案 - 读侧:卡/设备列表与详情按页一次 IN 聚合;两类导出补「关联手机号」列并保留历史表头反解兼容 - 脱敏:关联审计走独立动作/资源只写脱敏手机号;访问日志手机号类字段脱敏 - 同步主 Spec openspec/specs/phone-asset-association 并归档 AUG26-009,补齐 requirement-evidence 与入口矩阵,context-health 通过
This commit is contained in:
40
internal/exporter/association_phones.go
Normal file
40
internal/exporter/association_phones.go
Normal file
@@ -0,0 +1,40 @@
|
||||
package exporter
|
||||
|
||||
import (
|
||||
"context"
|
||||
"strings"
|
||||
|
||||
"gorm.io/gorm"
|
||||
|
||||
"github.com/break/junhong_cmp_fiber/pkg/constants"
|
||||
)
|
||||
|
||||
// loadAssociatedPhonesByAsset 按本批资产集合一次 IN 批量读取当前有效关联手机号。
|
||||
// 两类导出都必须走本方法:逐资产查询会形成 N+1,且导出是分片批处理,批量读是唯一可行口径。
|
||||
// 同一资产存在多项有效关系时按关系创建顺序以「、」连接为单个单元格;无关联时返回空串。
|
||||
func loadAssociatedPhonesByAsset(ctx context.Context, db *gorm.DB, assetType string, assetIDs []uint) (map[uint]string, error) {
|
||||
cells := make(map[uint]string, len(assetIDs))
|
||||
if len(assetIDs) == 0 {
|
||||
return cells, nil
|
||||
}
|
||||
var rows []struct {
|
||||
AssetID uint `gorm:"column:asset_id"`
|
||||
Phone string `gorm:"column:phone"`
|
||||
}
|
||||
if err := db.WithContext(ctx).Table("tb_phone_asset_association").
|
||||
Select("asset_id", "phone").
|
||||
Where("asset_type = ? AND status = ? AND asset_id IN ?",
|
||||
assetType, constants.PhoneAssetAssociationStatusValid, assetIDs).
|
||||
Order("asset_id ASC, id ASC").
|
||||
Scan(&rows).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
grouped := make(map[uint][]string, len(rows))
|
||||
for _, row := range rows {
|
||||
grouped[row.AssetID] = append(grouped[row.AssetID], row.Phone)
|
||||
}
|
||||
for assetID, phones := range grouped {
|
||||
cells[assetID] = strings.Join(phones, "、")
|
||||
}
|
||||
return cells, nil
|
||||
}
|
||||
@@ -14,8 +14,13 @@ import (
|
||||
const (
|
||||
deviceExportBaseHeaderCount = 6
|
||||
deviceExportCardGroupSize = 5
|
||||
deviceExportTailHeaderCount = 5
|
||||
deviceExportMinCardGroups = 1
|
||||
// deviceExportTailHeaderCount 是当前尾部固定列数(含新增的「关联手机号」列)。
|
||||
deviceExportTailHeaderCount = 6
|
||||
// deviceExportLegacyTailHeaderCount 是新增尾部列之前的固定列数,仅供历史任务表头反解回退使用。
|
||||
deviceExportLegacyTailHeaderCount = 5
|
||||
deviceExportMinCardGroups = 1
|
||||
// deviceExportAssociatedPhoneHeader 是「关联手机号」列的表头,固定位于导出尾部。
|
||||
deviceExportAssociatedPhoneHeader = "关联手机号"
|
||||
)
|
||||
|
||||
// DeviceDataSource 设备导出数据源。
|
||||
@@ -89,9 +94,14 @@ func (s *DeviceDataSource) Fetch(ctx context.Context, params ExportParams, offse
|
||||
return nil, err
|
||||
}
|
||||
|
||||
associatedPhones, err := loadAssociatedPhonesByAsset(ctx, s.db, constants.AssetTypeDevice, deviceIDs)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
rows := make([][]string, 0, len(devices))
|
||||
for _, item := range devices {
|
||||
rows = append(rows, buildDeviceExportRow(item, cardMap[item.ID], packageMap[item.ID], cardGroups))
|
||||
rows = append(rows, buildDeviceExportRow(item, cardMap[item.ID], packageMap[item.ID], associatedPhones[item.ID], cardGroups))
|
||||
}
|
||||
return rows, nil
|
||||
}
|
||||
@@ -375,11 +385,12 @@ func buildDeviceExportHeaders(cardGroups int) []string {
|
||||
"套餐的到期时间",
|
||||
"当前套餐",
|
||||
"钱包余额",
|
||||
deviceExportAssociatedPhoneHeader,
|
||||
)
|
||||
return headers
|
||||
}
|
||||
|
||||
func buildDeviceExportRow(item deviceExportRow, cards []deviceExportCardRow, pkg deviceExportPackageRow, cardGroups int) []string {
|
||||
func buildDeviceExportRow(item deviceExportRow, cards []deviceExportCardRow, pkg deviceExportPackageRow, associatedPhone string, cardGroups int) []string {
|
||||
if cardGroups < deviceExportMinCardGroups {
|
||||
cardGroups = deviceExportMinCardGroups
|
||||
}
|
||||
@@ -420,15 +431,27 @@ func buildDeviceExportRow(item deviceExportRow, cards []deviceExportCardRow, pkg
|
||||
formatOptionalTime(pkg.ExpiresAt),
|
||||
pkg.PackageName,
|
||||
formatMoneyYuan(item.WalletBalance),
|
||||
associatedPhone,
|
||||
)
|
||||
return row
|
||||
}
|
||||
|
||||
// cardGroupCountFromHeaders 从已持久化的表头反解卡组列数。
|
||||
// 先按当前尾列数判定;不整除时回退到新增尾部列之前的尾列数再判定,
|
||||
// 否则历史任务凭 ResolvedHeaders 重导出时列组数会被算成 0,缺失全部卡列。
|
||||
func cardGroupCountFromHeaders(headers []string) int {
|
||||
if len(headers) < deviceExportBaseHeaderCount+deviceExportTailHeaderCount {
|
||||
if count := cardGroupCountWithTail(headers, deviceExportTailHeaderCount); count > 0 {
|
||||
return count
|
||||
}
|
||||
return cardGroupCountWithTail(headers, deviceExportLegacyTailHeaderCount)
|
||||
}
|
||||
|
||||
// cardGroupCountWithTail 按指定尾部固定列数反解卡组列数,不整除即无法确定列组。
|
||||
func cardGroupCountWithTail(headers []string, tailHeaderCount int) int {
|
||||
if len(headers) < deviceExportBaseHeaderCount+tailHeaderCount {
|
||||
return 0
|
||||
}
|
||||
cardColumnCount := len(headers) - deviceExportBaseHeaderCount - deviceExportTailHeaderCount
|
||||
cardColumnCount := len(headers) - deviceExportBaseHeaderCount - tailHeaderCount
|
||||
if cardColumnCount <= 0 || cardColumnCount%deviceExportCardGroupSize != 0 {
|
||||
return 0
|
||||
}
|
||||
|
||||
@@ -37,7 +37,8 @@ func (s *IotCardDataSource) Count(ctx context.Context, params ExportParams) (int
|
||||
|
||||
// Headers 返回 IoT 卡导出表头。
|
||||
func (s *IotCardDataSource) Headers(ctx context.Context, params ExportParams) ([]string, error) {
|
||||
return []string{"ICCID", "MSISDN", "绑定设备虚拟号", "运营商", "店铺名称", "绑定设备名称", "是否实名", "实名时间", "网络状态", "套餐名称", "使用流量(MB)", "剩余流量(MB)"}, nil
|
||||
// 「关联手机号」固定追加在尾部:导出表头在 dispatch 阶段落库,历史任务重导出沿用同一列序。
|
||||
return []string{"ICCID", "MSISDN", "绑定设备虚拟号", "运营商", "店铺名称", "绑定设备名称", "是否实名", "实名时间", "网络状态", "套餐名称", "使用流量(MB)", "剩余流量(MB)", iotCardExportAssociatedPhoneHeader}, nil
|
||||
}
|
||||
|
||||
// Fetch 按 offset/limit 查询 IoT 卡导出数据。
|
||||
@@ -49,6 +50,7 @@ func (s *IotCardDataSource) Fetch(ctx context.Context, params ExportParams, offs
|
||||
var items []iotCardExportRow
|
||||
query := s.applyFilters(ctx, s.baseQuery(ctx), params).
|
||||
Select(`
|
||||
c.id,
|
||||
c.iccid,
|
||||
c.msisdn,
|
||||
c.device_virtual_no,
|
||||
@@ -69,6 +71,15 @@ func (s *IotCardDataSource) Fetch(ctx context.Context, params ExportParams, offs
|
||||
return nil, err
|
||||
}
|
||||
|
||||
cardIDs := make([]uint, 0, len(items))
|
||||
for _, item := range items {
|
||||
cardIDs = append(cardIDs, item.ID)
|
||||
}
|
||||
associatedPhones, err := loadAssociatedPhonesByAsset(ctx, s.db, constants.AssetTypeIotCard, cardIDs)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
rows := make([][]string, 0, len(items))
|
||||
for _, item := range items {
|
||||
rows = append(rows, []string{
|
||||
@@ -84,6 +95,7 @@ func (s *IotCardDataSource) Fetch(ctx context.Context, params ExportParams, offs
|
||||
item.PackageName,
|
||||
strconv.FormatInt(item.DataUsageMB, 10),
|
||||
strconv.FormatInt(remainingPackageDataMB(item.DataLimitMB, item.DataUsageMB), 10),
|
||||
associatedPhones[item.ID],
|
||||
})
|
||||
}
|
||||
return rows, nil
|
||||
@@ -219,7 +231,11 @@ func (s *IotCardDataSource) applyFilters(ctx context.Context, query *gorm.DB, pa
|
||||
return query
|
||||
}
|
||||
|
||||
// iotCardExportAssociatedPhoneHeader 是「关联手机号」列的表头,固定位于导出尾部。
|
||||
const iotCardExportAssociatedPhoneHeader = "关联手机号"
|
||||
|
||||
type iotCardExportRow struct {
|
||||
ID uint `gorm:"column:id"`
|
||||
ICCID string `gorm:"column:iccid"`
|
||||
MSISDN string `gorm:"column:msisdn"`
|
||||
DeviceVirtualNo string `gorm:"column:device_virtual_no"`
|
||||
|
||||
Reference in New Issue
Block a user