chore: 初始开源发布
iotlcm-worker-svr：异步执行中枢（RabbitMQ 消费者 + 全量同步编排）。 - Go module：iotlcm-worker-svr → git.5iot.com/iotlcm-public/iotlcm-worker-svr（214 文件） - 凭据与内部标识脱敏：MySQL/Redis 凭据、私网与生产 IP、内网域名、 库名 xiujie_admin → iotlcm、哨兵名占位 - 159 处真实手机号 → 合法 11 位编造号（保留号段与后 4 位，维持互异， 不破坏「校验 MSISDN 格式」等测试断言） - 移除内部资产：CI 触发器、Jenkins 触发测试文档、预演门禁与镜像 digest 记录 - Dockerfile 改用公共基础镜像（golang:1.25-alpine → alpine:3.23）， 移除写死的 git 凭据 - README 重写（架构/全量同步模型/配置/已知失败），补 Apache-2.0 LICENSE，LF 行尾 + .gitattributes 已知：3 个测试包在源仓同一提交上同样失败（client/upstream、 service/allocate、service/inbound），属既有缺陷，本仓未引入亦未修复。
This commit is contained in:
MiFaZhan
@@ -0,0 +1,172 @@
|
||||
package trafficcutoff
|
||||
|
||||
import (
|
||||
"context"
|
||||
"strings"
|
||||
|
||||
"github.com/gogf/gf/v2/errors/gerror"
|
||||
"github.com/gogf/gf/v2/frame/g"
|
||||
|
||||
"git.5iot.com/iotlcm-public/iotlcm-worker-svr/internal/service/batchresult"
|
||||
)
|
||||
|
||||
const (
|
||||
cascadeFailureReason = "same batch has invalid traffic cutoff rows; update skipped"
|
||||
validationSkipReason = "batch validation failed; traffic cutoff update skipped"
|
||||
emptyICCIDReason = "ICCID cannot be empty"
|
||||
duplicateICCIDReason = "duplicate ICCID in batch"
|
||||
unauthorizedReason = "ICCID is outside the current operator authorization scope"
|
||||
cardMissingReason = "ICCID does not exist in SIM card records"
|
||||
statusCanceledReason = "ICCID is already canceled"
|
||||
statusInconsistentReason = "same batch contains different card statuses"
|
||||
)
|
||||
|
||||
type executor struct {
|
||||
repository Repository
|
||||
}
|
||||
|
||||
func NewExecutor(repository Repository) Executor {
|
||||
return &executor{repository: repository}
|
||||
}
|
||||
|
||||
func (e *executor) Execute(ctx context.Context, batchNo string) error {
|
||||
task, err := e.repository.Load(ctx, strings.TrimSpace(batchNo))
|
||||
if err != nil {
|
||||
return gerror.Wrap(err, "load traffic cutoff batch")
|
||||
}
|
||||
if !validateTask(task) {
|
||||
if err = e.repository.SaveValidationFailure(ctx, task); err != nil {
|
||||
return gerror.Wrap(err, "save traffic cutoff validation failure")
|
||||
}
|
||||
e.saveResultFile(ctx, task)
|
||||
return nil
|
||||
}
|
||||
if err = e.repository.CommitBusiness(ctx, task); err != nil {
|
||||
return gerror.Wrap(err, "commit traffic cutoff business")
|
||||
}
|
||||
e.saveResultFile(ctx, task)
|
||||
return nil
|
||||
}
|
||||
|
||||
func (e *executor) saveResultFile(ctx context.Context, task *Task) {
|
||||
request := batchresult.Request{
|
||||
BatchNo: task.Batch.BatchNo,
|
||||
BatchType: task.Batch.BatchType,
|
||||
TenantID: task.Batch.TenantID,
|
||||
Rows: task.ResultRows(),
|
||||
}
|
||||
if err := e.repository.SaveResultFile(ctx, task, request); err != nil {
|
||||
g.Log().Errorf(ctx, "save traffic cutoff result file status failed, batchNo:%s, err:%+v", task.Batch.BatchNo, err)
|
||||
}
|
||||
}
|
||||
|
||||
func validateTask(task *Task) bool {
|
||||
if task == nil || len(task.Details) == 0 {
|
||||
if task != nil {
|
||||
task.FailureReason = "traffic cutoff batch has no valid details"
|
||||
}
|
||||
return false
|
||||
}
|
||||
if task.TrafficCutoffStatus != 1 {
|
||||
task.FailureReason = "traffic cutoff batch must enable cutoff"
|
||||
markAllFailed(task, task.FailureReason)
|
||||
return false
|
||||
}
|
||||
if task.TrafficCutoffThreshold <= 0 {
|
||||
task.FailureReason = "traffic cutoff threshold must be greater than 0"
|
||||
markAllFailed(task, task.FailureReason)
|
||||
return false
|
||||
}
|
||||
|
||||
hasFailure := false
|
||||
iccids := make(map[string]int, len(task.Details))
|
||||
statusSet := make(map[int]struct{})
|
||||
for _, detail := range task.Details {
|
||||
if detail == nil {
|
||||
hasFailure = true
|
||||
continue
|
||||
}
|
||||
validateDetail(detail)
|
||||
if detail.Reason != "" {
|
||||
hasFailure = true
|
||||
continue
|
||||
}
|
||||
iccids[detail.ICCID]++
|
||||
statusSet[detail.BossCardStatusBefore] = struct{}{}
|
||||
}
|
||||
for _, detail := range task.Details {
|
||||
if detail == nil || detail.Reason != "" {
|
||||
continue
|
||||
}
|
||||
if iccids[detail.ICCID] > 1 {
|
||||
detail.Reason = duplicateICCIDReason
|
||||
hasFailure = true
|
||||
}
|
||||
}
|
||||
if len(statusSet) > 1 {
|
||||
for _, detail := range task.Details {
|
||||
if detail != nil && detail.Reason == "" {
|
||||
detail.Reason = statusInconsistentReason
|
||||
}
|
||||
}
|
||||
hasFailure = true
|
||||
}
|
||||
if !hasFailure {
|
||||
task.ValidationOK = true
|
||||
return true
|
||||
}
|
||||
for _, detail := range task.Details {
|
||||
if detail != nil && detail.Reason == "" {
|
||||
detail.Reason = cascadeFailureReason
|
||||
}
|
||||
}
|
||||
task.FailureReason = validationSkipReason
|
||||
return false
|
||||
}
|
||||
|
||||
func validateDetail(detail *Detail) {
|
||||
if detail.Reason != "" {
|
||||
return
|
||||
}
|
||||
detail.ICCID = strings.TrimSpace(detail.ICCID)
|
||||
detail.InputMSISDN = strings.TrimSpace(detail.InputMSISDN)
|
||||
detail.InputIMSI = strings.TrimSpace(detail.InputIMSI)
|
||||
if detail.ICCID == "" {
|
||||
detail.Reason = emptyICCIDReason
|
||||
return
|
||||
}
|
||||
if !detail.Authorized {
|
||||
detail.Reason = unauthorizedReason
|
||||
return
|
||||
}
|
||||
if detail.Card == nil {
|
||||
detail.Reason = cardMissingReason
|
||||
return
|
||||
}
|
||||
detail.MSISDN = strings.TrimSpace(detail.Card.MSISDN)
|
||||
detail.IMSI = strings.TrimSpace(detail.Card.IMSI)
|
||||
detail.BossCardStatusBefore = detail.Card.BossCardStatus
|
||||
detail.TrafficCutoffStatusBefore = detail.Card.TrafficCutoffStatus
|
||||
detail.TrafficCutoffThresholdBefore = detail.Card.TrafficCutoffThreshold
|
||||
|
||||
if detail.InputMSISDN != "" && detail.InputMSISDN != detail.MSISDN {
|
||||
detail.Reason = "MSISDN does not match the SIM card record"
|
||||
return
|
||||
}
|
||||
if detail.InputIMSI != "" && detail.InputIMSI != detail.IMSI {
|
||||
detail.Reason = "IMSI does not match the SIM card record"
|
||||
return
|
||||
}
|
||||
if detail.BossCardStatusBefore == BossCardStatusCanceled {
|
||||
detail.Reason = statusCanceledReason
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
func markAllFailed(task *Task, reason string) {
|
||||
for _, detail := range task.Details {
|
||||
if detail != nil {
|
||||
detail.Reason = reason
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,178 @@
|
||||
package trafficcutoff
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"testing"
|
||||
|
||||
"git.5iot.com/iotlcm-public/iotlcm-worker-svr/internal/service/batchresult"
|
||||
)
|
||||
|
||||
func TestValidateTaskFailsOnCanceledCard(t *testing.T) {
|
||||
task := validTask()
|
||||
task.Details[0].Card.BossCardStatus = BossCardStatusCanceled
|
||||
|
||||
if validateTask(task) {
|
||||
t.Fatal("expected canceled card to fail validation")
|
||||
}
|
||||
if task.Details[0].Reason != statusCanceledReason {
|
||||
t.Fatalf("reason = %q, want %q", task.Details[0].Reason, statusCanceledReason)
|
||||
}
|
||||
}
|
||||
|
||||
func TestValidateTaskFailsOnMixedCardStatus(t *testing.T) {
|
||||
task := validTask()
|
||||
task.Details = append(task.Details, &Detail{
|
||||
RowNo: 2,
|
||||
ICCID: "898600000000002",
|
||||
Authorized: true,
|
||||
Card: &Card{
|
||||
ID: 2,
|
||||
ICCID: "898600000000002",
|
||||
MSISDN: "13800000002",
|
||||
IMSI: "460001000000002",
|
||||
BossCardStatus: 5,
|
||||
},
|
||||
})
|
||||
|
||||
if validateTask(task) {
|
||||
t.Fatal("expected mixed status batch to fail validation")
|
||||
}
|
||||
for _, detail := range task.Details {
|
||||
if detail.Reason != statusInconsistentReason {
|
||||
t.Fatalf("detail %d reason = %q, want %q", detail.RowNo, detail.Reason, statusInconsistentReason)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestValidateTaskFailsOnUnauthorizedAndCascades(t *testing.T) {
|
||||
task := validTask()
|
||||
task.Details = append(task.Details, &Detail{
|
||||
RowNo: 2,
|
||||
ICCID: "898600000000002",
|
||||
Authorized: false,
|
||||
Card: &Card{
|
||||
ID: 2,
|
||||
ICCID: "898600000000002",
|
||||
MSISDN: "13800000002",
|
||||
IMSI: "460001000000002",
|
||||
BossCardStatus: 4,
|
||||
},
|
||||
})
|
||||
|
||||
if validateTask(task) {
|
||||
t.Fatal("expected unauthorized row to fail validation")
|
||||
}
|
||||
if task.Details[1].Reason != unauthorizedReason {
|
||||
t.Fatalf("unauthorized reason = %q", task.Details[1].Reason)
|
||||
}
|
||||
if task.Details[0].Reason != cascadeFailureReason {
|
||||
t.Fatalf("cascade reason = %q", task.Details[0].Reason)
|
||||
}
|
||||
}
|
||||
|
||||
func TestExecuteHappyPathCommitsAndSavesResult(t *testing.T) {
|
||||
task := validTask()
|
||||
repo := &fakeRepository{task: task}
|
||||
|
||||
if err := NewExecutor(repo).Execute(context.Background(), "DCT-1"); err != nil {
|
||||
t.Fatalf("Execute() error = %v", err)
|
||||
}
|
||||
if !repo.committed {
|
||||
t.Fatal("expected business commit")
|
||||
}
|
||||
if repo.validationSaved {
|
||||
t.Fatal("did not expect validation failure save")
|
||||
}
|
||||
if !repo.resultSaved {
|
||||
t.Fatal("expected result file save")
|
||||
}
|
||||
if repo.resultRequest.BatchType != 107 || len(repo.resultRequest.Rows) != 1 {
|
||||
t.Fatalf("unexpected result request: %+v", repo.resultRequest)
|
||||
}
|
||||
}
|
||||
|
||||
func TestExecuteValidationFailureSkipsCommit(t *testing.T) {
|
||||
task := validTask()
|
||||
task.Details[0].Authorized = false
|
||||
repo := &fakeRepository{task: task}
|
||||
|
||||
if err := NewExecutor(repo).Execute(context.Background(), "DCT-2"); err != nil {
|
||||
t.Fatalf("Execute() error = %v", err)
|
||||
}
|
||||
if !repo.validationSaved {
|
||||
t.Fatal("expected validation failure save")
|
||||
}
|
||||
if repo.committed {
|
||||
t.Fatal("did not expect business commit")
|
||||
}
|
||||
if !repo.resultSaved {
|
||||
t.Fatal("expected result file save")
|
||||
}
|
||||
}
|
||||
|
||||
func TestExecuteCommitFailurePropagatesAndSkipsResult(t *testing.T) {
|
||||
task := validTask()
|
||||
commitErr := errors.New("transaction failed")
|
||||
repo := &fakeRepository{task: task, commitErr: commitErr}
|
||||
|
||||
err := NewExecutor(repo).Execute(context.Background(), "DCT-3")
|
||||
if err == nil || !errors.Is(err, commitErr) {
|
||||
t.Fatalf("Execute() error = %v, want wrap of %v", err, commitErr)
|
||||
}
|
||||
if repo.resultSaved {
|
||||
t.Fatal("result file should not be saved after commit error")
|
||||
}
|
||||
}
|
||||
|
||||
func validTask() *Task {
|
||||
return &Task{
|
||||
Batch: Batch{BatchNo: "DCT-1", BatchType: 107, TenantID: "000000"},
|
||||
TrafficCutoffStatus: 1,
|
||||
TrafficCutoffThreshold: 1024.5,
|
||||
ThresholdUnit: "MB",
|
||||
Details: []*Detail{
|
||||
{
|
||||
RowNo: 1,
|
||||
ICCID: "898600000000001",
|
||||
Authorized: true,
|
||||
Card: &Card{
|
||||
ID: 1,
|
||||
ICCID: "898600000000001",
|
||||
MSISDN: "13800000001",
|
||||
IMSI: "460001000000001",
|
||||
BossCardStatus: 4,
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
type fakeRepository struct {
|
||||
task *Task
|
||||
committed bool
|
||||
commitErr error
|
||||
validationSaved bool
|
||||
resultSaved bool
|
||||
resultRequest batchresult.Request
|
||||
}
|
||||
|
||||
func (r *fakeRepository) Load(_ context.Context, _ string) (*Task, error) {
|
||||
return r.task, nil
|
||||
}
|
||||
|
||||
func (r *fakeRepository) SaveValidationFailure(_ context.Context, _ *Task) error {
|
||||
r.validationSaved = true
|
||||
return nil
|
||||
}
|
||||
|
||||
func (r *fakeRepository) CommitBusiness(_ context.Context, _ *Task) error {
|
||||
r.committed = true
|
||||
return r.commitErr
|
||||
}
|
||||
|
||||
func (r *fakeRepository) SaveResultFile(_ context.Context, _ *Task, request batchresult.Request) error {
|
||||
r.resultSaved = true
|
||||
r.resultRequest = request
|
||||
return nil
|
||||
}
|
||||
@@ -0,0 +1,135 @@
|
||||
package trafficcutoff
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"github.com/gogf/gf/v2/encoding/gjson"
|
||||
"github.com/gogf/gf/v2/os/gtime"
|
||||
|
||||
"git.5iot.com/iotlcm-public/iotlcm-worker-svr/internal/service/batchresult"
|
||||
)
|
||||
|
||||
const BossCardStatusCanceled = 9
|
||||
|
||||
type Batch struct {
|
||||
ID int64
|
||||
BatchNo string
|
||||
BatchType int
|
||||
TenantID string
|
||||
DeptID int64
|
||||
CreatedBy int64
|
||||
CreatedDept int64
|
||||
StartTime *gtime.Time
|
||||
BatchInfo *gjson.Json
|
||||
}
|
||||
|
||||
type Card struct {
|
||||
ID int64
|
||||
ICCID string
|
||||
MSISDN string
|
||||
IMSI string
|
||||
BossCardStatus int
|
||||
TrafficCutoffStatus int
|
||||
TrafficCutoffThreshold float64
|
||||
}
|
||||
|
||||
type Detail struct {
|
||||
ID int64
|
||||
RowNo int
|
||||
ICCID string
|
||||
InputMSISDN string
|
||||
InputIMSI string
|
||||
MSISDN string
|
||||
IMSI string
|
||||
Authorized bool
|
||||
BossCardStatusBefore int
|
||||
TrafficCutoffStatusBefore int
|
||||
TrafficCutoffThresholdBefore float64
|
||||
TrafficCutoffCrossMonthHold int
|
||||
TrafficCutoffStatusAfter int
|
||||
TrafficCutoffThresholdAfter float64
|
||||
Reason string
|
||||
Card *Card
|
||||
}
|
||||
|
||||
type Task struct {
|
||||
Batch Batch
|
||||
TrafficCutoffStatus int
|
||||
TrafficCutoffThreshold float64
|
||||
ThresholdUnit string
|
||||
Details []*Detail
|
||||
ValidationOK bool
|
||||
FailureReason string
|
||||
}
|
||||
|
||||
type Repository interface {
|
||||
Load(ctx context.Context, batchNo string) (*Task, error)
|
||||
SaveValidationFailure(ctx context.Context, task *Task) error
|
||||
CommitBusiness(ctx context.Context, task *Task) error
|
||||
SaveResultFile(ctx context.Context, task *Task, request batchresult.Request) error
|
||||
}
|
||||
|
||||
type Executor interface {
|
||||
Execute(ctx context.Context, batchNo string) error
|
||||
}
|
||||
|
||||
func (d *Detail) Snapshot(task *Task) *gjson.Json {
|
||||
if d == nil {
|
||||
return gjson.New(nil)
|
||||
}
|
||||
return gjson.New(map[string]any{
|
||||
"rowNo": d.RowNo,
|
||||
"ICCID": d.ICCID,
|
||||
"MSISDN": d.MSISDN,
|
||||
"IMSI": d.IMSI,
|
||||
"inputMsisdn": d.InputMSISDN,
|
||||
"inputImsi": d.InputIMSI,
|
||||
"authorized": d.Authorized,
|
||||
"operation": "dataCut",
|
||||
"trafficCutoffStatusBefore": d.TrafficCutoffStatusBefore,
|
||||
"trafficCutoffThresholdBefore": d.TrafficCutoffThresholdBefore,
|
||||
"trafficCutoffStatusAfter": d.TrafficCutoffStatusAfter,
|
||||
"trafficCutoffThresholdAfter": d.TrafficCutoffThresholdAfter,
|
||||
"trafficCutoffThreshold": task.TrafficCutoffThreshold,
|
||||
"trafficCutoffCrossMonthHold": d.TrafficCutoffCrossMonthHold,
|
||||
"thresholdUnit": task.ThresholdUnit,
|
||||
"bossCardStatusBefore": d.BossCardStatusBefore,
|
||||
"errorReason": d.Reason,
|
||||
})
|
||||
}
|
||||
|
||||
func (t *Task) ResultRows() []batchresult.Row {
|
||||
rows := make([]batchresult.Row, 0, len(t.Details))
|
||||
for _, detail := range t.Details {
|
||||
if detail == nil {
|
||||
continue
|
||||
}
|
||||
rows = append(rows, batchresult.Row{
|
||||
RowNo: detail.RowNo,
|
||||
ICCID: detail.ICCID,
|
||||
MSISDN: detail.MSISDN,
|
||||
IMSI: detail.IMSI,
|
||||
Operation: "达量断网",
|
||||
Success: detail.Reason == "",
|
||||
Reason: detail.Reason,
|
||||
})
|
||||
}
|
||||
return rows
|
||||
}
|
||||
|
||||
func (t *Task) SuccessCount() int {
|
||||
count := 0
|
||||
for _, detail := range t.Details {
|
||||
if detail != nil && detail.Reason == "" {
|
||||
count++
|
||||
}
|
||||
}
|
||||
return count
|
||||
}
|
||||
|
||||
func (t *Task) FailCount() int {
|
||||
if t == nil {
|
||||
return 0
|
||||
}
|
||||
return len(t.Details) - t.SuccessCount()
|
||||
}
|
||||
Reference in New Issue
Block a user