Browse Source

fix-3224

fix-3244
liuzx 3 years ago
parent
commit
6c98725cd3
3 changed files with 12 additions and 5 deletions
  1. +1
    -1
      models/cloudbrain.go
  2. +5
    -1
      routers/api/v1/repo/cloudbrain_dashboard.go
  3. +6
    -3
      routers/repo/cloudbrain_statistic.go

+ 1
- 1
models/cloudbrain.go View File

@@ -2571,7 +2571,7 @@ func LoadSpecs4CloudbrainInfo(tasks []*CloudbrainInfo) error {
cloudbrainIds[i] = v.Cloudbrain.ID cloudbrainIds[i] = v.Cloudbrain.ID
} }
specs := make([]*CloudbrainSpec, 0) specs := make([]*CloudbrainSpec, 0)
err := x.In("cloudbrain_id", cloudbrainIds).Find(&specs)
err := x.Select("`cloudbrain_spec`.*").Table("cloudbrain_spec").Find(&specs)
if err != nil { if err != nil {
return err return err
} }


+ 5
- 1
routers/api/v1/repo/cloudbrain_dashboard.go View File

@@ -137,7 +137,11 @@ func GetOverviewDuration(ctx *context.Context) {
ctx.ServerError("Get cloudbrains failed:", err) ctx.ServerError("Get cloudbrains failed:", err)
return return
} }
models.LoadSpecs4CloudbrainInfo(cloudbrains)
err = models.LoadSpecs4CloudbrainInfo(cloudbrains)
if err != nil {
ctx.ServerError("LoadSpecs4CloudbrainInfo failed:", err)
return
}


for _, cloudbrain := range cloudbrains { for _, cloudbrain := range cloudbrains {
cloudbrain = cloudbrainService.UpdateCloudbrainAiCenter(cloudbrain) cloudbrain = cloudbrainService.UpdateCloudbrainAiCenter(cloudbrain)


+ 6
- 3
routers/repo/cloudbrain_statistic.go View File

@@ -65,15 +65,18 @@ func summaryDurationStat(statisticTime time.Time) int64 {


ciTasks, err := models.GetCloudbrainByTime(beginTime, endTime) ciTasks, err := models.GetCloudbrainByTime(beginTime, endTime)
if err != nil { if err != nil {
log.Info("GetCloudbrainByTime err: %v", err)
log.Error("GetCloudbrainByTime err: %v", err)
return 0 return 0
} }
models.LoadSpecs4CloudbrainInfo(ciTasks)
err = models.LoadSpecs4CloudbrainInfo(ciTasks)
if err != nil {
log.Error("LoadSpecs4CloudbrainInfo err: %v", err)
}
cloudBrainCenterCodeAndCardTypeInfo, cloudbrainMap := getcloudBrainCenterCodeAndCardTypeInfo(ciTasks, beginTime, endTime) cloudBrainCenterCodeAndCardTypeInfo, cloudbrainMap := getcloudBrainCenterCodeAndCardTypeInfo(ciTasks, beginTime, endTime)


resourceQueues, err := models.GetCanUseCardInfo() resourceQueues, err := models.GetCanUseCardInfo()
if err != nil { if err != nil {
log.Info("GetCanUseCardInfo err: %v", err)
log.Error("GetCanUseCardInfo err: %v", err)
return 0 return 0
} }




Loading…
Cancel
Save