Browse Source

优化EDB信息刷新逻辑

- 移除对开始日期为"0000-00-00"的检查
-引入新的基础刷新开始日期常量(BaseEdbRefreshStartDate)
- 修改刷新逻辑,非全量刷新时使用结束时间减去对应期数作为起始日期
-优化时间格式转换,处理空日期或"0000-00-00"情况
Roc 5 months ago
parent
commit
244813c40f
2 changed files with 16 additions and 23 deletions
  1. 13 23
      services/data/edb_info.go
  2. 3 0
      utils/constants.go

+ 13 - 23
services/data/edb_info.go

@@ -40,21 +40,15 @@ func EdbInfoRefreshAllFromBaseBak(edbInfoIdList []int, refreshAll bool) (err err
 		//source := bv.Source
 		//edbInfoId := bv.EdbInfoId
 		//edbCode := bv.EdbCode
-		if bv.StartDate == "0000-00-00" {
-			continue
-		}
+
 		//开始时间
-		startDate = ``
-		if refreshAll { //刷新所有数据,用开始时间作为起始日期去刷新
-			sTime, tmpErr := time.Parse(utils.FormatDate, bv.StartDate)
-			if tmpErr != nil {
-				err = tmpErr
-				errmsg = err.Error()
-				return
+		startDate = utils.BaseEdbRefreshStartDate
+		if !refreshAll { //不是刷新所有数据,用结束时间减去对应期数作为起始日期去刷新
+			sDate := bv.EndDate
+			if sDate == `` || sDate == `0000-00-00` {
+				sDate = utils.BaseEdbRefreshStartDate
 			}
-			startDate = sTime.Format(utils.FormatDate)
-		} else {
-			sTime, tmpErr := time.Parse(utils.FormatDate, bv.EndDate)
+			sTime, tmpErr := time.ParseInLocation(utils.FormatDate, sDate, time.Local)
 			if tmpErr != nil {
 				err = tmpErr
 				errmsg = err.Error()
@@ -647,17 +641,13 @@ func edbInfoRefreshAll(refreshAll bool, newBaseEdbInfoArr, newBasePredictEdbInfo
 			continue
 		}
 		//开始时间
-		startDate = ``
-		if refreshAll { //刷新所有数据,用开始时间作为起始日期去刷新
-			sTime, tmpErr := time.Parse(utils.FormatDate, bv.StartDate)
-			if tmpErr != nil {
-				err = tmpErr
-				errmsg = "时间格式转换失败1"
-				return
+		startDate = utils.BaseEdbRefreshStartDate
+		if !refreshAll { // 非刷新所有数据,用结束时间减去对应期数作为起始日期去刷新
+			sDate := bv.EndDate
+			if sDate == `` || sDate == `0000-00-00` {
+				sDate = utils.BaseEdbRefreshStartDate
 			}
-			startDate = sTime.Format(utils.FormatDate)
-		} else {
-			sTime, tmpErr := time.Parse(utils.FormatDate, bv.EndDate)
+			sTime, tmpErr := time.Parse(utils.FormatDate, sDate)
 			if tmpErr != nil {
 				err = tmpErr
 				errmsg = "时间格式转换失败2"

+ 3 - 0
utils/constants.go

@@ -229,3 +229,6 @@ const (
 )
 
 const MultiAddNum = 500
+
+// BaseEdbRefreshStartDate 指标的基础刷新开始日期
+const BaseEdbRefreshStartDate = `1899-01-01