瀏覽代碼

fix refresh

zwxi 1 年之前
父節點
當前提交
e9c742645c
共有 2 個文件被更改,包括 16 次插入7 次删除
  1. 12 3
      services/data/base_edb_lib.go
  2. 4 4
      services/data/edb_info.go

+ 12 - 3
services/data/base_edb_lib.go

@@ -66,7 +66,7 @@ func AddEdbData(source int, edbCode string) (resp *models.BaseResponse, err erro
 }
 
 // RefreshEdbData 刷新指标数据
-func RefreshEdbData(edbInfoId, source int, edbCode, startDate string) (resp *models.BaseResponse, err error) {
+func RefreshEdbData(edbInfoId, source, subSource int, edbCode, startDate string) (resp *models.BaseResponse, err error) {
 	param := make(map[string]interface{})
 	param["EdbCode"] = edbCode
 	param["Source"] = source
@@ -75,9 +75,18 @@ func RefreshEdbData(edbInfoId, source int, edbCode, startDate string) (resp *mod
 	urlStr := ``
 	switch source {
 	case utils.DATA_SOURCE_THS:
-		urlStr = "/ths/refresh"
+		urlStr = "ths/refresh"
+		if subSource == 0 {
+			urlStr = "ths/refresh"
+		} else {
+			urlStr = "ths/ds/refresh"
+		}
 	case utils.DATA_SOURCE_WIND:
-		urlStr = "/wind/refresh"
+		if subSource == 0 {
+			urlStr = "wind/refresh"
+		} else {
+			urlStr = "wind/wsd/refresh"
+		}
 	case utils.DATA_SOURCE_PB:
 		urlStr = "/pb/refresh"
 	case utils.DATA_SOURCE_PB_FINANCE:

+ 4 - 4
services/data/edb_info.go

@@ -75,7 +75,7 @@ func EdbInfoRefreshAllFromBaseBak(edbInfoIdList []int, refreshAll bool) (err err
 			}
 			startDate = sTime.AddDate(0, 0, -limitDay).Format(utils.FormatDate)
 		}
-		result, tmpErr := RefreshEdbData(bv.EdbInfoId, bv.Source, bv.EdbCode, startDate)
+		result, tmpErr := RefreshEdbData(bv.EdbInfoId, bv.Source, bv.SubSource, bv.EdbCode, startDate)
 		if tmpErr != nil {
 			err = tmpErr
 			fmt.Println(bv.EdbInfoId, "RefreshBaseEdbData err", time.Now())
@@ -235,7 +235,7 @@ func EdbInfoRefreshAllFromBaseBak(edbInfoIdList []int, refreshAll bool) (err err
 			return
 		}
 		for _, bv := range predictEdbConfCalculateMappingDetailList {
-			result, tmpErr := RefreshEdbData(bv.EdbInfoId, utils.DATA_SOURCE_PREDICT, bv.EdbCode, "")
+			result, tmpErr := RefreshEdbData(bv.EdbInfoId, utils.DATA_SOURCE_PREDICT, utils.DATA_SUB_SOURCE_EDB, bv.EdbCode, "")
 			if tmpErr != nil {
 				err = tmpErr
 				fmt.Println(bv.EdbInfoId, "RefreshBasePredictEdbData err", time.Now())
@@ -678,7 +678,7 @@ func edbInfoRefreshAll(refreshAll bool, newBaseEdbInfoArr, newBasePredictEdbInfo
 			}
 			startDate = sTime.AddDate(0, 0, -limitDay).Format(utils.FormatDate)
 		}
-		result, tmpErr := RefreshEdbData(bv.EdbInfoId, bv.Source, bv.EdbCode, startDate)
+		result, tmpErr := RefreshEdbData(bv.EdbInfoId, bv.Source, bv.SubSource, bv.EdbCode, startDate)
 		if tmpErr != nil {
 			err = tmpErr
 			fmt.Println(bv.EdbInfoId, "RefreshBaseEdbData err", time.Now())
@@ -838,7 +838,7 @@ func edbInfoRefreshAll(refreshAll bool, newBaseEdbInfoArr, newBasePredictEdbInfo
 			return
 		}
 		for _, bv := range predictEdbConfCalculateMappingDetailList {
-			result, tmpErr := RefreshEdbData(bv.EdbInfoId, utils.DATA_SOURCE_PREDICT, bv.EdbCode, "")
+			result, tmpErr := RefreshEdbData(bv.EdbInfoId, utils.DATA_SOURCE_PREDICT, utils.DATA_SUB_SOURCE_EDB, bv.EdbCode, "")
 			if tmpErr != nil {
 				err = tmpErr
 				fmt.Println(bv.EdbInfoId, "RefreshBasePredictEdbData err", time.Now())