diff --git a/docs/admin-openapi.yaml b/docs/admin-openapi.yaml index 1f28db8..a699fb9 100644 --- a/docs/admin-openapi.yaml +++ b/docs/admin-openapi.yaml @@ -7901,6 +7901,9 @@ components: enable_polling: description: 是否参与轮询 type: boolean + gateway_card_imei: + description: 插拔卡业务 IMEI(由 Gateway 卡状态接口同步,非设备自身 IMEI,无业务含义,仅供查看) + type: string gateway_extend: description: Gateway 卡状态扩展字段,原样返回上游 extend,用于展示运营商侧实际停机原因 type: string diff --git a/internal/model/dto/asset_dto.go b/internal/model/dto/asset_dto.go index d9b1218..4048403 100644 --- a/internal/model/dto/asset_dto.go +++ b/internal/model/dto/asset_dto.go @@ -65,8 +65,9 @@ type AssetResolveResponse struct { CardCategory string `json:"card_category,omitempty" description:"卡业务类型"` Supplier string `json:"supplier,omitempty" description:"供应商"` EnablePolling bool `json:"enable_polling" description:"是否参与轮询"` - NetworkStatus int `json:"network_status" description:"网络状态:0停机 1开机(asset_type=card时有效)"` - GatewayExtend string `json:"gateway_extend" description:"Gateway 卡状态扩展字段,原样返回上游 extend,用于展示运营商侧实际停机原因"` + NetworkStatus int `json:"network_status" description:"网络状态:0停机 1开机(asset_type=card时有效)"` + GatewayExtend string `json:"gateway_extend" description:"Gateway 卡状态扩展字段,原样返回上游 extend,用于展示运营商侧实际停机原因"` + GatewayCardIMEI string `json:"gateway_card_imei" description:"插拔卡业务 IMEI(由 Gateway 卡状态接口同步,非设备自身 IMEI,无业务含义,仅供查看)"` } // BoundCardInfo 设备绑定的卡信息 @@ -96,6 +97,7 @@ type AssetRealtimeStatusResponse struct { AssetID uint `json:"asset_id" description:"资产ID"` NetworkStatus int `json:"network_status" description:"网络状态(asset_type=card时有效):0停机 1开机"` GatewayExtend string `json:"gateway_extend" description:"Gateway 卡状态扩展字段,原样返回上游 extend,用于展示运营商侧实际停机原因"` + GatewayCardIMEI string `json:"gateway_card_imei" description:"插拔卡业务 IMEI(由 Gateway 卡状态接口同步,非设备自身 IMEI,无业务含义,仅供查看)"` RealNameStatus int `json:"real_name_status" description:"实名状态(asset_type=card时有效):0未实名 1已实名"` RealnamePolicy string `json:"realname_policy,omitempty" description:"实名认证策略 (none:无需实名, before_order:先实名后充值/购买, after_order:先充值/购买后实名)"` CurrentMonthUsageMB float64 `json:"current_month_usage_mb,omitempty" description:"系统自然月累计流量(MB,asset_type=card时有效,不等于运营商周期口径)"` diff --git a/internal/service/asset/service.go b/internal/service/asset/service.go index d5cd1d8..51aa13f 100644 --- a/internal/service/asset/service.go +++ b/internal/service/asset/service.go @@ -268,6 +268,7 @@ func (s *Service) buildCardResolveResponse(ctx context.Context, card *model.IotC RealnamePolicy: card.RealnamePolicy, NetworkStatus: card.NetworkStatus, GatewayExtend: card.GatewayExtend, + GatewayCardIMEI: card.GatewayCardIMEI, ICCID: card.ICCID, CarrierID: card.CarrierID, CarrierType: card.CarrierType, @@ -368,6 +369,7 @@ func (s *Service) GetRealtimeStatus(ctx context.Context, assetType string, id ui } resp.NetworkStatus = card.NetworkStatus resp.GatewayExtend = card.GatewayExtend + resp.GatewayCardIMEI = card.GatewayCardIMEI resp.RealNameStatus = card.RealNameStatus resp.CurrentMonthUsageMB = card.CurrentMonthUsageMB resp.LastGatewayReadingMB = card.LastGatewayReadingMB