From 05ac77a6d95cbf39ae20b44f49b2f2fc011f82c8 Mon Sep 17 00:00:00 2001
From: liuzx <liuzx@pcl.ac.cn>
Date: Sat, 8 Oct 2022 16:59:11 +0800
Subject: [PATCH] update

---
 models/cloudbrain.go                        |  3 +-
 routers/api/v1/repo/cloudbrain_dashboard.go | 43 +++++++++++----------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/models/cloudbrain.go b/models/cloudbrain.go
index bcaea544a..d088a9127 100755
--- a/models/cloudbrain.go
+++ b/models/cloudbrain.go
@@ -2281,8 +2281,7 @@ func CloudbrainAllStatic(opts *CloudbrainsOptions) ([]*CloudbrainInfo, int64, er
 	}
 	sess.OrderBy("cloudbrain.created_unix DESC")
 	cloudbrains := make([]*CloudbrainInfo, 0, setting.UI.IssuePagingNum)
-	if err := sess.Cols("status", "type", "job_type", "train_job_duration", "duration", "compute_resource",
-		"created_unix", "start_time", "end_time").Table(&Cloudbrain{}).Unscoped().Where(cond).
+	if err := sess.Table(&Cloudbrain{}).Unscoped().Where(cond).
 		Find(&cloudbrains); err != nil {
 		return nil, 0, fmt.Errorf("Find: %v", err)
 	}
diff --git a/routers/api/v1/repo/cloudbrain_dashboard.go b/routers/api/v1/repo/cloudbrain_dashboard.go
index ae84e4c95..6dbdb01a8 100755
--- a/routers/api/v1/repo/cloudbrain_dashboard.go
+++ b/routers/api/v1/repo/cloudbrain_dashboard.go
@@ -186,13 +186,14 @@ func GetOverviewDuration(ctx *context.Context) {
 	count := pagesize
 	worker_server_num := 1
 	cardNum := 1
-	durationSum := int64(0)
+	// durationSum := int64(0)
+	durationAllSum := int64(0)
 	cardDuSum := int64(0)
 
-	cloudBrainOneSum := int64(0)
-	cloudBrainTwoSum := int64(0)
-	c2NetSum := int64(0)
-	cDCenterSum := int64(0)
+	cloudBrainOneCardDuSum := int64(0)
+	cloudBrainTwoCardDuSum := int64(0)
+	c2NetCardDuSum := int64(0)
+	cDNetCardDuSum := int64(0)
 
 	cloudBrainOneDuration := int64(0)
 	cloudBrainTwoDuration := int64(0)
@@ -216,50 +217,50 @@ func GetOverviewDuration(ctx *context.Context) {
 		models.LoadSpecs4CloudbrainInfo(cloudbrains)
 
 		for _, cloudbrain := range cloudbrains {
-			if cloudbrain.WorkServerNumber >= 1 {
-				worker_server_num = cloudbrain.WorkServerNumber
+			if cloudbrain.Cloudbrain.WorkServerNumber >= 1 {
+				worker_server_num = cloudbrain.Cloudbrain.WorkServerNumber
 			} else {
 				worker_server_num = 1
 			}
-			if cloudbrain.Spec != nil {
-				cardNum = cloudbrain.Spec.AccCardsNum
-			} else {
+			if cloudbrain.Cloudbrain.Spec == nil {
 				cardNum = 1
+			} else {
+				cardNum = cloudbrain.Cloudbrain.Spec.AccCardsNum
 			}
 			duration := cloudbrain.Duration
-			durationSum = duration * int64(worker_server_num) * int64(cardNum)
+			durationSum := cloudbrain.Duration * int64(worker_server_num) * int64(cardNum)
 			if cloudbrain.Cloudbrain.Type == models.TypeCloudBrainOne {
 				cloudBrainOneDuration += duration
-				cloudBrainOneSum += durationSum
+				cloudBrainOneCardDuSum += durationSum
 			} else if cloudbrain.Cloudbrain.Type == models.TypeCloudBrainTwo {
 				cloudBrainTwoDuration += duration
-				cloudBrainTwoSum += durationSum
+				cloudBrainTwoCardDuSum += durationSum
 			} else if cloudbrain.Cloudbrain.Type == models.TypeC2Net {
 				c2NetDuration += duration
-				c2NetSum += durationSum
+				c2NetCardDuSum += durationSum
 			} else if cloudbrain.Cloudbrain.Type == models.TypeCDCenter {
 				cDCenterDuration += duration
-				cDCenterSum += durationSum
+				cDNetCardDuSum += durationSum
 			}
 
-			durationSum += duration
+			durationAllSum += duration
 			cardDuSum += durationSum
 			count = len(cloudbrains)
 			page += 1
 		}
 	}
 	ctx.JSON(http.StatusOK, map[string]interface{}{
-		"cloudBrainOneCardDuSum": cloudBrainOneSum,
-		"cloudBrainTwoCardDuSum": cloudBrainTwoSum,
-		"c2NetCardDuSum":         c2NetSum,
-		"cDNetCardDuSum":         cDCenterSum,
+		"cloudBrainOneCardDuSum": cloudBrainOneCardDuSum,
+		"cloudBrainTwoCardDuSum": cloudBrainTwoCardDuSum,
+		"c2NetCardDuSum":         c2NetCardDuSum,
+		"cDNetCardDuSum":         cDNetCardDuSum,
 		"cardDuSum":              cardDuSum,
 
 		"cloudBrainOneDuration": cloudBrainOneDuration,
 		"cloudBrainTwoDuration": cloudBrainTwoDuration,
 		"c2NetDuration":         c2NetDuration,
 		"cDCenterDuration":      cDCenterDuration,
-		"durationSum":           durationSum,
+		"durationSum":           durationAllSum,
 	})
 }