From aab56b56f4a35cf2b47f75d495d057b2988b54b0 Mon Sep 17 00:00:00 2001
From: liuzx <liuzx@pcl.ac.cn>
Date: Wed, 15 Jun 2022 15:22:18 +0800
Subject: [PATCH] merge

---
 models/cloudbrain_static.go                 | 15 ++++++---------
 routers/api/v1/repo/cloudbrain_dashboard.go | 19 ++++++++++---------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/models/cloudbrain_static.go b/models/cloudbrain_static.go
index 109e45236..27cccf415 100644
--- a/models/cloudbrain_static.go
+++ b/models/cloudbrain_static.go
@@ -164,6 +164,12 @@ func GetTodayCreatorCount(beginTime time.Time, endTime time.Time) (int64, error)
 		" and created_unix<" + strconv.FormatInt(endTime.Unix(), 10)
 	return x.SQL(countSql).Count()
 }
+func GetTodayCloudbrainCount(beginTime time.Time, endTime time.Time) (int64, error) {
+	countSql := "SELECT count FROM  " +
+		"public.cloudbrain where created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) +
+		" and created_unix<=" + strconv.FormatInt(endTime.Unix(), 10)
+	return x.SQL(countSql).Count()
+}
 func GetCreatorCount() (int64, error) {
 	countSql := "SELECT count(distinct user_id) FROM  public.cloudbrain"
 	return x.SQL(countSql).Count()
@@ -282,13 +288,4 @@ func GetRunHourPeriodCount(dateBeginTime string, dateEndTime string) (map[string
 		dateHourMap[strconv.Itoa(key)] = cout
 	}
 	return dateHourMap, nil
-	cloudBrainStatusResult := make(map[string]int)
-	for _, cloudbrain := range cloudbrains {
-		if _, ok := cloudBrainStatusResult[cloudbrain.Status]; !ok {
-			cloudBrainStatusResult[cloudbrain.Status] = 1
-		} else {
-			cloudBrainStatusResult[cloudbrain.Status] += 1
-		}
-	}
-	return cloudBrainStatusResult
 }
diff --git a/routers/api/v1/repo/cloudbrain_dashboard.go b/routers/api/v1/repo/cloudbrain_dashboard.go
index f068d24e2..b17848828 100644
--- a/routers/api/v1/repo/cloudbrain_dashboard.go
+++ b/routers/api/v1/repo/cloudbrain_dashboard.go
@@ -26,6 +26,15 @@ type DateCloudbrainInfo struct {
 	CloudBrainPeriodNum       map[int]int    `json:"cloudBrainPeriodNum"`
 	CloudBrainComputeResource map[string]int `json:"cloudBrainComputeResource"`
 }
+type CloudbrainsStatusAnalysis struct {
+	JobWaitingCount   int64 `json:"jobWaitingCount"`
+	JobRunningCount   int64 `json:"jobRunningCount"`
+	JobStoppedCount   int64 `json:"jobStoppedCount"`
+	JobCompletedCount int64 `json:"jobCompletedCount"`
+	JobFailedCount    int64 `json:"jobFailedCount"`
+	JobKilledCount    int64 `json:"jobKilledCount"`
+	JobInitCount      int64 `json:"jobInitCount"`
+}
 
 func GetAllCloudbrainsOverview(ctx *context.Context) {
 	recordCloudbrain, err := models.GetRecordBeginTime()
@@ -43,6 +52,7 @@ func GetAllCloudbrainsOverview(ctx *context.Context) {
 		log.Error("Can not query todayCreatorCount.", err)
 		return
 	}
+	GetTodayCloudbrainCount
 	creatorCount, err := models.GetCreatorCount()
 	if err != nil {
 		log.Error("Can not query creatorCount.", err)
@@ -1138,14 +1148,6 @@ func getMonthCloudbrainInfo(beginTime time.Time, endTime time.Time) ([]DateCloud
 		count += 1
 	}
 	return dayCloudbrainInfo, count, nil
-type CloudbrainsStatusAnalysis struct {
-	JobWaitingCount   int64 `json:"jobWaitingCount"`
-	JobRunningCount   int64 `json:"jobRunningCount"`
-	JobStoppedCount   int64 `json:"jobStoppedCount"`
-	JobCompletedCount int64 `json:"jobCompletedCount"`
-	JobFailedCount    int64 `json:"jobFailedCount"`
-	JobKilledCount    int64 `json:"jobKilledCount"`
-	JobInitCount      int64 `json:"jobInitCount"`
 }
 
 func DownloadCloudBrainBoard(ctx *context.Context) {
@@ -1373,4 +1375,3 @@ func getCloudbrainTimePeroid(ctx *context.Context, recordBeginTime time.Time) (t
 
 	return beginTime, endTime, nil
 }
-