Merge pull request '解决看板概览问题' (#3263) from fix-tasks-basic into V20221130

Reviewed-on: https://openi.pcl.ac.cn/OpenI/aiforge/pulls/3263
Reviewed-by: zouap <zouap@pcl.ac.cn>

routers/api/v1/repo/cloudbrain_dashboard.go

@@ -123,8 +123,9 @@ func GetOverviewDuration(ctx *context.Context) {
 	recordBeginTime := recordCloudbrain[0].Cloudbrain.CreatedUnix
 	now := time.Now()
 	endTime := now
-	// worker_server_num := 1
-	// cardNum := 1
+	var workServerNumber int64
+	var cardNum int64
+
 	durationAllSum := int64(0)
 	cardDuSum := int64(0)
 
@@ -138,52 +139,60 @@ func GetOverviewDuration(ctx *context.Context) {
 	c2NetDuration := int64(0)
 	cDCenterDuration := int64(0)
 
-	cloudbrains, _, err := models.CloudbrainAllStatic(&models.CloudbrainsOptions{
-		Type:          models.TypeCloudBrainAll,
-		BeginTimeUnix: int64(recordBeginTime),
-		EndTimeUnix:   endTime.Unix(),
-	})
-	if err != nil {
-		ctx.ServerError("Get cloudbrains failed:", err)
-		return
-	}
-	models.LoadSpecs4CloudbrainInfo(cloudbrains)
-
-	for _, cloudbrain := range cloudbrains {
-		cloudbrain = cloudbrainService.UpdateCloudbrainAiCenter(cloudbrain)
-		CardDurationString := repo.GetCloudbrainCardDuration(cloudbrain.Cloudbrain)
-		CardDuration := models.ConvertStrToDuration(CardDurationString)
-		// if cloudbrain.Cloudbrain.WorkServerNumber >= 1 {
-		// 	worker_server_num = cloudbrain.Cloudbrain.WorkServerNumber
-		// } else {
-		// 	worker_server_num = 1
-		// }
-		// if cloudbrain.Cloudbrain.Spec == nil {
-		// 	cardNum = 1
-		// } else {
-		// 	cardNum = cloudbrain.Cloudbrain.Spec.AccCardsNum
-		// }
-		// duration := cloudbrain.Duration
-		// duration := cloudbrain.Duration
-		duration := models.ConvertStrToDuration(cloudbrain.TrainJobDuration)
-		// CardDuration := cloudbrain.Duration * int64(worker_server_num) * int64(cardNum)
-
-		if cloudbrain.Cloudbrain.Type == models.TypeCloudBrainOne {
-			cloudBrainOneDuration += duration
-			cloudBrainOneCardDuSum += CardDuration
-		} else if cloudbrain.Cloudbrain.Type == models.TypeCloudBrainTwo {
-			cloudBrainTwoDuration += duration
-			cloudBrainTwoCardDuSum += CardDuration
-		} else if cloudbrain.Cloudbrain.Type == models.TypeC2Net {
-			c2NetDuration += duration
-			c2NetCardDuSum += CardDuration
-		} else if cloudbrain.Cloudbrain.Type == models.TypeCDCenter {
-			cDCenterDuration += duration
-			cDNetCardDuSum += CardDuration
+	page := 1
+	pagesize := 10000
+	count := pagesize
+	// Each time a maximum of 10000 pieces of data are detected to the memory, batch processing
+	for count == pagesize && count != 0 {
+		cloudbrains, _, err := models.CloudbrainAllStatic(&models.CloudbrainsOptions{
+			ListOptions: models.ListOptions{
+				Page:     page,
+				PageSize: pagesize,
+			},
+			Type:          models.TypeCloudBrainAll,
+			BeginTimeUnix: int64(recordBeginTime),
+			EndTimeUnix:   endTime.Unix(),
+		})
+		if err != nil {
+			ctx.ServerError("Get cloudbrains failed:", err)
+			return
 		}
+		models.LoadSpecs4CloudbrainInfo(cloudbrains)
+
+		for _, cloudbrain := range cloudbrains {
+			cloudbrain = cloudbrainService.UpdateCloudbrainAiCenter(cloudbrain)
+			if cloudbrain.Cloudbrain.Spec != nil {
+				cardNum = int64(cloudbrain.Cloudbrain.Spec.AccCardsNum)
+			} else {
+				cardNum = 1
+			}
+			if cloudbrain.Cloudbrain.WorkServerNumber >= 1 {
+				workServerNumber = int64(cloudbrain.Cloudbrain.WorkServerNumber)
+			} else {
+				workServerNumber = 1
+			}
+			duration := models.ConvertStrToDuration(cloudbrain.TrainJobDuration)
+			CardDuration := workServerNumber * int64(cardNum) * duration
+
+			if cloudbrain.Cloudbrain.Type == models.TypeCloudBrainOne {
+				cloudBrainOneDuration += duration
+				cloudBrainOneCardDuSum += CardDuration
+			} else if cloudbrain.Cloudbrain.Type == models.TypeCloudBrainTwo {
+				cloudBrainTwoDuration += duration
+				cloudBrainTwoCardDuSum += CardDuration
+			} else if cloudbrain.Cloudbrain.Type == models.TypeC2Net {
+				c2NetDuration += duration
+				c2NetCardDuSum += CardDuration
+			} else if cloudbrain.Cloudbrain.Type == models.TypeCDCenter {
+				cDCenterDuration += duration
+				cDNetCardDuSum += CardDuration
+			}
 
-		durationAllSum += duration
-		cardDuSum += CardDuration
+			durationAllSum += duration
+			cardDuSum += CardDuration
+		}
+		count = len(cloudbrains)
+		page += 1
 	}
 	ctx.JSON(http.StatusOK, map[string]interface{}{
 		"cloudBrainOneCardDuSum": cloudBrainOneCardDuSum,

routers/repo/cloudbrain_statistic.go

@@ -246,13 +246,20 @@ func getcloudBrainCenterCodeAndCardTypeInfo(ciTasks []*models.CloudbrainInfo, be
 func CloudbrainUpdateHistoryData(ctx *context.Context) {
 	beginTimeStr := ctx.QueryTrim("beginTime")
 	endTimeStr := ctx.QueryTrim("endTime")
-	beginTime, _ := time.ParseInLocation("2006-01-02 15:04:05", beginTimeStr, time.Local)
-	endTime, _ := time.ParseInLocation("2006-01-02 15:04:05", endTimeStr, time.Local)
-	beginTimeUnix := timeutil.TimeStamp(beginTime.Unix())
-	endTimeUnix := timeutil.TimeStamp(endTime.Unix())
+	var count int64
+	var err error
+	if beginTimeStr != "" && endTimeStr != "" {
+		beginTime, _ := time.ParseInLocation("2006-01-02 15:04:05", beginTimeStr, time.Local)
+		endTime, _ := time.ParseInLocation("2006-01-02 15:04:05", endTimeStr, time.Local)
+		if time.Now().Before(endTime) {
+			endTime = time.Now()
+		}
+		beginTimeUnix := timeutil.TimeStamp(beginTime.Unix())
+		endTimeUnix := timeutil.TimeStamp(endTime.Unix())
 
-	err := models.DeleteCloudbrainDurationStatistic(beginTimeUnix, endTimeUnix)
-	count := UpdateDurationStatisticHistoryData(beginTime, endTime)
+		err = models.DeleteCloudbrainDurationStatistic(beginTimeUnix, endTimeUnix)
+		count = UpdateDurationStatisticHistoryData(beginTime.Add(+1*time.Hour), endTime)
+	}
 	ctx.JSON(http.StatusOK, map[string]interface{}{
 		"message": 0,
 		"count":   count,