update

routers/api/v1/repo/cloudbrain_dashboard.go

@@ -674,13 +674,8 @@ func GetWaitTimeTop(ctx *context.Context) {
 
 }
 
-func getCloudbrainCount(beginTime time.Time, endTime time.Time) (map[string]int, map[string]int, map[string]int, map[int]int, map[string]int, error) {
+func getCloudbrainCount(beginTime time.Time, endTime time.Time, cloudbrains []*models.CloudbrainInfo) (map[string]int, map[string]int, map[string]int, map[int]int, map[string]int) {
 
-	cloudbrains, err := models.GetAllCloudBrain()
-	if err != nil {
-		log.Error("Getcloudbrains failed:%v", err)
-		return nil, nil, nil, nil, nil, err
-	}
 	cloudOneJobTypeRes := make(map[string]int)
 	cloudTwoJobTypeRes := make(map[string]int)
 	intelligentNetJobTypeRes := make(map[string]int)
@@ -744,17 +739,19 @@ func getCloudbrainCount(beginTime time.Time, endTime time.Time) (map[string]int,
 		}
 	}
 	cloudBrainPeriodNum[-1] = cloudBrainPeriodNum[0] + cloudBrainPeriodNum[1] + cloudBrainPeriodNum[2]
-	return cloudOneJobTypeRes, cloudTwoJobTypeRes, intelligentNetJobTypeRes, cloudBrainPeriodNum, cloudBrainComputeResource, err
+	return cloudOneJobTypeRes, cloudTwoJobTypeRes, intelligentNetJobTypeRes, cloudBrainPeriodNum, cloudBrainComputeResource
 }
 
 func getHourCloudbrainNum(beginTime time.Time, endTimeTemp time.Time, endTime time.Time) ([]DateCloudbrainNum, error) {
+	cloudbrains, err := models.GetAllCloudBrain()
+	if err != nil {
+		log.Error("Getcloudbrains failed:%v", err)
+		return nil, err
+	}
 	dayCloudbrainNum := make([]DateCloudbrainNum, 0)
+
 	for endTimeTemp.Before(endTime) || endTimeTemp.Equal(endTime) {
-		cloudOneJobTypeRes, cloudTwoJobTypeRes, intelligentNetJobTypeRes, cloudBrainPeriodNum, cloudBrainComputeResource, err := getCloudbrainCount(beginTime, endTimeTemp)
-		if err != nil {
-			log.Error("Can not query getCloudbrainCount.", err)
-			return nil, err
-		}
+		cloudOneJobTypeRes, cloudTwoJobTypeRes, intelligentNetJobTypeRes, cloudBrainPeriodNum, cloudBrainComputeResource := getCloudbrainCount(beginTime, endTimeTemp, cloudbrains)
 		dayCloudbrainNum = append(dayCloudbrainNum, DateCloudbrainNum{
 			Date:                      beginTime.Format(time.RFC3339),
 			CloudOneJobTypeRes:        cloudOneJobTypeRes,
@@ -769,13 +766,14 @@ 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()
+	if err != nil {
+		log.Error("Getcloudbrains failed:%v", err)
+		return nil, err
+	}
 	dayCloudbrainNum := make([]DateCloudbrainNum, 0)
 	for endTimeTemp.Before(endTime) {
-		cloudOneJobTypeRes, cloudTwoJobTypeRes, intelligentNetJobTypeRes, cloudBrainPeriodNum, cloudBrainComputeResource, err := getCloudbrainCount(beginTime, endTimeTemp)
-		if err != nil {
-			log.Error("Can not query getCloudbrainCount.", err)
-			return nil, err
-		}
+		cloudOneJobTypeRes, cloudTwoJobTypeRes, intelligentNetJobTypeRes, cloudBrainPeriodNum, cloudBrainComputeResource := getCloudbrainCount(beginTime, endTimeTemp, cloudbrains)
 		dayCloudbrainNum = append(dayCloudbrainNum, DateCloudbrainNum{
 			Date:                      beginTime.Format("2006/01/02"),
 			CloudOneJobTypeRes:        cloudOneJobTypeRes,
@@ -791,12 +789,13 @@ func getDayCloudbrainNum(beginTime time.Time, endTimeTemp time.Time, endTime tim
 }
 func getYearCloudbrainNum(beginTime time.Time, endTimeTemp time.Time, endTime time.Time) ([]DateCloudbrainNum, error) {
 	yearCloudbrainNum := make([]DateCloudbrainNum, 0)
+	cloudbrains, err := models.GetAllCloudBrain()
+	if err != nil {
+		log.Error("Getcloudbrains failed:%v", err)
+		return nil, err
+	}
 	for endTimeTemp.Before(endTime) {
-		cloudOneJobTypeRes, cloudTwoJobTypeRes, intelligentNetJobTypeRes, cloudBrainPeriodNum, cloudBrainComputeResource, err := getCloudbrainCount(beginTime, endTimeTemp)
-		if err != nil {
-			log.Error("Can not query getCloudbrainCount.", err)
-			return nil, err
-		}
+		cloudOneJobTypeRes, cloudTwoJobTypeRes, intelligentNetJobTypeRes, cloudBrainPeriodNum, cloudBrainComputeResource := getCloudbrainCount(beginTime, endTimeTemp, cloudbrains)
 		yearCloudbrainNum = append(yearCloudbrainNum, DateCloudbrainNum{
 			Date:                      beginTime.Format("2006/01"),
 			CloudOneJobTypeRes:        cloudOneJobTypeRes,
@@ -812,13 +811,14 @@ func getYearCloudbrainNum(beginTime time.Time, endTimeTemp time.Time, endTime ti
 }
 
 func getDayCloudbrainInfo(beginTime time.Time, endTimeTemp time.Time, endTime time.Time) ([]DateCloudbrainNum, error) {
+	cloudbrains, err := models.GetAllCloudBrain()
+	if err != nil {
+		log.Error("Getcloudbrains failed:%v", err)
+		return nil, err
+	}
 	dayCloudbrainNum := make([]DateCloudbrainNum, 0)
 	for beginTime.Before(endTimeTemp) {
-		cloudOneJobTypeRes, cloudTwoJobTypeRes, intelligentNetJobTypeRes, cloudBrainPeriodNum, cloudBrainComputeResource, err := getCloudbrainCount(endTimeTemp, endTime)
-		if err != nil {
-			log.Error("Can not query getCloudbrainCount.", err)
-			return nil, err
-		}
+		cloudOneJobTypeRes, cloudTwoJobTypeRes, intelligentNetJobTypeRes, cloudBrainPeriodNum, cloudBrainComputeResource := getCloudbrainCount(endTimeTemp, endTime, cloudbrains)
 		dayCloudbrainNum = append(dayCloudbrainNum, DateCloudbrainNum{
 			Date:                      endTime.Format("2006/01/02"),
 			CloudOneJobTypeRes:        cloudOneJobTypeRes,