From ca06022e6d45482a39f65936e6efae410d92c76b Mon Sep 17 00:00:00 2001 From: liuzx Date: Tue, 18 Mar 2025 17:47:27 +0800 Subject: [PATCH] fix-doc-169 --- models/cloudbrain.go | 2 +- models/resource_queue.go | 15 +++++++++++++++ modules/grampus/resty.go | 2 +- .../cloudbrain/resource/resource_specification.go | 7 +++++-- 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/models/cloudbrain.go b/models/cloudbrain.go index c9ca3d4580..ef2b93b9f9 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -2162,7 +2162,7 @@ type GetGrampusResourceSpecsResult struct { type GetGrampusResourceSpecPoolsResult struct { GrampusResult - Infos []GrampusSpecPools `json:"resourceSpecs"` + Infos []GrampusSpecPools `json:"resourceSpecPools"` } type GetGrampusAiCentersResult struct { diff --git a/models/resource_queue.go b/models/resource_queue.go index 2e7c1ba8f9..6aaa813367 100644 --- a/models/resource_queue.go +++ b/models/resource_queue.go @@ -196,6 +196,21 @@ func InsertResourceQueue(queue ResourceQueue) (int64, error) { func UpdateResourceQueueById(queueId int64, queue ResourceQueue) (int64, error) { return x.ID(queueId).Update(&queue) } + +func UpdateResourceQueueCardNum(queue ResourceQueue) error { + // 直接更新 cards_total_num 字段 + _, err := x.Cols("cards_total_num").Where("queue_code = ? and ai_center_code = ? and acc_card_type ILIKE ?", queue.QueueCode, queue.AiCenterCode, queue.AccCardType).Update(&ResourceQueue{ + CardsTotalNum: queue.CardsTotalNum, + }) + if err != nil { + return err + } else { + log.Info("QueueCode is %v, AiCenterCode is: %v, AccCardType is: %v, CardsTotalNum is: %v\n", queue.QueueCode, queue.AiCenterCode, queue.AccCardType, queue.CardsTotalNum) + } + + return nil +} + func UpdateResourceCardsTotalNumAndInternetStatus(queueId int64, queue ResourceQueue, isAvailable int) (int64, error) { sess := x.NewSession() if err := sess.Begin(); err != nil { diff --git a/modules/grampus/resty.go b/modules/grampus/resty.go index 7a07718786..de95c6cc75 100755 --- a/modules/grampus/resty.go +++ b/modules/grampus/resty.go @@ -29,7 +29,7 @@ const ( urlGetToken = urlOpenApiV1 + "token" urlTrainJob = urlOpenApiV1 + "trainjob" urlGetResourceSpecs = urlOpenApiV1 + "resourcespec" - urlGetResourceSpecPools = urlOpenApiV1 + "resourceSpecPools" + urlGetResourceSpecPools = urlOpenApiV1 + "resourceSpecPool" urlGetAiCenter = urlOpenApiV1 + "sharescreen/aicenter" urlGetImages = urlOpenApiV1 + "image" urlDelImages = urlOpenApiV1 + "delimage" diff --git a/services/cloudbrain/resource/resource_specification.go b/services/cloudbrain/resource/resource_specification.go index c2b0f82d1d..2aebe75a8c 100644 --- a/services/cloudbrain/resource/resource_specification.go +++ b/services/cloudbrain/resource/resource_specification.go @@ -140,10 +140,13 @@ func SyncGrampusSpecPools() error { fmt.Printf("strconv.ParseInt error: %v\n", err) } resourceQueue := models.ResourceQueue{ - ID: queue_id, + AiCenterCode: info.CenterId, + QueueCode: info.ID, + AccCardType: info.CardType, CardsTotalNum: info.CardNum, } - _, err = models.UpdateResourceQueueById(queue_id, resourceQueue) + + err = models.UpdateResourceQueueCardNum(resourceQueue) if err != nil { fmt.Printf("UpdateResourceQueueById error: %v, queueId is: %v\n", err, queue_id) } -- 2.34.1