新增wind wsd数据刷新

controllers/data_manage/supply_analysis/variety.go

@@ -584,7 +584,7 @@ func (this *VarietyController) Analysis() {
 						continue
 					}
 					// 刷新指标数据
-					go data.RefreshEdbData(edbInfo.EdbInfoId, edbInfo.Source, edbInfo.EdbCode, edbInfo.StartDate)
+					go data.RefreshEdbData(edbInfo.EdbInfoId, edbInfo.Source, edbInfo.SubSource, edbInfo.EdbCode, edbInfo.StartDate)
 				}
 			}
 		}

controllers/data_manage/supply_analysis/variety_edb.go

@@ -259,7 +259,7 @@ func (this *VarietyController) AddToEdb() {
 
 	// 更新ETA指标库信息
 	{
-		data.RefreshEdbData(edbInfo.EdbInfoId, edbInfo.Source, edbInfo.EdbCode, edbInfo.StartDate)
+		data.RefreshEdbData(edbInfo.EdbInfoId, edbInfo.Source, edbInfo.SubSource, edbInfo.EdbCode, edbInfo.StartDate)
 	}
 
 	//新增操作日志

models/data_manage/edb_info.go

@@ -1323,6 +1323,10 @@ type EdbInfoView struct {
 	LatestDate       string  `description:"数据最新日期（实际日期）"`
 	LatestValue      float64 `description:"数据最新值（实际值）"`
 	EndValue         float64 `description:"数据的最新值（预测日期的最新值）"`
+	SubSource        int     `description:"子数据来源:0:经济数据库,1:日期序列"`
+	SubSourceName    string  `description:"子数据来源名称"`
+	IndicatorCode    string  `description:"指标代码"`
+	StockCode        string  `description:"证券代码"`
 }
 
 // 获取指标的所有计算指标，以及计算指标所依赖计算指标

services/data/base_edb_lib.go

@@ -140,7 +140,7 @@ func BatchSavePredictEdbData(edbInfoCalculateBatchSaveReqStr string) (resp *AddP
 }
 
 // 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
@@ -151,7 +151,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/chart_info.go

@@ -189,7 +189,7 @@ func refreshBaseEdbInfo(bv *data_manage.EdbInfo) (err error, errMsg string) {
 	startDate = sTime.AddDate(0, 0, -limitDay).Format(utils.FormatDate)
 
 	fmt.Println("source:", source)
-	respItem, err := RefreshEdbData(edbInfoId, source, edbCode, startDate)
+	respItem, err := RefreshEdbData(edbInfoId, source, subSource, edbCode, startDate)
 	if err != nil {
 		errMsg = errors.New("RefreshEdbData Err:" + err.Error()).Error()
 		return

services/data/edb_info.go

@@ -283,7 +283,7 @@ func edbInfoRefreshAll(refreshAll bool, newBaseEdbInfoArr, newBasePredictEdbInfo
 			}
 			startDate = sTime.AddDate(0, 0, -limitDay).Format(utils.FormatDate)
 		}
-		result, err := RefreshEdbData(bv.EdbInfoId, bv.Source, bv.EdbCode, startDate)
+		result, err := RefreshEdbData(bv.EdbInfoId, bv.Source, bv.SubSource, bv.EdbCode, startDate)
 		if err != nil {
 			fmt.Println(bv.EdbInfoId, "RefreshBaseEdbData err", time.Now())
 			errmsg = "RefreshBaseEdbData Err:" + err.Error()
@@ -432,7 +432,7 @@ func edbInfoRefreshAll(refreshAll bool, newBaseEdbInfoArr, newBasePredictEdbInfo
 			return fmt.Errorf("刷新失败, err:", errmsg)
 		}
 		for _, bv := range predictEdbConfCalculateMappingDetailList {
-			result, err := RefreshEdbData(bv.EdbInfoId, utils.DATA_SOURCE_PREDICT, bv.EdbCode, "")
+			result, err := RefreshEdbData(bv.EdbInfoId, utils.DATA_SOURCE_PREDICT, utils.DATA_SUB_SOURCE_EDB, bv.EdbCode, "")
 			if err != nil {
 				fmt.Println(bv.EdbInfoId, "RefreshBasePredictEdbData err", time.Now())
 				errmsg = "RefreshBasePredictEdbData Err:" + err.Error()
@@ -553,7 +553,7 @@ func EdbInfoRefresh(edbInfo *data_manage.EdbInfoView, refreshAll bool) (err erro
 				}
 				startDate = sTime.AddDate(0, 0, -limitDay).Format(utils.FormatDate)
 			}
-			result, err := RefreshEdbData(edbInfo.EdbInfoId, edbInfo.Source, edbInfo.EdbCode, startDate)
+			result, err := RefreshEdbData(edbInfo.EdbInfoId, edbInfo.Source, edbInfo.SubSource, edbInfo.EdbCode, startDate)
 			if err != nil {
 				fmt.Println(edbInfo.EdbInfoId, "RefreshBaseEdbData err", time.Now())
 				errmsg = "RefreshBaseEdbData Err:" + err.Error()
@@ -655,7 +655,7 @@ func EdbInfoRefresh(edbInfo *data_manage.EdbInfoView, refreshAll bool) (err erro
 					return fmt.Errorf("刷新失败, err:", errmsg)
 				}
 				for _, bv := range predictEdbConfCalculateMappingDetailList {
-					result, err := RefreshEdbData(bv.EdbInfoId, utils.DATA_SOURCE_PREDICT, bv.EdbCode, "")
+					result, err := RefreshEdbData(bv.EdbInfoId, utils.DATA_SOURCE_PREDICT, utils.DATA_SUB_SOURCE_EDB, bv.EdbCode, "")
 					if err != nil {
 						fmt.Println(bv.EdbInfoId, "RefreshBasePredictEdbData err", time.Now())
 						errmsg = "RefreshBasePredictEdbData Err:" + err.Error()