fix-kanban

models/cloudbrain_static.go

@@ -375,3 +375,13 @@ func GetDurationRecordBeginTime() ([]*CloudbrainDurationStatistic, error) {
 	}
 	return CloudbrainDurationStatistics, nil
 }
+
+func DeleteCloudbrainDurationStatistic() error {
+	sess := xStatistic.NewSession()
+	defer sess.Close()
+	if _, err := sess.Exec("TRUNCATE TABLE cloudbrain_duration_statistic"); err != nil {
+		log.Info("TRUNCATE cloudbrain_duration_statistic error.")
+		return err
+	}
+	return nil
+}

routers/api/v1/repo/cloudbrain_dashboard.go

@@ -1676,6 +1676,8 @@ func getDurationStatistic(beginTime time.Time, endTime time.Time) (models.Durati
 	C2NetUsageDuration := make(map[string]int)
 	OpenIDurationRate := models.DurationRateStatistic{}
 	C2NetDurationRate := models.DurationRateStatistic{}
+	log.Info("beginTimeis:", beginTime)
+	log.Info("endTimeis:", endTime)
 	cardDurationStatistics, err := models.GetCardDurationStatistics(&models.DurationStatisticOptions{
 		BeginTime: beginTime,
 		EndTime:   endTime,
@@ -1711,6 +1713,8 @@ func getDurationStatistic(beginTime time.Time, endTime time.Time) (models.Durati
 			}
 		}
 	}
+	log.Info("OpenIUsageDurationis:", OpenIUsageDuration)
+	log.Info("OpenITotalDurationis:", OpenITotalDuration)
 	ResourceAiCenterRes, err := models.GetResourceAiCenters()
 	if err != nil {
 		log.Error("Can not get ResourceAiCenterRes.", err)
@@ -1744,7 +1748,7 @@ func getDurationStatistic(beginTime time.Time, endTime time.Time) (models.Durati
 	for _, v := range OpenITotalDuration {
 		totalCanUse += float64(v)
 	}
-	for _, v := range OpenIUsageRate {
+	for _, v := range OpenIUsageDuration {
 		totalUse += float64(v)
 	}
 	if totalCanUse == 0 || totalUse == 0 {

routers/repo/cloudbrain_statistic.go

@@ -70,7 +70,11 @@ func summaryDurationStat(statisticTime time.Time) int64 {
 	}
 	cardsTotalDurationMap := make(map[string]int)
 	for _, resourceQueue := range resourceQueues {
-		cardsTotalDurationMap[resourceQueue.Cluster+"/"+resourceQueue.AiCenterCode+"/"+resourceQueue.AccCardType+"/"+resourceQueue.ComputeResource] = resourceQueue.CardsTotalNum * 1 * 60 * 60
+		if _, ok := cardsTotalDurationMap[resourceQueue.Cluster+"/"+resourceQueue.AiCenterCode+"/"+resourceQueue.AccCardType+"/"+resourceQueue.ComputeResource]; !ok {
+			cardsTotalDurationMap[resourceQueue.Cluster+"/"+resourceQueue.AiCenterCode+"/"+resourceQueue.AccCardType+"/"+resourceQueue.ComputeResource] = resourceQueue.CardsTotalNum * 1 * 60 * 60
+		} else {
+			cardsTotalDurationMap[resourceQueue.Cluster+"/"+resourceQueue.AiCenterCode+"/"+resourceQueue.AccCardType+"/"+resourceQueue.ComputeResource] += resourceQueue.CardsTotalNum * 1 * 60 * 60
+		}
 	}
 
 	for centerCode, CardTypes := range cloudBrainCenterCodeAndCardTypeInfo {
@@ -224,9 +228,11 @@ func getcloudBrainCenterCodeAndCardTypeInfo(ciTasks []*models.CloudbrainInfo, be
 }
 
 func CloudbrainUpdateHistoryData(ctx *context.Context) {
+	err := models.DeleteCloudbrainDurationStatistic()
 	count := UpdateDurationStatisticHistoryData()
 	ctx.JSON(http.StatusOK, map[string]interface{}{
 		"message": 0,
 		"count":   count,
+		"err":     err,
 	})
 }