Browse Source

debug

tags/v1.22.7.1
lewis 3 years ago
parent
commit
81a32ac2d4
2 changed files with 10 additions and 17 deletions
  1. +7
    -6
      models/cloudbrain.go
  2. +3
    -11
      routers/api/v1/repo/cloudbrain.go

+ 7
- 6
models/cloudbrain.go View File

@@ -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) {


+ 3
- 11
routers/api/v1/repo/cloudbrain.go View File

@@ -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 {


Loading…
Cancel
Save