fix-bug

models/cloudbrain.go

@@ -2296,9 +2296,9 @@ func CloudbrainAllStatic(opts *CloudbrainsOptions) ([]*CloudbrainInfo, int64, er
 		}
 		sess.Limit(opts.PageSize, start)
 	}
-	sess.OrderBy("cloudbrain.created_unix DESC")
+	// sess.OrderBy("cloudbrain.created_unix DESC")
 	cloudbrains := make([]*CloudbrainInfo, 0, setting.UI.IssuePagingNum)
-	if err := sess.Table(&Cloudbrain{}).Unscoped().Where(cond).
+	if err := sess.Cols("status", "type", "job_type", "train_job_duration", "duration", "compute_resource", "created_unix", "start_time", "end_time", "work_server_number").Table(&Cloudbrain{}).Unscoped().Where(cond).
 		Find(&cloudbrains); err != nil {
 		return nil, 0, fmt.Errorf("Find: %v", err)
 	}

routers/api/v1/repo/cloudbrain_dashboard.go

@@ -120,9 +120,6 @@ func GetOverviewDuration(ctx *context.Context) {
 	recordBeginTime := recordCloudbrain[0].Cloudbrain.CreatedUnix
 	now := time.Now()
 	endTime := now
-	page := 1
-	pagesize := 1000
-	count := pagesize
 	worker_server_num := 1
 	cardNum := 1
 	durationAllSum := int64(0)
@@ -138,54 +135,46 @@ func GetOverviewDuration(ctx *context.Context) {
 	c2NetDuration := int64(0)
 	cDCenterDuration := int64(0)
 
-	for count == pagesize && count != 0 {
-		cloudbrains, _, err := models.CloudbrainAllStatic(&models.CloudbrainsOptions{
-			ListOptions: models.ListOptions{
-				Page:     page,
-				PageSize: pagesize,
-			},
-			Type:          models.TypeCloudBrainAll,
-			BeginTimeUnix: int64(recordBeginTime),
-			EndTimeUnix:   endTime.Unix(),
-		})
-		if err != nil {
-			ctx.ServerError("Get cloudbrains failed:", err)
-			return
-		}
-		models.LoadSpecs4CloudbrainInfo(cloudbrains)
-
-		for _, cloudbrain := range cloudbrains {
-			if cloudbrain.Cloudbrain.WorkServerNumber >= 1 {
-				worker_server_num = cloudbrain.Cloudbrain.WorkServerNumber
-			} else {
-				worker_server_num = 1
-			}
-			if cloudbrain.Cloudbrain.Spec == nil {
-				cardNum = 1
-			} else {
-				cardNum = cloudbrain.Cloudbrain.Spec.AccCardsNum
-			}
-			duration := cloudbrain.Duration
-			durationSum := cloudbrain.Duration * int64(worker_server_num) * int64(cardNum)
-			if cloudbrain.Cloudbrain.Type == models.TypeCloudBrainOne {
-				cloudBrainOneDuration += duration
-				cloudBrainOneCardDuSum += durationSum
-			} else if cloudbrain.Cloudbrain.Type == models.TypeCloudBrainTwo {
-				cloudBrainTwoDuration += duration
-				cloudBrainTwoCardDuSum += durationSum
-			} else if cloudbrain.Cloudbrain.Type == models.TypeC2Net {
-				c2NetDuration += duration
-				c2NetCardDuSum += durationSum
-			} else if cloudbrain.Cloudbrain.Type == models.TypeCDCenter {
-				cDCenterDuration += duration
-				cDNetCardDuSum += durationSum
-			}
+	cloudbrains, _, err := models.CloudbrainAllStatic(&models.CloudbrainsOptions{
+		Type:          models.TypeCloudBrainAll,
+		BeginTimeUnix: int64(recordBeginTime),
+		EndTimeUnix:   endTime.Unix(),
+	})
+	if err != nil {
+		ctx.ServerError("Get cloudbrains failed:", err)
+		return
+	}
+	models.LoadSpecs4CloudbrainInfo(cloudbrains)
 
-			durationAllSum += duration
-			cardDuSum += durationSum
-			count = len(cloudbrains)
-			page += 1
+	for _, cloudbrain := range cloudbrains {
+		if cloudbrain.Cloudbrain.WorkServerNumber >= 1 {
+			worker_server_num = cloudbrain.Cloudbrain.WorkServerNumber
+		} else {
+			worker_server_num = 1
 		}
+		if cloudbrain.Cloudbrain.Spec == nil {
+			cardNum = 1
+		} else {
+			cardNum = cloudbrain.Cloudbrain.Spec.AccCardsNum
+		}
+		duration := cloudbrain.Duration
+		durationSum := cloudbrain.Duration * int64(worker_server_num) * int64(cardNum)
+		if cloudbrain.Cloudbrain.Type == models.TypeCloudBrainOne {
+			cloudBrainOneDuration += duration
+			cloudBrainOneCardDuSum += durationSum
+		} else if cloudbrain.Cloudbrain.Type == models.TypeCloudBrainTwo {
+			cloudBrainTwoDuration += duration
+			cloudBrainTwoCardDuSum += durationSum
+		} else if cloudbrain.Cloudbrain.Type == models.TypeC2Net {
+			c2NetDuration += duration
+			c2NetCardDuSum += durationSum
+		} else if cloudbrain.Cloudbrain.Type == models.TypeCDCenter {
+			cDCenterDuration += duration
+			cDNetCardDuSum += durationSum
+		}
+
+		durationAllSum += duration
+		cardDuSum += durationSum
 	}
 	ctx.JSON(http.StatusOK, map[string]interface{}{
 		"cloudBrainOneCardDuSum": cloudBrainOneCardDuSum,