fix：新增wind日期序列刷新逻辑

models/data_manage/edb_info.go

@@ -35,6 +35,8 @@ type EdbInfoList struct {
 	EdbInfoId        int       `orm:"column(edb_info_id);pk"`
 	SourceName       string    `description:"来源名称"`
 	Source           int       `description:"来源id"`
+	SubSource        int       `description:"子数据来源:0:经济数据库,1:日期序列"`
+	SubSourceName    string    `description:"子数据来源名称"`
 	EdbCode          string    `description:"指标编码"`
 	EdbName          string    `description:"指标名称"`
 	Frequency        string    `description:"频率"`

services/data/base_edb_lib.go

@@ -12,7 +12,7 @@ import (
 )
 
 // 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["EdbInfoId"] = edbInfoId
@@ -23,7 +23,11 @@ func RefreshEdbData(edbInfoId, source int, edbCode, startDate string) (resp *mod
 	case utils.DATA_SOURCE_THS:
 		urlStr = "ths/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:

services/data/edb_info.go

@@ -47,7 +47,7 @@ func RefreshDataFromThs(wg *sync.WaitGroup) (err error) {
 		} else {
 			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
 		}
-		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.EdbCode, startDate)
+		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
 		if err != nil {
 			return errors.New("RefreshEdbData Err:" + err.Error())
 		}
@@ -97,7 +97,7 @@ func RefreshDataFromWind(wg *sync.WaitGroup) (err error) {
 		} else {
 			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
 		}
-		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.EdbCode, startDate)
+		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
 		if err != nil {
 			errMsgList = append(errMsgList, v.EdbCode+"RefreshEdbData Err:"+err.Error())
 			continue
@@ -145,7 +145,7 @@ func RefreshDataFromPb(wg *sync.WaitGroup) (err error) {
 		} else {
 			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
 		}
-		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.EdbCode, startDate)
+		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
 		if err != nil {
 			return errors.New("RefreshEdbData Err:" + err.Error())
 		}
@@ -192,7 +192,7 @@ func RefreshDataFromPbFinance(wg *sync.WaitGroup) (err error) {
 			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
 		}
 
-		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.EdbCode, startDate)
+		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
 		if err != nil {
 			return errors.New("RefreshEdbData Err:" + err.Error())
 		}
@@ -312,7 +312,7 @@ func RefreshDataFromManual(wg *sync.WaitGroup) (err error) {
 
 	for _, v := range items {
 		startDate := v.StartDate.Format(utils.FormatDate)
-		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.EdbCode, startDate)
+		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
 		if err != nil {
 			return errors.New("RefreshEdbData Err:" + err.Error())
 		}
@@ -362,7 +362,7 @@ func RefreshDataFromGoogleTravel(wg *sync.WaitGroup) (err error) {
 			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
 		}
 
-		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.EdbCode, startDate)
+		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
 		if err != nil {
 			return errors.New("RefreshEdbData Err:" + err.Error())
 		}
@@ -408,7 +408,7 @@ func RefreshDataFromEiaSteo(wg *sync.WaitGroup) (err error) {
 			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
 		}
 
-		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.EdbCode, startDate)
+		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
 		if err != nil {
 			return errors.New("RefreshDataFromEiaSteoData Err:" + err.Error())
 		}
@@ -452,7 +452,7 @@ func RefreshDataFromZz(wg *sync.WaitGroup) (err error) {
 		} else {
 			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
 		}
-		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.EdbCode, startDate)
+		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
 		if err != nil {
 			return errors.New("RefreshEdbData Err:" + err.Error())
 		}
@@ -495,7 +495,7 @@ func RefreshDataFromSh(wg *sync.WaitGroup) (err error) {
 		} else {
 			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
 		}
-		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.EdbCode, startDate)
+		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
 		if err != nil {
 			return errors.New("RefreshEdbData Err:" + err.Error())
 		}
@@ -539,7 +539,7 @@ func RefreshDataFromShfe(wg *sync.WaitGroup) (err error) {
 		} else {
 			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
 		}
-		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.EdbCode, startDate)
+		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
 		if err != nil {
 			return errors.New("RefreshEdbData Err:" + err.Error())
 		}
@@ -583,7 +583,7 @@ func RefreshDataFromCffex(wg *sync.WaitGroup) (err error) {
 		} else {
 			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
 		}
