team/tyapi-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

f

Browse Source
This commit is contained in:
Mrx
2026-05-28 10:55:28 +08:00
parent b04b43cb82
commit 43acbeb8f4
18 changed files with 758 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/domains/api/services/processors/dependencies.go
View File

@@ -9,6 +9,7 @@ import (
"tyapi-server/internal/infrastructure/external/huibo"
"tyapi-server/internal/infrastructure/external/jiguang"
"tyapi-server/internal/infrastructure/external/muzi"
"tyapi-server/internal/infrastructure/external/nuoer"
"tyapi-server/internal/infrastructure/external/shujubao"
"tyapi-server/internal/infrastructure/external/shumai"
"tyapi-server/internal/infrastructure/external/tianyancha"
@@ -42,6 +43,7 @@ type ProcessorDependencies struct {
JiguangService *jiguang.JiguangService
ShumaiService *shumai.ShumaiService
HuiboService *huibo.HuiboService
NuoerService *nuoer.NuoerService
Validator interfaces.RequestValidator
CombService CombServiceInterface // Changed to interface to break import cycle
Options *commands.ApiCallOptions // 添加Options支持
@@ -70,6 +72,7 @@ func NewProcessorDependencies(
jiguangService *jiguang.JiguangService,
shumaiService *shumai.ShumaiService,
huiboService *huibo.HuiboService,
nuoerService *nuoer.NuoerService,
validator interfaces.RequestValidator,
combService CombServiceInterface, // Changed to interface
reportRepo repositories.ReportRepository,
@@ -88,6 +91,7 @@ func NewProcessorDependencies(
JiguangService: jiguangService,
ShumaiService: shumaiService,
HuiboService: huiboService,
NuoerService: nuoerService,
Validator: validator,
CombService: combService,
Options: nil, // 初始化为nil，在调用时设置

31
internal/domains/api/services/processors/qcxg/qcxg4d2e_processor.go
View File

@@ -7,10 +7,9 @@ import (
"tyapi-server/internal/domains/api/dto"
"tyapi-server/internal/domains/api/services/processors"
"tyapi-server/internal/infrastructure/external/jiguang"
)
// ProcessQCXG4D2ERequest QCXG4D2E API处理方法 - 极光名下车辆数量查询
// ProcessQCXG4D2ERequest QCXG4D2E API处理方法 - 名下车辆数量（委托诺尔 QCXGM4CL）
func ProcessQCXG4D2ERequest(ctx context.Context, params []byte, deps *processors.ProcessorDependencies) ([]byte, error) {
var paramsDto dto.QCXG4D2EReq
if err := json.Unmarshal(params, &paramsDto); err != nil {
@@ -21,27 +20,15 @@ func ProcessQCXG4D2ERequest(ctx context.Context, params []byte, deps *processors
return nil, errors.Join(processors.ErrInvalidParam, err)
}
// 构建请求参数
reqData := map[string]interface{}{
"idNum": paramsDto.IDCard,
"userType": paramsDto.UserType,
}
// 调用极光API
// apiCode: vehicle-inquiry-under-name (用于请求头)
// apiPath: vehicle/inquiry-under-name (用于URL路径)
respBytes, err := deps.JiguangService.CallAPI(ctx, "vehicle-inquiry-under-name", "vehicle/inquiry-under-name", reqData)
m4clParams, err := json.Marshal(dto.QCXGM4CLReq{IDCard: paramsDto.IDCard})
if err != nil {
// 根据错误类型返回相应的错误
if errors.Is(err, jiguang.ErrNotFound) {
return nil, errors.Join(processors.ErrNotFound, err)
} else if errors.Is(err, jiguang.ErrDatasource) {
return nil, errors.Join(processors.ErrDatasource, err)
} else {
return nil, errors.Join(processors.ErrSystem, err)
}
return nil, errors.Join(processors.ErrSystem, err)
}
// 极光服务已经返回了 data 字段的 JSON，直接返回即可
return respBytes, nil
raw, err := ProcessQCXGM4CLRequest(ctx, m4clParams, deps)
if err != nil {
return nil, err
}
return transformQCXG5F3AResponse(raw)
}

73
internal/domains/api/services/processors/qcxg/qcxg5f3a_processor.go
View File

@@ -4,13 +4,15 @@ import (
"context"
"encoding/json"
"errors"
"strconv"
"tyapi-server/internal/domains/api/dto"
"tyapi-server/internal/domains/api/services/processors"
"tyapi-server/internal/infrastructure/external/jiguang"
"github.com/tidwall/gjson"
)
// ProcessQCXG5F3ARequest QCXG5F3A API处理方法 - 极光名下车辆车牌查询 以替换数量
// ProcessQCXG5F3ARequest QCXG5F3A API处理方法 - 名下车辆（委托诺尔 QCXGM4CL，响应格式兼容极光）
func ProcessQCXG5F3ARequest(ctx context.Context, params []byte, deps *processors.ProcessorDependencies) ([]byte, error) {
var paramsDto dto.QCXG5F3AReq
if err := json.Unmarshal(params, &paramsDto); err != nil {
@@ -21,28 +23,53 @@ func ProcessQCXG5F3ARequest(ctx context.Context, params []byte, deps *processors
return nil, errors.Join(processors.ErrInvalidParam, err)
}
// 构建请求参数
reqData := map[string]interface{}{
"idNum": paramsDto.IDCard,
"name": paramsDto.Name,
"userType": "1",
}
// 调用极光API
// apiCode: vehicle-inquiry-under-name (用于请求头)
// apiPath: vehicle/inquiry-under-name (用于URL路径)
respBytes, err := deps.JiguangService.CallAPI(ctx, "vehicle-inquiry-under-name", "vehicle/inquiry-under-name", reqData)
m4clParams, err := json.Marshal(dto.QCXGM4CLReq{IDCard: paramsDto.IDCard})
if err != nil {
// 根据错误类型返回相应的错误
if errors.Is(err, jiguang.ErrNotFound) {
return nil, errors.Join(processors.ErrNotFound, err)
} else if errors.Is(err, jiguang.ErrDatasource) {
return nil, errors.Join(processors.ErrDatasource, err)
} else {
return nil, errors.Join(processors.ErrSystem, err)
}
return nil, errors.Join(processors.ErrSystem, err)
}
// 极光服务已经返回了 data 字段的 JSON，直接返回即可
return respBytes, nil
raw, err := ProcessQCXGM4CLRequest(ctx, m4clParams, deps)
if err != nil {
return nil, err
}
return transformQCXG5F3AResponse(raw)
}
// transformQCXG5F3AResponse 将诺尔响应转为 QCXG5F3A 对外格式：去掉 busiCode/busiMsg，展开 result，vehicleCount 为字符串
func transformQCXG5F3AResponse(raw []byte) ([]byte, error) {
base := gjson.GetBytes(raw, "result")
if !base.Exists() {
base = gjson.ParseBytes(raw)
}
list := base.Get("list").Value()
if list == nil {
list = []interface{}{}
}
countStr, err := formatVehicleCountAsString(base.Get("vehicleCount"))
if err != nil {
return nil, errors.Join(processors.ErrSystem, err)
}
out := map[string]interface{}{
"vehicleCount": countStr,
"list": list,
}
return json.Marshal(out)
}
func formatVehicleCountAsString(v gjson.Result) (string, error) {
if !v.Exists() {
return "0", nil
}
switch v.Type {
case gjson.String:
return v.String(), nil
case gjson.Number:
return strconv.FormatInt(v.Int(), 10), nil
default:
return "", errors.New("vehicleCount 类型无效")
}
}

92
internal/domains/api/services/processors/qcxg/qcxg9p1c_processor.go
View File

@@ -8,12 +8,11 @@ import (
"tyapi-server/internal/domains/api/dto"
"tyapi-server/internal/domains/api/services/processors"
"tyapi-server/internal/infrastructure/external/jiguang"
"github.com/tidwall/gjson"
)
// ProcessQCXG9P1CRequest QCXG9P1C API处理方法 兼容旧版 极光名下车牌查询数量
// ProcessQCXG9P1CRequest QCXG9P1C API处理方法 - 名下车辆详版（委托诺尔 QCXGM4CL）
func ProcessQCXG9P1CRequest(ctx context.Context, params []byte, deps *processors.ProcessorDependencies) ([]byte, error) {
var paramsDto dto.QCXG9P1CReq
if err := json.Unmarshal(params, &paramsDto); err != nil {
@@ -24,54 +23,53 @@ func ProcessQCXG9P1CRequest(ctx context.Context, params []byte, deps *processors
return nil, errors.Join(processors.ErrInvalidParam, err)
}
null := ""
// 构建请求参数
reqData := map[string]interface{}{
"idNum": paramsDto.IDCard,
"name": null,
"userType": "1",
}
// 调用极光API
// apiCode: vehicle-inquiry-under-name (用于请求头)
// apiPath: vehicle/inquiry-under-name (用于URL路径)
respBytes, err := deps.JiguangService.CallAPI(ctx, "vehicle-inquiry-under-name", "vehicle/inquiry-under-name", reqData)
m4clParams, err := json.Marshal(dto.QCXGM4CLReq{IDCard: paramsDto.IDCard})
if err != nil {
// 根据错误类型返回相应的错误
if errors.Is(err, jiguang.ErrNotFound) {
return nil, errors.Join(processors.ErrNotFound, err)
} else if errors.Is(err, jiguang.ErrDatasource) {
return nil, errors.Join(processors.ErrDatasource, err)
} else {
return nil, errors.Join(processors.ErrSystem, err)
}
return nil, errors.Join(processors.ErrSystem, err)
}
// 极光服务已经返回了 data 字段的 JSON，直接返回即可
// return respBytes, nil
// 使用 gjson 检查并转换 vehicleCount 字段
vehicleCountResult := gjson.GetBytes(respBytes, "vehicleCount")
if vehicleCountResult.Exists() && vehicleCountResult.Type == gjson.String {
// 如果是字符串类型，转换为整数
vehicleCountInt, err := strconv.Atoi(vehicleCountResult.String())
if err != nil {
return nil, errors.Join(processors.ErrSystem, err)
}
// 解析 JSON 并修改 vehicleCount 字段
var respData map[string]interface{}
if err := json.Unmarshal(respBytes, &respData); err != nil {
return nil, errors.Join(processors.ErrSystem, err)
}
respData["vehicleCount"] = vehicleCountInt
// 重新序列化为JSON并返回
resultBytes, err := json.Marshal(respData)
if err != nil {
return nil, errors.Join(processors.ErrSystem, err)
}
return resultBytes, nil
raw, err := ProcessQCXGM4CLRequest(ctx, m4clParams, deps)
if err != nil {
return nil, err
}
// 如果 vehicleCount 不存在或不是字符串，直接返回原始响应
return respBytes, nil
return transformQCXG9P1CResponse(raw)
}
// transformQCXG9P1CResponse 将诺尔响应转为 QCXG9P1C 对外格式：去掉 busiCode/busiMsg，展开 result，vehicleCount 为整数
func transformQCXG9P1CResponse(raw []byte) ([]byte, error) {
base := gjson.GetBytes(raw, "result")
if !base.Exists() {
base = gjson.ParseBytes(raw)
}
list := base.Get("list").Value()
if list == nil {
list = []interface{}{}
}
countInt, err := formatVehicleCountAsInt(base.Get("vehicleCount"))
if err != nil {
return nil, errors.Join(processors.ErrSystem, err)
}
out := map[string]interface{}{
"vehicleCount": countInt,
"list": list,
}
return json.Marshal(out)
}
func formatVehicleCountAsInt(v gjson.Result) (int, error) {
if !v.Exists() {
return 0, nil
}
switch v.Type {
case gjson.String:
return strconv.Atoi(v.String())
case gjson.Number:
return int(v.Int()), nil
default:
return 0, errors.New("vehicleCount 类型无效")
}
}

48
internal/domains/api/services/processors/qcxg/qcxgm4cl_processor.go Normal file
View File

@@ -0,0 +1,48 @@
package qcxg
import (
"context"
"encoding/json"
"errors"
"tyapi-server/internal/domains/api/dto"
"tyapi-server/internal/domains/api/services/processors"
"tyapi-server/internal/infrastructure/external/nuoer"
)
// ProcessQCXGM4CLRequest QCXGM4CL API处理方法 - 名下车辆诺尔
func ProcessQCXGM4CLRequest(ctx context.Context, params []byte, deps *processors.ProcessorDependencies) ([]byte, error) {
var paramsDto dto.QCXGM4CLReq
if err := json.Unmarshal(params, &paramsDto); err != nil {
return nil, errors.Join(processors.ErrSystem, err)
}
if err := deps.Validator.ValidateStruct(paramsDto); err != nil {
return nil, errors.Join(processors.ErrInvalidParam, err)
}
body := map[string]string{
"idCard": paramsDto.IDCard,
}
nuoerDoCheckAPIKey := "id_vehicle_query_102"
ApiPath := "/v1/doCheck"
resp, err := deps.NuoerService.CallAPI(ctx, nuoerDoCheckAPIKey, ApiPath, body)
if err != nil {
if errors.Is(err, nuoer.ErrNotFound) {
return nil, errors.Join(processors.ErrNotFound, err)
}
if errors.Is(err, nuoer.ErrDatasource) {
return nil, errors.Join(processors.ErrDatasource, err)
}
return nil, errors.Join(processors.ErrSystem, err)
}
respBytes, err := json.Marshal(resp.Data)
if err != nil {
return nil, errors.Join(processors.ErrSystem, err)
}
return respBytes, nil
}