break
62419d4b17
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 13m40s
统一时间筛选：新增共享严格解析器 pkg/utils/time_range.go，只接受带显式时区的 RFC3339 秒级时间（拒绝小数秒、无时区、date-only、空格分隔、±hhmm、未补零、非法日期与越界偏移），闭区间含两端、归一为 UTC 瞬时，创建期与执行期共用同一份实现。 端点改造（13 个入口）：IoT 卡导入任务、设备导入任务、导出任务列表、订单列表参数名不变仅收紧解析；换货、分配记录、代理充值、临期列表改名 start_time/end_time（旧参数名显式拒绝）；提现记录两处删除解析失败静默跳过，非法参数一律 1001；授权记录由起始闭结束开改为闭区间含两端；临期列表改按当前生效主套餐最终到期时刻比较，保留剩余天数上下限与既有粗放窗口。 临期导出新建：新场景 expiring_asset 与受控入口 POST /api/admin/expiring-assets/export，复用列表候选预筛与最终到期推算，一行一资产、加油包不单独成行，列序与 111 §18.1 逐列一致，店铺/业务员/用户组按执行时当前归属补充且不超出创建时冻结范围。 佣金明细导出新增按创建时间闭区间筛选（原佣金与回溯两条分支各自创建时间列），记录粒度、列定义与余额口径不变。 冻结与遗留任务：创建期把筛选与时间边界规范化为 UTC RFC3339 秒级串写入既有 query_json，无新列无迁移；执行期只按冻结值严格解析，非法冻结值在任何分片与文件动作前落任务失败并写安全摘要，不放行全量；重试沿用原快照。达量预警导出执行期同样纳入严格解析（其入口契约、列定义与触发快照口径不变）。 归档 add-export-time-filter-standards 并新建主 Spec openspec/specs/export-time-filter/spec.md，同步 requirement-evidence.json 与入口能力矩阵，README 导出场景清单更新为 11 个场景。 验证：junhong_cmp_test + 本地隔离 Redis（DB7，测试部署共享队列 DB6 未被占用）实跑 85 PASS / 0 FAIL（接受/拒绝集合、区间与顺序语义、列表与导出同筛选行集一致、代理 HTTP 全链路与范围冻结、遗留旧格式任务安全失败、列与余额口径回归、表头逐字），门禁 gofmt/go build/gendocs 两次一致/openspec validate/doctor/context-health 全绿；无 Schema 变更、无迁移、无运行时开关。
369 lines
13 KiB
Go
369 lines
13 KiB
Go
package device_import
|
||
|
||
import (
|
||
"context"
|
||
"path/filepath"
|
||
"strings"
|
||
"time"
|
||
|
||
"github.com/break/junhong_cmp_fiber/internal/infrastructure/audit"
|
||
"github.com/break/junhong_cmp_fiber/internal/model"
|
||
"github.com/break/junhong_cmp_fiber/internal/model/dto"
|
||
"github.com/break/junhong_cmp_fiber/internal/store"
|
||
"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"
|
||
"github.com/break/junhong_cmp_fiber/pkg/middleware"
|
||
"github.com/break/junhong_cmp_fiber/pkg/queue"
|
||
"github.com/hibiken/asynq"
|
||
"gorm.io/gorm"
|
||
)
|
||
|
||
type Service struct {
|
||
db *gorm.DB
|
||
importTaskStore *postgres.DeviceImportTaskStore
|
||
queueClient *queue.Client
|
||
auditWriter *audit.Writer
|
||
}
|
||
|
||
type DeviceImportPayload struct {
|
||
TaskID uint `json:"task_id"`
|
||
}
|
||
|
||
func New(
|
||
db *gorm.DB,
|
||
importTaskStore *postgres.DeviceImportTaskStore,
|
||
queueClient *queue.Client,
|
||
auditWriters ...*audit.Writer,
|
||
) *Service {
|
||
service := &Service{
|
||
db: db,
|
||
importTaskStore: importTaskStore,
|
||
queueClient: queueClient,
|
||
}
|
||
if len(auditWriters) > 0 {
|
||
service.auditWriter = auditWriters[0]
|
||
}
|
||
return service
|
||
}
|
||
|
||
func (s *Service) CreateImportTask(ctx context.Context, req *dto.ImportDeviceRequest) (*dto.ImportDeviceResponse, error) {
|
||
userID := middleware.GetUserIDFromContext(ctx)
|
||
if userID == 0 {
|
||
return nil, errors.New(errors.CodeUnauthorized, "未授权访问")
|
||
}
|
||
|
||
taskNo := s.importTaskStore.GenerateTaskNo(ctx)
|
||
fileName := filepath.Base(req.FileKey)
|
||
|
||
task := &model.DeviceImportTask{
|
||
TaskNo: taskNo,
|
||
OperationType: constants.DeviceImportOperationCreate,
|
||
Status: model.ImportTaskStatusPending,
|
||
BatchNo: req.BatchNo,
|
||
FileName: fileName,
|
||
StorageKey: req.FileKey,
|
||
RealnamePolicy: req.RealnamePolicy,
|
||
CreatorName: middleware.GetUsernameFromContext(ctx),
|
||
}
|
||
task.Creator = userID
|
||
task.Updater = userID
|
||
|
||
if s.auditWriter == nil {
|
||
return nil, errors.New(errors.CodeInvalidStatus, "设备导入任务统一审计接缝未配置")
|
||
}
|
||
if err := s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
|
||
if err := tx.WithContext(ctx).Create(task).Error; err != nil {
|
||
return err
|
||
}
|
||
return s.writeDeviceImportTaskAudit(ctx, tx, task, nil, deviceImportTaskState(task), constants.AuditResultSuccess, "created", "", "")
|
||
}); err != nil {
|
||
appErr := errors.Wrap(errors.CodeInternalError, err, "创建导入任务失败")
|
||
s.recordDeviceImportTaskAudit(ctx, task, nil, deviceImportTaskState(task), constants.AuditResultFailed, "create_failed", errors.CodeDatabaseError, "创建设备导入任务失败")
|
||
return nil, appErr
|
||
}
|
||
|
||
payload := DeviceImportPayload{TaskID: task.ID}
|
||
err := s.queueClient.EnqueueTask(
|
||
ctx,
|
||
constants.TaskTypeDeviceImport,
|
||
payload,
|
||
asynq.Queue(constants.QueueForTaskType(constants.TaskTypeDeviceImport)),
|
||
)
|
||
if err != nil {
|
||
if secondaryErr := s.failEnqueueWithAudit(ctx, task, "设备导入任务入队失败"); secondaryErr != nil {
|
||
s.recordDeviceImportTaskAudit(ctx, task, nil, deviceImportTaskState(task), constants.AuditResultFailed, "enqueue_audit_failed", errors.CodeTaskQueueError, "设备导入任务入队失败")
|
||
}
|
||
appErr := errors.Wrap(errors.CodeInternalError, err, "任务入队失败")
|
||
return nil, appErr
|
||
}
|
||
|
||
return &dto.ImportDeviceResponse{
|
||
TaskID: task.ID,
|
||
TaskNo: taskNo,
|
||
Message: "导入任务已创建，Worker 将异步处理文件",
|
||
}, nil
|
||
}
|
||
|
||
// CreateBatchAllocationTask 复用设备导入任务创建单列 CSV 批量操作任务。
|
||
func (s *Service) CreateBatchAllocationTask(ctx context.Context, req *dto.CreateDeviceBatchAllocationRequest) (*dto.CreateDeviceBatchAllocationResponse, error) {
|
||
userID := middleware.GetUserIDFromContext(ctx)
|
||
userType := middleware.GetUserTypeFromContext(ctx)
|
||
if userID == 0 || (userType != constants.UserTypeSuperAdmin && userType != constants.UserTypePlatform && userType != constants.UserTypeAgent) {
|
||
return nil, errors.New(errors.CodeForbidden, "仅平台和代理后台账号可创建设备CSV批量任务")
|
||
}
|
||
if req == nil || !constants.IsDeviceImportOperation(req.OperationType) || req.OperationType == constants.DeviceImportOperationCreate {
|
||
return nil, errors.New(errors.CodeInvalidParam, "设备CSV批量任务参数不合法")
|
||
}
|
||
if (req.OperationType == constants.DeviceImportOperationRecall && req.TargetID != 0) ||
|
||
(req.OperationType != constants.DeviceImportOperationRecall && req.TargetID == 0) {
|
||
return nil, errors.New(errors.CodeInvalidParam, "设备CSV批量任务参数不合法")
|
||
}
|
||
if !strings.HasPrefix(req.FileKey, constants.DeviceBatchAllocationStoragePrefix+"/") || !strings.EqualFold(filepath.Ext(req.FileKey), ".csv") {
|
||
return nil, errors.New(errors.CodeInvalidParam, "设备CSV批量文件必须是指定目录下的CSV文件")
|
||
}
|
||
|
||
taskNo := s.importTaskStore.GenerateTaskNo(ctx)
|
||
var operatorShopID *uint
|
||
if userType == constants.UserTypeAgent {
|
||
shopID := middleware.GetShopIDFromContext(ctx)
|
||
if shopID == 0 {
|
||
return nil, errors.New(errors.CodeForbidden, "代理账号缺少店铺归属")
|
||
}
|
||
operatorShopID = &shopID
|
||
}
|
||
var targetID *uint
|
||
if req.OperationType != constants.DeviceImportOperationRecall {
|
||
targetID = &req.TargetID
|
||
}
|
||
task := &model.DeviceImportTask{
|
||
TaskNo: taskNo, OperationType: req.OperationType, TargetID: targetID,
|
||
OperatorType: userType, OperatorShopID: operatorShopID,
|
||
Status: model.ImportTaskStatusPending, StorageKey: req.FileKey, FileName: filepath.Base(req.FileKey),
|
||
CreatorName: middleware.GetUsernameFromContext(ctx),
|
||
}
|
||
task.Creator, task.Updater = userID, userID
|
||
if s.auditWriter == nil {
|
||
return nil, errors.New(errors.CodeInvalidStatus, "设备批量任务统一审计接缝未配置")
|
||
}
|
||
if err := s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
|
||
if err := tx.WithContext(ctx).Create(task).Error; err != nil {
|
||
return err
|
||
}
|
||
return s.writeDeviceImportTaskAudit(ctx, tx, task, nil, deviceImportTaskState(task), constants.AuditResultSuccess, "created", "", "")
|
||
}); err != nil {
|
||
appErr := errors.Wrap(errors.CodeDatabaseError, err, "创建设备CSV批量任务失败")
|
||
s.recordDeviceImportTaskAudit(ctx, task, nil, deviceImportTaskState(task), constants.AuditResultFailed, "create_failed", errors.CodeDatabaseError, "创建设备 CSV 批量任务失败")
|
||
return nil, appErr
|
||
}
|
||
if err := s.queueClient.EnqueueTask(ctx, constants.TaskTypeDeviceImport, DeviceImportPayload{TaskID: task.ID},
|
||
asynq.Queue(constants.QueueForTaskType(constants.TaskTypeDeviceImport)),
|
||
asynq.Timeout(constants.DeviceBatchAllocationTaskTimeout)); err != nil {
|
||
if secondaryErr := s.failEnqueueWithAudit(ctx, task, "设备 CSV 批量任务入队失败"); secondaryErr != nil {
|
||
s.recordDeviceImportTaskAudit(ctx, task, nil, deviceImportTaskState(task), constants.AuditResultFailed, "enqueue_audit_failed", errors.CodeTaskQueueError, "设备 CSV 批量任务入队失败")
|
||
}
|
||
appErr := errors.Wrap(errors.CodeInternalError, err, "设备CSV批量任务入队失败")
|
||
return nil, appErr
|
||
}
|
||
return &dto.CreateDeviceBatchAllocationResponse{
|
||
TaskID: task.ID, TaskNo: task.TaskNo, Message: "设备CSV批量任务已创建，Worker 将异步处理CSV文件",
|
||
}, nil
|
||
}
|
||
|
||
func (s *Service) List(ctx context.Context, req *dto.ListDeviceImportTaskRequest, startTime, endTime *time.Time) (*dto.ListDeviceImportTaskResponse, error) {
|
||
page := req.Page
|
||
pageSize := req.PageSize
|
||
if page == 0 {
|
||
page = 1
|
||
}
|
||
if pageSize == 0 {
|
||
pageSize = constants.DefaultPageSize
|
||
}
|
||
|
||
opts := &store.QueryOptions{
|
||
Page: page,
|
||
PageSize: pageSize,
|
||
}
|
||
|
||
filters := make(map[string]interface{})
|
||
if req.Status != nil {
|
||
filters["status"] = *req.Status
|
||
}
|
||
if req.OperationType != "" {
|
||
filters["operation_type"] = req.OperationType
|
||
}
|
||
if req.BatchNo != "" {
|
||
filters["batch_no"] = req.BatchNo
|
||
}
|
||
if startTime != nil {
|
||
filters["start_time"] = *startTime
|
||
}
|
||
if endTime != nil {
|
||
filters["end_time"] = *endTime
|
||
}
|
||
|
||
tasks, total, err := s.importTaskStore.List(ctx, opts, filters)
|
||
if err != nil {
|
||
return nil, err
|
||
}
|
||
targetNames, err := s.loadTargetNames(ctx, tasks)
|
||
if err != nil {
|
||
return nil, err
|
||
}
|
||
|
||
list := make([]*dto.DeviceImportTaskResponse, 0, len(tasks))
|
||
for _, task := range tasks {
|
||
list = append(list, s.toTaskResponse(task, targetNames))
|
||
}
|
||
|
||
return &dto.ListDeviceImportTaskResponse{
|
||
List: list,
|
||
Total: total,
|
||
Page: page,
|
||
PageSize: pageSize,
|
||
}, nil
|
||
}
|
||
|
||
func (s *Service) GetByID(ctx context.Context, id uint) (*dto.DeviceImportTaskDetailResponse, error) {
|
||
task, err := s.importTaskStore.GetByID(ctx, id)
|
||
if err != nil {
|
||
return nil, errors.New(errors.CodeNotFound, "导入任务不存在")
|
||
}
|
||
targetNames, err := s.loadTargetNames(ctx, []*model.DeviceImportTask{task})
|
||
if err != nil {
|
||
return nil, err
|
||
}
|
||
|
||
resp := &dto.DeviceImportTaskDetailResponse{
|
||
DeviceImportTaskResponse: *s.toTaskResponse(task, targetNames),
|
||
SkippedItems: make([]*dto.DeviceImportResultItemDTO, 0),
|
||
FailedItems: make([]*dto.DeviceImportResultItemDTO, 0),
|
||
WarningItems: make([]*dto.DeviceImportResultItemDTO, 0),
|
||
}
|
||
|
||
for _, item := range task.SkippedItems {
|
||
resp.SkippedItems = append(resp.SkippedItems, &dto.DeviceImportResultItemDTO{
|
||
Line: item.Line, VirtualNo: item.ICCID, DeviceIdentifier: item.ICCID, Reason: item.Reason,
|
||
})
|
||
}
|
||
|
||
for _, item := range task.FailedItems {
|
||
resp.FailedItems = append(resp.FailedItems, &dto.DeviceImportResultItemDTO{
|
||
Line: item.Line, VirtualNo: item.ICCID, DeviceIdentifier: item.ICCID, Reason: item.Reason,
|
||
})
|
||
}
|
||
|
||
for _, item := range task.WarningItems {
|
||
resp.WarningItems = append(resp.WarningItems, &dto.DeviceImportResultItemDTO{
|
||
Line: item.Line, VirtualNo: item.ICCID, DeviceIdentifier: item.ICCID, Reason: item.Reason,
|
||
})
|
||
}
|
||
|
||
return resp, nil
|
||
}
|
||
|
||
type deviceImportTargetNames struct {
|
||
shops map[uint]string
|
||
series map[uint]string
|
||
}
|
||
|
||
// loadTargetNames 批量解析任务目标名称，避免列表逐条查询。
|
||
func (s *Service) loadTargetNames(ctx context.Context, tasks []*model.DeviceImportTask) (deviceImportTargetNames, error) {
|
||
shopIDs := make([]uint, 0)
|
||
seriesIDs := make([]uint, 0)
|
||
for _, task := range tasks {
|
||
if task.TargetID == nil {
|
||
continue
|
||
}
|
||
switch task.OperationType {
|
||
case constants.DeviceImportOperationAssignShop:
|
||
shopIDs = append(shopIDs, *task.TargetID)
|
||
case constants.DeviceImportOperationAssignSeries:
|
||
seriesIDs = append(seriesIDs, *task.TargetID)
|
||
}
|
||
}
|
||
names := deviceImportTargetNames{shops: make(map[uint]string), series: make(map[uint]string)}
|
||
if len(shopIDs) > 0 {
|
||
var shops []model.Shop
|
||
if err := s.db.WithContext(ctx).Select("id, shop_name").Where("id IN ?", shopIDs).Find(&shops).Error; err != nil {
|
||
return names, errors.Wrap(errors.CodeDatabaseError, err, "查询设备批量任务目标店铺失败")
|
||
}
|
||
for _, shop := range shops {
|
||
names.shops[shop.ID] = shop.ShopName
|
||
}
|
||
}
|
||
if len(seriesIDs) > 0 {
|
||
var series []model.PackageSeries
|
||
if err := s.db.WithContext(ctx).Select("id, series_name").Where("id IN ?", seriesIDs).Find(&series).Error; err != nil {
|
||
return names, errors.Wrap(errors.CodeDatabaseError, err, "查询设备批量任务目标套餐系列失败")
|
||
}
|
||
for _, item := range series {
|
||
names.series[item.ID] = item.SeriesName
|
||
}
|
||
}
|
||
return names, nil
|
||
}
|
||
|
||
func (s *Service) toTaskResponse(task *model.DeviceImportTask, targetNames deviceImportTargetNames) *dto.DeviceImportTaskResponse {
|
||
var startedAt, completedAt *time.Time
|
||
if task.StartedAt != nil {
|
||
startedAt = task.StartedAt
|
||
}
|
||
if task.CompletedAt != nil {
|
||
completedAt = task.CompletedAt
|
||
}
|
||
|
||
return &dto.DeviceImportTaskResponse{
|
||
ID: task.ID,
|
||
TaskNo: task.TaskNo,
|
||
OperationType: task.OperationType,
|
||
OperationName: constants.GetDeviceImportOperationName(task.OperationType),
|
||
TargetID: task.TargetID,
|
||
TargetName: targetNames.resolve(task),
|
||
Status: task.Status,
|
||
StatusName: getStatusText(task.Status),
|
||
StatusText: getStatusText(task.Status),
|
||
BatchNo: task.BatchNo,
|
||
RealnamePolicy: task.RealnamePolicy,
|
||
FileName: task.FileName,
|
||
TotalCount: task.TotalCount,
|
||
SuccessCount: task.SuccessCount,
|
||
SkipCount: task.SkipCount,
|
||
FailCount: task.FailCount,
|
||
WarningCount: task.WarningCount,
|
||
StartedAt: startedAt,
|
||
CompletedAt: completedAt,
|
||
ErrorMessage: task.ErrorMessage,
|
||
CreatorName: task.CreatorName,
|
||
CreatedAt: task.CreatedAt,
|
||
}
|
||
}
|
||
|
||
func (n deviceImportTargetNames) resolve(task *model.DeviceImportTask) string {
|
||
if task.TargetID == nil {
|
||
return ""
|
||
}
|
||
if task.OperationType == constants.DeviceImportOperationAssignShop {
|
||
return n.shops[*task.TargetID]
|
||
}
|
||
if task.OperationType == constants.DeviceImportOperationAssignSeries {
|
||
return n.series[*task.TargetID]
|
||
}
|
||
return ""
|
||
}
|
||
|
||
func getStatusText(status int) string {
|
||
switch status {
|
||
case model.ImportTaskStatusPending:
|
||
return "待处理"
|
||
case model.ImportTaskStatusProcessing:
|
||
return "处理中"
|
||
case model.ImportTaskStatusCompleted:
|
||
return "已完成"
|
||
case model.ImportTaskStatusFailed:
|
||
return "失败"
|
||
default:
|
||
return "未知"
|
||
}
|
||
}
|