fix-3144

models/cloudbrain_static.go

@@ -313,6 +313,20 @@ func InsertCloudbrainDurationStatistic(cloudbrainDurationStatistic *CloudbrainDu
 	return xStatistic.Insert(cloudbrainDurationStatistic)
 }
 
+func GetDurationStatisticByDate(date string, hour int, aiCenterCode string, accCardType string) (*CloudbrainDurationStatistic, error) {
+	cb := &CloudbrainDurationStatistic{DayTime: date, HourTime: hour, AiCenterCode: aiCenterCode, AccCardType: accCardType}
+	return getDurationStatistic(cb)
+}
+func getDurationStatistic(cb *CloudbrainDurationStatistic) (*CloudbrainDurationStatistic, error) {
+	has, err := x.Get(cb)
+	if err != nil {
+		return nil, err
+	} else if !has {
+		return nil, ErrJobNotExist{}
+	}
+	return cb, nil
+}
+
 func DeleteCloudbrainDurationStatisticHour(date string, hour int, aiCenterCode string, accCardType string) error {
 	sess := xStatistic.NewSession()
 	defer sess.Close()

routers/repo/cloudbrain_statistic.go

@@ -107,10 +107,13 @@ func summaryDurationStat(statisticTime time.Time) int64 {
 		for cardType, cardDuration := range CardTypes {
 			cloudbrainTable := cloudbrainMap[centerCode+"/"+cardType]
 			if cloudbrainTable != nil {
-				if err := models.DeleteCloudbrainDurationStatisticHour(dayTime, hourTime, centerCode, cardType); err != nil {
-					log.Error("DeleteCloudbrainDurationStatisticHour failed: %v", err.Error())
-					return 0
+				if _, err := models.GetDurationStatisticByDate(dayTime, hourTime, centerCode, cardType); err == nil {
+					if err := models.DeleteCloudbrainDurationStatisticHour(dayTime, hourTime, centerCode, cardType); err != nil {
+						log.Error("DeleteCloudbrainDurationStatisticHour failed: %v", err.Error())
+						return 0
+					}
 				}
+
 				if _, ok := cardsTotalDurationMap[cloudbrainTable.Cluster+"/"+centerCode+"/"+cardType]; !ok {
 					cardsTotalDurationMap[cloudbrainTable.Cluster+"/"+centerCode+"/"+cardType] = 0
 				}
@@ -136,9 +139,11 @@ func summaryDurationStat(statisticTime time.Time) int64 {
 	}
 
 	for key, cardsTotalDuration := range cardsTotalDurationMap {
-		if err := models.DeleteCloudbrainDurationStatisticHour(dayTime, hourTime, strings.Split(key, "/")[1], strings.Split(key, "/")[2]); err != nil {
-			log.Error("DeleteCloudbrainDurationStatisticHour failed: %v", err.Error())
-			return 0
+		if _, err := models.GetDurationStatisticByDate(dayTime, hourTime, strings.Split(key, "/")[1], strings.Split(key, "/")[2]); err == nil {
+			if err := models.DeleteCloudbrainDurationStatisticHour(dayTime, hourTime, strings.Split(key, "/")[1], strings.Split(key, "/")[2]); err != nil {
+				log.Error("DeleteCloudbrainDurationStatisticHour failed: %v", err.Error())
+				return 0
+			}
 		}
 		cloudbrainDurationStat := models.CloudbrainDurationStatistic{
 			DateTime:           dateTime,