From 81a32ac2d41cf3aeee99a10d01df8a777997e37a Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Fri, 8 Jul 2022 10:38:30 +0800 Subject: [PATCH] debug --- models/cloudbrain.go | 13 +++++++------ routers/api/v1/repo/cloudbrain.go | 14 +++----------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/models/cloudbrain.go b/models/cloudbrain.go index 9fad6252e..00b52f763 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -2026,16 +2026,17 @@ func GetNewestJobsByAiCenter() ([]int64, error) { Where("type=? and ai_center!=''", TypeC2Net). GroupBy("ai_center"). Table(Cloudbrain{}). - Find(ids) + Find(&ids) } -func GetNewestJobsByType() ([]*Cloudbrain, error) { - cloudbrains := make([]*Cloudbrain, 0) - return cloudbrains, x. - Select("type,max(id) as id"). +func GetNewestJobsByType() ([]int64, error) { + ids := make([]int64, 0) + return ids, x. + Select("max(id) as id"). In("type", TypeCloudBrainOne, TypeCloudBrainTwo). GroupBy("type"). - Find(&cloudbrains) + Table(Cloudbrain{}). + Find(&ids) } func GetCloudbrainByIDs(ids []int64) ([]*Cloudbrain, error) { diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go index 54c070f5e..40f4c5721 100755 --- a/routers/api/v1/repo/cloudbrain.go +++ b/routers/api/v1/repo/cloudbrain.go @@ -220,23 +220,15 @@ func GetNewestJobs(ctx *context.APIContext) { return } - jobsCloudbrain, err := models.GetNewestJobsByType() + idsCloudbrain, err := models.GetNewestJobsByType() if err != nil { log.Error("GetNewestJobsByType(%s) failed:%v", err.Error()) return } - var ids []int64 - - for _, id := range idsC2Net { - log.Info("%d", id) - } - + ids := make([]int64, len(idsC2Net), cap(idsC2Net)*2) copy(ids, idsC2Net) - for _, job := range jobsCloudbrain { - log.Info("%d, %d", job.Type, job.ID) - ids = append(ids, job.ID) - } + copy(ids, idsCloudbrain) jobs, err := models.GetCloudbrainByIDs(ids) if err != nil {