diff --git a/api/desc/core/pcm-core.api b/api/desc/core/pcm-core.api index 06fef5cf..432e22ea 100644 --- a/api/desc/core/pcm-core.api +++ b/api/desc/core/pcm-core.api @@ -477,7 +477,7 @@ type NodeAssetsResp { } type NodeAsset { - TenantName string `json:"tenantName"` //租户名称 + Name string `json:"Name"` //租户名称 NodeName string `json:"NodeName"` // 节点名称 CpuTotal int64 `json:"CpuTotal"` // cpu核数 CpuUsable float64 `json:"CpuUsable"` // cpu可用率 diff --git a/api/internal/logic/core/nodeassetslogic.go b/api/internal/logic/core/nodeassetslogic.go index 84fd19f7..30ecf417 100644 --- a/api/internal/logic/core/nodeassetslogic.go +++ b/api/internal/logic/core/nodeassetslogic.go @@ -26,7 +26,7 @@ func (l *NodeAssetsLogic) NodeAssets() (resp *types.NodeAssetsResp, err error) { // 查询数据库系节点动态资源信息 nodeResp := types.NodeAssetsResp{} - tx := l.svcCtx.DbEngin.Raw("SELECT ppi.`name`,nai.* FROM sc_node_avail_info nai left join sc_participant_phy_info ppi on ppi.id = nai.participant_id WHERE nai.id IN ( SELECT MAX( id ) FROM sc_node_avail_info WHERE deleted_flag = 0 GROUP BY participant_id, node_name)\n ").Scan(&nodeResp.NodeAssets) + tx := l.svcCtx.DbEngin.Raw("SELECT ppi.`name`,nai.* FROM sc_node_avail_info nai left join sc_participant_phy_info ppi on ppi.id = nai.participant_id WHERE nai.id IN ( SELECT MAX( id ) FROM sc_node_avail_info WHERE deleted_flag = 0 GROUP BY participant_id, node_name) ").Scan(&nodeResp.NodeAssets) if tx.Error != nil { logx.Error(err) return nil, tx.Error diff --git a/api/internal/types/types.go b/api/internal/types/types.go index e12139e5..1e644a55 100644 --- a/api/internal/types/types.go +++ b/api/internal/types/types.go @@ -446,7 +446,7 @@ type NodeAssetsResp struct { } type NodeAsset struct { - TenantName string `json:"tenantName"` //租户名称 + Name string `json:"Name"` //租户名称 NodeName string `json:"NodeName"` // 节点名称 CpuTotal int64 `json:"CpuTotal"` // cpu核数 CpuUsable float64 `json:"CpuUsable"` // cpu可用率