fix-bug

models/cloudbrain_static.go

@@ -169,29 +169,7 @@ func GetCreatorCount() (int64, error) {
 	return x.SQL(countSql).Count()
 }
 
-func GetAllCloudBrain() ([]*CloudbrainInfo, error) {
-	sess := x.NewSession()
-	defer sess.Close()
-	cloudbrains := make([]*CloudbrainInfo, 0)
-	if err := sess.Table(&Cloudbrain{}).Unscoped().
-		Find(&cloudbrains); err != nil {
-		log.Info("find error.")
-	}
-	return cloudbrains, nil
-}
-
 func GetRecordBeginTime() ([]*CloudbrainInfo, error) {
-	// sess := x.NewSession()
-	// defer sess.Close()
-
-	// cloudbrains := make([]*CloudbrainInfo, 0)
-	// if err := sess.Table(&Cloudbrain{}).
-	// 	Find(&cloudbrains); err != nil {
-	// 	return nil, fmt.Errorf("Find: %v", err)
-	// }
-
-	// return cloudbrains, nil
-
 	sess := x.NewSession()
 	defer sess.Close()
 	sess.OrderBy("cloudbrain.id ASC limit 1")

routers/api/v1/repo/cloudbrain_dashboard.go

@@ -49,10 +49,11 @@ func GetAllCloudbrainsOverview(ctx *context.Context) {
 		log.Error("Can not query creatorCount.", err)
 		return
 	}
-
-	cloudbrains, err := models.GetAllCloudBrain()
+	cloudbrains, _, err := models.CloudbrainAll(&models.CloudbrainsOptions{
+		Type: models.TypeCloudBrainAll,
+	})
 	if err != nil {
-		log.Error("Getcloudbrains failed:%v", err)
+		ctx.ServerError("Get cloudbrains failed:", err)
 		return
 	}
 
@@ -478,9 +479,11 @@ func GetAllCloudbrainsPeriodDistribution(ctx *context.Context) {
 	// beginTime = beginTime.AddDate(0, 0, -1)
 	// endTime = endTime.AddDate(0, 0, -1)
 
-	cloudbrains, err := models.GetAllCloudBrain()
+	cloudbrains, _, err := models.CloudbrainAll(&models.CloudbrainsOptions{
+		Type: models.TypeCloudBrainAll,
+	})
 	if err != nil {
-		log.Error("Getcloudbrains failed:%v", err)
+		ctx.ServerError("Get cloudbrains failed:", err)
 		return
 	}
 	cloudOneJobTypeRes := make(map[string]int)
@@ -566,9 +569,11 @@ func GetAllCloudbrainsPeriodDistribution(ctx *context.Context) {
 }
 
 func GetCloudbrainsStatusAnalysis(ctx *context.Context) {
-	cloudbrains, err := models.GetAllCloudBrain()
+	cloudbrains, _, err := models.CloudbrainAll(&models.CloudbrainsOptions{
+		Type: models.TypeCloudBrainAll,
+	})
 	if err != nil {
-		log.Error("Getcloudbrains failed:%v", err)
+		ctx.ServerError("Get cloudbrains failed:", err)
 		return
 	}
 	cloudBrainStatusResult := make(map[string]int)
@@ -775,7 +780,7 @@ func GetCloudbrainsCreateHoursData(ctx *context.Context) {
 			beginTime = time.Date(beginTime.Year(), beginTime.Month(), beginTime.Day(), 0, 0, 0, 0, now.Location())
 			endTime = now.AddDate(0, 0, 1)
 		} else if queryType == "last_30day" {
-			beginTime := now.AddDate(0, 0, -29)
+			beginTime = now.AddDate(0, 0, -29)
 			beginTime = time.Date(beginTime.Year(), beginTime.Month(), beginTime.Day(), 0, 0, 0, 0, now.Location())
 			endTime = now.AddDate(0, 0, 1)
 		}
@@ -952,9 +957,11 @@ func getCloudbrainCount(beginTime time.Time, endTime time.Time, cloudbrains []*m
 }
 
 func getHourCloudbrainNum(beginTime time.Time, endTimeTemp time.Time, endTime time.Time) ([]DateCloudbrainNum, error) {
-	cloudbrains, err := models.GetAllCloudBrain()
+	cloudbrains, _, err := models.CloudbrainAll(&models.CloudbrainsOptions{
+		Type: models.TypeCloudBrainAll,
+	})
 	if err != nil {
-		log.Error("Getcloudbrains failed:%v", err)
+		log.Error("Get cloudbrains failed:", err)
 		return nil, err
 	}
 	dayCloudbrainNum := make([]DateCloudbrainNum, 0)
@@ -975,9 +982,11 @@ func getHourCloudbrainNum(beginTime time.Time, endTimeTemp time.Time, endTime ti
 	return dayCloudbrainNum, nil
 }
 func getDayCloudbrainNum(beginTime time.Time, endTimeTemp time.Time, endTime time.Time) ([]DateCloudbrainNum, error) {
-	cloudbrains, err := models.GetAllCloudBrain()
+	cloudbrains, _, err := models.CloudbrainAll(&models.CloudbrainsOptions{
+		Type: models.TypeCloudBrainAll,
+	})
 	if err != nil {
-		log.Error("Getcloudbrains failed:%v", err)
+		log.Error("Get cloudbrains failed:", err)
 		return nil, err
 	}
 	dayCloudbrainNum := make([]DateCloudbrainNum, 0)
@@ -1006,7 +1015,9 @@ func getDayCloudbrainNum(beginTime time.Time, endTimeTemp time.Time, endTime tim
 }
 func getMonthCloudbrainNum(beginTime time.Time, endTimeTemp time.Time, endTime time.Time) ([]DateCloudbrainNum, error) {
 	monthCloudbrainNum := make([]DateCloudbrainNum, 0)
-	cloudbrains, err := models.GetAllCloudBrain()
+	cloudbrains, _, err := models.CloudbrainAll(&models.CloudbrainsOptions{
+		Type: models.TypeCloudBrainAll,
+	})
 	if err != nil {
 		log.Error("Getcloudbrains failed:%v", err)
 		return nil, err
@@ -1038,7 +1049,9 @@ func getDayCloudbrainInfo(beginTime time.Time, endTime time.Time) ([]DateCloudbr
 	if endTimeTemp.Equal(endTime) {
 		endTimeTemp = endTimeTemp.AddDate(0, 0, -1)
 	}
-	cloudbrains, err := models.GetAllCloudBrain()
+	cloudbrains, _, err := models.CloudbrainAll(&models.CloudbrainsOptions{
+		Type: models.TypeCloudBrainAll,
+	})
 	if err != nil {
 		log.Error("Getcloudbrains failed:%v", err)
 		return nil, 0, err
@@ -1065,7 +1078,9 @@ func getMonthCloudbrainInfo(beginTime time.Time, endTime time.Time) ([]DateCloud
 	if endTimeTemp.Equal(endTime) {
 		endTimeTemp = endTimeTemp.AddDate(0, -1, 0)
 	}
-	cloudbrains, err := models.GetAllCloudBrain()
+	cloudbrains, _, err := models.CloudbrainAll(&models.CloudbrainsOptions{
+		Type: models.TypeCloudBrainAll,
+	})
 	if err != nil {
 		log.Error("Getcloudbrains failed:%v", err)
 		return nil, 0, err