update

models/cloudbrain_static.go

@@ -215,25 +215,23 @@ func GetCreatorCount() (int64, error) {
 	return x.SQL(countSql).Count()
 }
 
-func GetJobWaitingCount() (int64, error) {
-	countSql := "SELECT count(*) FROM  " + "public.cloudbrain where status ='" + string(JobWaiting) + "'"
-	return x.SQL(countSql).Count()
-}
-func GetJobStoppedCount() (int64, error) {
-	countSql := "SELECT count(*) FROM  " + "public.cloudbrain where status ='" + string(JobStopped) + "'"
-	return x.SQL(countSql).Count()
-}
-func GetJobSucceededCount() (int64, error) {
-	countSql := "SELECT count(*) FROM  " + "public.cloudbrain where status ='" + string(JobSucceeded) + "'"
-	return x.SQL(countSql).Count()
-}
-func GetJobFailedCount() (int64, error) {
-	countSql := "SELECT count(*) FROM  " + "public.cloudbrain where status ='" + string(JobFailed) + "'"
-	return x.SQL(countSql).Count()
-}
-func GetJobRunningCount() (int64, error) {
-	countSql := "SELECT count(*) FROM  " + "public.cloudbrain where status ='" + string(JobRunning) + "'"
-	return x.SQL(countSql).Count()
+func GetAllStatusCloudBrain() map[string]int {
+	sess := x.NewSession()
+	defer sess.Close()
+	cloudbrains := make([]*CloudbrainInfo, 0)
+	if err := sess.Table(&Cloudbrain{}).Unscoped().
+		Find(&cloudbrains); err != nil {
+		log.Info("find error.")
+	}
+	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
 }
 
 func getCreatePeriodCount(dateBeginTime string, dateEndTime string, hourBeginTime string, hourEndTime string) (int64, error) {

routers/api/v1/repo/cloudbrain_dashboard.go

@@ -43,13 +43,6 @@ type CloudbrainsOverviewData struct {
 	CreatorCount            int64 `json:"creatorCount"`
 }
 
-type CloudbrainsStatusAnalysis struct {
-	JobWaitingCount   int64 `json:"jobWaitingCount"`
-	JobRunningCount   int64 `json:"jobRunningCount"`
-	JobStoppedCount   int64 `json:"jobStoppedCount"`
-	JobSucceededCount int64 `json:"jobSucceededCount"`
-	JobFailedCount    int64 `json:"jobFailedCount"`
-}
 type TimeCloudbrainsNum struct {
 	TimeCloudbrainNum []DateCloudbrainNum `json:"dateCloudbrainNum"`
 }
@@ -379,40 +372,10 @@ func GetAllCloudbrainsPeriodDistribution(ctx *context.Context) {
 }
 
 func GetCloudbrainsStatusAnalysis(ctx *context.Context) {
-	jobWaitingCount, err := models.GetJobWaitingCount()
-	if err != nil {
-		log.Error("Can not query jobWaitingCount.", err)
-		return
-	}
-	jobRunningCount, err := models.GetJobRunningCount()
-	if err != nil {
-		log.Error("Can not query jobRunningCount.", err)
-		return
-	}
-	jobStoppedCount, err := models.GetJobStoppedCount()
-	if err != nil {
-		log.Error("Can not query jobStoppedCount.", err)
-		return
-	}
-	jobSucceededCount, err := models.GetJobSucceededCount()
-	if err != nil {
-		log.Error("Can not query jobSucceededCount.", err)
-		return
-	}
-	jobFailedCount, err := models.GetJobFailedCount()
-	if err != nil {
-		log.Error("Can not query jobFailedCount.", err)
-		return
-	}
-
-	cloudbrainsStatusAnalysis := CloudbrainsStatusAnalysis{
-		JobWaitingCount:   jobWaitingCount,
-		JobRunningCount:   jobRunningCount,
-		JobStoppedCount:   jobStoppedCount,
-		JobSucceededCount: jobSucceededCount,
-		JobFailedCount:    jobFailedCount,
-	}
-	ctx.JSON(http.StatusOK, cloudbrainsStatusAnalysis)
+	cloudBrainStatusResult := models.GetAllStatusCloudBrain()
+	ctx.JSON(http.StatusOK, map[string]interface{}{
+		"cloudBrainStatusResult": cloudBrainStatusResult,
+	})
 }
 
 func GetCloudbrainsDetailData(ctx *context.Context) {