From 2895446a754c678d79bdaa760dbfdcafd3aded00 Mon Sep 17 00:00:00 2001
From: zhangwei <894646498@qq.com>
Date: Wed, 8 Nov 2023 15:56:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=AF=E7=94=A8=E8=B5=84=E6=BA=90=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 3673109dda69aa2e8984dd89fce484a0dc9dc886
---
 api/desc/core/pcm-core.api                 | 2 +-
 api/internal/logic/core/nodeassetslogic.go | 2 +-
 api/internal/types/types.go                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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可用率