diff --git a/models/cloudbrain_static.go b/models/cloudbrain_static.go index 92d9842a9..23cdebb9d 100644 --- a/models/cloudbrain_static.go +++ b/models/cloudbrain_static.go @@ -335,7 +335,7 @@ func DeleteCloudbrainDurationStatisticHour(date string, hour int, aiCenterCode s func GetCanUseCardInfo() ([]*ResourceQueue, error) { sess := x.NewSession() defer sess.Close() - sess.OrderBy("resource_queue.cluster DESC, resource_queue.ai_center_code ASC") + sess.OrderBy("resource_queue.cluster DESC, resource_queue.ai_center_name ASC") ResourceQueues := make([]*ResourceQueue, 0, 10) if err := sess.Table(&ResourceQueue{}).Find(&ResourceQueues); err != nil { log.Info("find error.") diff --git a/routers/api/v1/repo/cloudbrain_dashboard.go b/routers/api/v1/repo/cloudbrain_dashboard.go index e29468671..2737e299c 100755 --- a/routers/api/v1/repo/cloudbrain_dashboard.go +++ b/routers/api/v1/repo/cloudbrain_dashboard.go @@ -1861,6 +1861,7 @@ func GetResourceQueues(ctx *context.Context) { for _, resourceQueue := range resourceQueues { if _, ok := aiCenterCodeMap[resourceQueue.AiCenterCode]; !ok { resourceQueue.AiCenterName = repo.GetAiCenterNameByCode(resourceQueue.AiCenterCode) + aiCenterCodeMap[resourceQueue.AiCenterCode] = resourceQueue.AiCenterCode Resource = append(Resource, resourceQueue) } } diff --git a/routers/repo/cloudbrain_statistic.go b/routers/repo/cloudbrain_statistic.go index 5414c184b..fba2a9e07 100644 --- a/routers/repo/cloudbrain_statistic.go +++ b/routers/repo/cloudbrain_statistic.go @@ -124,9 +124,9 @@ func summaryDurationStat(statisticTime time.Time) { func GetAiCenterNameByCode(centerCode string) string { var aiCenterName string - c2NetSequenceInfo := cloudbrainService.C2NetSequenceInfoByCode(centerCode) - if c2NetSequenceInfo != nil { - aiCenterName = c2NetSequenceInfo.Content + aiCenterInfo := cloudbrainService.GetAiCenterInfoByCenterCode(centerCode) + if aiCenterInfo != nil { + aiCenterName = aiCenterInfo.Content } else { aiCenterName = centerCode } diff --git a/services/cloudbrain/util.go b/services/cloudbrain/util.go index 141807246..1d25ff8b1 100644 --- a/services/cloudbrain/util.go +++ b/services/cloudbrain/util.go @@ -33,7 +33,7 @@ func GetAiCenterShow(aiCenter string, ctx *context.Context) string { } -func C2NetSequenceInfoByCode(aiCenterCode string) *setting.C2NetSequenceInfo { +func GetAiCenterInfoByCenterCode(aiCenterCode string) *setting.C2NetSequenceInfo { if setting.AiCenterCodeAndNameMapInfo != nil { if info, ok := setting.AiCenterCodeAndNameMapInfo[aiCenterCode]; ok { return info