fix: 适配 Gateway 响应模型变更,更新轮询处理器和 Mock 服务
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 7m25s
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 7m25s
- polling_handler: Status→RealStatus, UsedFlow→Used, parseRealnameStatus 参数改为 bool - mock_gateway: 同步接口路径和响应结构与上游文档一致
This commit is contained in:
@@ -123,11 +123,11 @@ func (h *PollingHandler) HandleRealnameCheck(ctx context.Context, t *asynq.Task)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 解析实名状态
|
// 解析实名状态
|
||||||
newRealnameStatus = h.parseRealnameStatus(result.Status)
|
newRealnameStatus = h.parseRealnameStatus(result.RealStatus)
|
||||||
h.logger.Info("实名检查完成",
|
h.logger.Info("实名检查完成",
|
||||||
zap.Uint64("card_id", cardID),
|
zap.Uint64("card_id", cardID),
|
||||||
zap.String("iccid", card.ICCID),
|
zap.String("iccid", card.ICCID),
|
||||||
zap.String("gateway_status", result.Status),
|
zap.Bool("gateway_real_status", result.RealStatus),
|
||||||
zap.Int("new_status", newRealnameStatus),
|
zap.Int("new_status", newRealnameStatus),
|
||||||
zap.Int("old_status", card.RealNameStatus))
|
zap.Int("old_status", card.RealNameStatus))
|
||||||
} else {
|
} else {
|
||||||
@@ -236,7 +236,7 @@ func (h *PollingHandler) HandleCarddataCheck(ctx context.Context, t *asynq.Task)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Gateway 返回的是 MB 单位的流量
|
// Gateway 返回的是 MB 单位的流量
|
||||||
gatewayFlowMB = float64(result.UsedFlow)
|
gatewayFlowMB = result.Used
|
||||||
h.logger.Info("流量检查完成",
|
h.logger.Info("流量检查完成",
|
||||||
zap.Uint64("card_id", cardID),
|
zap.Uint64("card_id", cardID),
|
||||||
zap.String("iccid", card.ICCID),
|
zap.String("iccid", card.ICCID),
|
||||||
@@ -692,15 +692,12 @@ func (h *PollingHandler) stopCards(ctx context.Context, cards []*model.IotCard,
|
|||||||
}
|
}
|
||||||
|
|
||||||
// parseRealnameStatus 解析实名状态
|
// parseRealnameStatus 解析实名状态
|
||||||
func (h *PollingHandler) parseRealnameStatus(gatewayStatus string) int {
|
// Gateway 返回 bool 类型:true=已实名, false=未实名
|
||||||
switch gatewayStatus {
|
func (h *PollingHandler) parseRealnameStatus(realStatus bool) int {
|
||||||
case "已实名", "realname", "1":
|
if realStatus {
|
||||||
return 2 // 已实名
|
return 2 // 已实名
|
||||||
case "实名中", "processing":
|
|
||||||
return 1 // 实名中
|
|
||||||
default:
|
|
||||||
return 0 // 未实名
|
|
||||||
}
|
}
|
||||||
|
return 0 // 未实名
|
||||||
}
|
}
|
||||||
|
|
||||||
// extractTaskType 从完整的任务类型中提取简短的类型名
|
// extractTaskType 从完整的任务类型中提取简短的类型名
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ func main() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 实名查询接口(匹配 gateway client 的路径)
|
// 实名查询接口(匹配 gateway client 的路径)
|
||||||
http.HandleFunc("/flow-card/realname-status", handleRealnameQuery)
|
http.HandleFunc("/flow-card/realName", handleRealnameQuery)
|
||||||
|
|
||||||
// 流量查询接口
|
// 流量查询接口
|
||||||
http.HandleFunc("/flow-card/flow", handleFlowQuery)
|
http.HandleFunc("/flow-card/flow", handleFlowQuery)
|
||||||
@@ -67,7 +67,7 @@ func main() {
|
|||||||
fmt.Println("模拟响应时间: 200ms - 4s")
|
fmt.Println("模拟响应时间: 200ms - 4s")
|
||||||
fmt.Println("")
|
fmt.Println("")
|
||||||
fmt.Println("接口列表:")
|
fmt.Println("接口列表:")
|
||||||
fmt.Println(" POST /flow-card/realname-status - 实名查询")
|
fmt.Println(" POST /flow-card/realName - 实名查询")
|
||||||
fmt.Println(" POST /flow-card/flow - 流量查询")
|
fmt.Println(" POST /flow-card/flow - 流量查询")
|
||||||
fmt.Println(" POST /flow-card/status - 卡状态查询")
|
fmt.Println(" POST /flow-card/status - 卡状态查询")
|
||||||
fmt.Println(" POST /flow-card/cardStop - 停机操作")
|
fmt.Println(" POST /flow-card/cardStop - 停机操作")
|
||||||
@@ -112,14 +112,13 @@ func handleRealnameQuery(w http.ResponseWriter, r *http.Request) {
|
|||||||
// 90% 成功,10% 失败
|
// 90% 成功,10% 失败
|
||||||
if rand.Float64() < 0.90 {
|
if rand.Float64() < 0.90 {
|
||||||
atomic.AddInt64(&successRequests, 1)
|
atomic.AddInt64(&successRequests, 1)
|
||||||
// 随机返回实名状态
|
// 随机返回实名状态(匹配文档:realStatus 为 bool 类型)
|
||||||
statuses := []string{"未实名", "实名中", "已实名"}
|
realStatus := rand.Float64() < 0.5
|
||||||
status := statuses[rand.Intn(3)]
|
|
||||||
resp := GatewayResponse{
|
resp := GatewayResponse{
|
||||||
Code: 200,
|
Code: 200,
|
||||||
Msg: "success",
|
Msg: "success",
|
||||||
TraceID: fmt.Sprintf("trace-%d", time.Now().UnixNano()),
|
TraceID: fmt.Sprintf("trace-%d", time.Now().UnixNano()),
|
||||||
Data: json.RawMessage(fmt.Sprintf(`{"status": "%s"}`, status)),
|
Data: json.RawMessage(fmt.Sprintf(`{"iccid": "mock-iccid", "realStatus": %t}`, realStatus)),
|
||||||
}
|
}
|
||||||
json.NewEncoder(w).Encode(resp)
|
json.NewEncoder(w).Encode(resp)
|
||||||
} else {
|
} else {
|
||||||
@@ -140,13 +139,13 @@ func handleFlowQuery(w http.ResponseWriter, r *http.Request) {
|
|||||||
|
|
||||||
if rand.Float64() < 0.90 {
|
if rand.Float64() < 0.90 {
|
||||||
atomic.AddInt64(&successRequests, 1)
|
atomic.AddInt64(&successRequests, 1)
|
||||||
// 随机返回流量数据(匹配 FlowUsageResp 结构)
|
// 随机返回流量数据(匹配文档:used 字段)
|
||||||
usedFlow := rand.Intn(10000)
|
usedFlow := rand.Intn(10000)
|
||||||
resp := GatewayResponse{
|
resp := GatewayResponse{
|
||||||
Code: 200,
|
Code: 200,
|
||||||
Msg: "success",
|
Msg: "success",
|
||||||
TraceID: fmt.Sprintf("trace-%d", time.Now().UnixNano()),
|
TraceID: fmt.Sprintf("trace-%d", time.Now().UnixNano()),
|
||||||
Data: json.RawMessage(fmt.Sprintf(`{"usedFlow": %d, "unit": "MB"}`, usedFlow)),
|
Data: json.RawMessage(fmt.Sprintf(`{"iccid": "mock-iccid", "used": %d, "unit": "MB"}`, usedFlow)),
|
||||||
}
|
}
|
||||||
json.NewEncoder(w).Encode(resp)
|
json.NewEncoder(w).Encode(resp)
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
Reference in New Issue
Block a user