hsun преди 7 месеца
родител
ревизия
18ceb353b4
променени са 1 файла, в които са добавени 11 реда и са изтрити 3 реда
  1. 11 3
      models/edb_ths_hf.go

+ 11 - 3
models/edb_ths_hf.go

@@ -379,7 +379,7 @@ func ThsHfConvertData2DayByRule(originData []*BaseFromThsHfData, convertRule *Th
 
 			// 前一日
 			if convertRule.ConvertFixed.FixedDay == 2 {
-				if k < 0 {
+				if k < 1 {
 					utils.FileLog.Info(fmt.Sprintf("%s前日无数据", v))
 					continue
 				}
@@ -402,6 +402,10 @@ func ThsHfConvertData2DayByRule(originData []*BaseFromThsHfData, convertRule *Th
 				}
 				dateData = dt
 			}
+			if len(dateData) == 0 {
+				utils.FileLog.Info("日期%s无数据序列", v)
+				continue
+			}
 
 			// 重新获取数据序列中, 时间在目标时间点之后的
 			newDateData := make([]*BaseFromThsHfData, 0)
@@ -416,7 +420,7 @@ func ThsHfConvertData2DayByRule(originData []*BaseFromThsHfData, convertRule *Th
 
 			// 取重组后当日数据中的第一个(有可能目标时间点无值, 那么取之后时间最近的值)
 			if len(newDateData) == 0 {
-				utils.FileLog.Info("%s当日无有效数据", v)
+				utils.FileLog.Info("日期%s无有效数据", v)
 				continue
 			}
 			timeData[todayTime] = newDateData[0].Value
@@ -433,7 +437,7 @@ func ThsHfConvertData2DayByRule(originData []*BaseFromThsHfData, convertRule *Th
 		}
 		var thisDate, preDate string
 		thisDate = v
-		if k > 0 {
+		if k > 1 {
 			preDate = sortDates[k-1]
 		}
 		var startTimeTarget, endTimeTarget time.Time
@@ -525,6 +529,10 @@ func ThsHfConvertData2DayByRule(originData []*BaseFromThsHfData, convertRule *Th
 			dateData = append(dateData, preData...)
 			dateData = append(dateData, thisData...)
 		}
+		if len(dateData) == 0 {
+			utils.FileLog.Info("日期%s无数据序列", v)
+			continue
+		}
 
 		// 重组时间区间内的数据
 		newDateData := make([]*BaseFromThsHfData, 0)