-		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.EdbCode, startDate)
+		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
 		if err != nil {
 			return errors.New("RefreshEdbData Err:" + err.Error())
 		}
@@ -627,7 +627,7 @@ func RefreshDataFromDl(wg *sync.WaitGroup) (err error) {
 		} else {
 			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
 		}
-		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.EdbCode, startDate)
+		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
 		if err != nil {
 			return errors.New("RefreshEdbData Err:" + err.Error())
 		}
@@ -672,7 +672,7 @@ func RefreshDataFromYs(wg *sync.WaitGroup) (err error) {
 		} else {
 			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
 		}
-		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.EdbCode, startDate)
+		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
 		if err != nil {
 			return errors.New("RefreshEdbData Err:" + err.Error())
 		}
@@ -716,7 +716,7 @@ func RefreshDataFromGl(wg *sync.WaitGroup) (err error) {
 		} else {
 			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
 		}
-		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.EdbCode, startDate)
+		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
 		if err != nil {
 			return errors.New("RefreshEdbData Err:" + err.Error())
 		}
@@ -750,7 +750,7 @@ func RefreshDataFromLt(wg *sync.WaitGroup) (err error) {
 	for _, v := range items {
 		fmt.Println(v.EdbCode, v.Frequency, v.EndDate)
 		startDate := v.StartDate.Format(utils.FormatDate)
-		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.EdbCode, startDate)
+		resp, err := RefreshEdbData(v.EdbInfoId, v.SubSource, v.Source, v.EdbCode, startDate)
 		if err != nil {
 			errMsgList = append(errMsgList, "RefreshEdbData Err:"+err.Error())
 			continue
@@ -796,7 +796,7 @@ func RefreshDataFromCoal(wg *sync.WaitGroup) (err error) {
 		} else {
 			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
 		}
-		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.EdbCode, startDate)
+		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
 		if err != nil {
 			return errors.New("RefreshEdbData Err:" + err.Error())
 		}
@@ -840,7 +840,7 @@ func RefreshDataFromMysteelChemical(wg *sync.WaitGroup) (err error) {
 		} else {
 			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
 		}
-		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.EdbCode, startDate)
+		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
 		if err != nil {
 			return errors.New("RefreshEdbData Err:" + err.Error())
 		}
@@ -885,7 +885,7 @@ func RefreshDataFromComTrade(wg *sync.WaitGroup) (err error) {
 			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
 		}
 
-		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.EdbCode, startDate)
+		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
 		if err != nil {
 			return errors.New("RefreshDataFromComTrade Err:" + err.Error())
 		}
@@ -930,7 +930,7 @@ func RefreshDataFromSci(wg *sync.WaitGroup) (err error) {
 			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
 		}
 
-		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.EdbCode, startDate)
+		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
 		if err != nil {
 			return errors.New("RefreshDataFromSci Err:" + err.Error())
 		}
@@ -975,7 +975,7 @@ func RefreshDataFromNationalStatistics(wg *sync.WaitGroup) (err error) {
 			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
 		}
 
-		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.EdbCode, startDate)
+		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
 		if err != nil {
 			return errors.New("RefreshDataFromNationalStatistics Err:" + err.Error())
 		}
@@ -1019,7 +1019,7 @@ func RefreshDataFromEic(wg *sync.WaitGroup) (err error) {
 		} else {
 			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
 		}
-		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.EdbCode, startDate)
+		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
 		if err != nil {
 			return errors.New("RefreshEdbData Err:" + err.Error())
 		}
@@ -1085,7 +1085,7 @@ func RefreshDataFromBridge(wg *sync.WaitGroup) (err error) {
 		} else {
 			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
 		}
-		resp, e := RefreshEdbData(v.EdbInfoId, v.Source, v.EdbCode, startDate)
+		resp, e := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
 		if e != nil {
 			err = fmt.Errorf("RefreshEdbData err: %s", e.Error())
 			return

services/data/edb_info_sync.go

@@ -75,7 +75,7 @@ func SyncManualDataBase() {
 	}
 	for _, v := range items {
 		startDate := v.StartDate.Format(utils.FormatDate)
-		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.EdbCode, startDate)
+		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
 		if err != nil {
 			//return errors.New("RefreshEdbData Err:" + err.Error())
 			errMsgList = append(errMsgList, "RefreshEdbData Err:"+err.Error())