Merge branch 'aj_wind_wsd'

models/chart.go

@@ -93,12 +93,16 @@ type ChartEdbInfoMapping struct {
 	MaxValue            float64 `json:"-" description:"最大值"`
 	IsNullData          bool    `json:"-" description:"是否空数据"`
 	MappingSource       int     `description:"1：ETA图库；2：商品价格曲线"`
+	SubSource           int     `description:"子数据来源:0:经济数据库,1:日期序列"`
+	SubSourceName       string  `description:"子数据来源名称"`
+	IndicatorCode       string  `description:"指标代码"`
+	StockCode           string  `description:"证券代码"`
 }
 
 func GetChartEdbMappingList(chartInfoId int) (list []*ChartEdbInfoMapping, err error) {
 	o := orm.NewOrmUsingDB("data")
 	aField := `a.chart_edb_mapping_id,a.chart_info_id,a.edb_info_id,a.create_time,a.modify_time,a.unique_code,a.max_data,a.min_data,a.is_order,a.is_axis,a.edb_info_type,a.lead_value,a.lead_unit,a.chart_style,a.chart_color,a.predict_chart_color,a.chart_width,a.source as mapping_source`
-	sql := ` SELECT ` + aField + `,b.source_name,b.source,b.edb_code,b.edb_name,b.edb_name_en,b.frequency,b.unit,b.unit_en,b.start_date,b.end_date,b.modify_time,b.edb_type,b.latest_date,b.latest_value,b.unique_code,b.edb_info_type AS edb_info_category_type
+	sql := ` SELECT ` + aField + `,b.source_name,b.source,b.edb_code,b.edb_name,b.edb_name_en,b.frequency,b.unit,b.unit_en,b.start_date,b.end_date,b.modify_time,b.edb_type,b.latest_date,b.latest_value,b.unique_code,b.edb_info_type AS edb_info_category_type,b.sub_source
              FROM chart_edb_mapping AS a
 			 INNER JOIN edb_info AS b ON a.edb_info_id=b.edb_info_id
 			 WHERE chart_info_id=? 
@@ -116,8 +120,8 @@ type EdbDataList struct {
 }
 
 // GetEdbDataList 获取指标的数据（日期正序返回）
-func GetEdbDataList(source, endInfoId int, startDate, endDate string) (list []*EdbDataList, err error) {
-	tableName := GetEdbDataTableName(source)
+func GetEdbDataList(source, subSource, endInfoId int, startDate, endDate string) (list []*EdbDataList, err error) {
+	tableName := GetEdbDataTableName(source, subSource)
 	if tableName == "" {
 		err = errors.New("无效的渠道：" + strconv.Itoa(source))
 		list = make([]*EdbDataList, 0)

models/data_manage/edb_data_base.go

@@ -1,163 +0,0 @@
-package data_manage
-
-import (
-	"eta/eta_chart_lib/utils"
-)
-
-// GetEdbDataTableName 指标数据->存储表
-func GetEdbDataTableName(source int) (tableName string) {
-	switch source {
-	case utils.DATA_SOURCE_THS:
-		tableName = "edb_data_ths"
-	case utils.DATA_SOURCE_WIND:
-		tableName = "edb_data_wind"
-	case utils.DATA_SOURCE_PB, utils.DATA_SOURCE_PB_FINANCE: //彭博经济数据、彭博财务数据
-		tableName = "edb_data_pb"
-	case utils.DATA_SOURCE_CALCULATE:
-		tableName = "edb_data_calculate"
-	case utils.DATA_SOURCE_CALCULATE_LJZZY:
-		tableName = "edb_data_calculate_ljzzy"
-	case utils.DATA_SOURCE_CALCULATE_TBZ:
-		tableName = "edb_data_calculate_tbz"
-	case utils.DATA_SOURCE_CALCULATE_TCZ:
-		tableName = "edb_data_calculate_tcz"
-	case utils.DATA_SOURCE_CALCULATE_NSZYDPJJS:
-		tableName = "edb_data_calculate_nszydpjjs"
-	case utils.DATA_SOURCE_MANUAL:
-		tableName = "edb_data_manual"
-	case utils.DATA_SOURCE_LZ:
-		tableName = "edb_data_lz"
-	case utils.DATA_SOURCE_YS:
-		tableName = "edb_data_ys"
-	case utils.DATA_SOURCE_CALCULATE_HBZ:
-		tableName = "edb_data_calculate_hbz"
-	case utils.DATA_SOURCE_CALCULATE_HCZ:
-		tableName = "edb_data_calculate_hcz"
-	case utils.DATA_SOURCE_CALCULATE_BP:
-		tableName = "edb_data_calculate_bp"
-	case utils.DATA_SOURCE_GL:
-		tableName = "edb_data_gl"
-	case utils.DATA_SOURCE_ZZ:
-		tableName = "edb_data_zz"
-	case utils.DATA_SOURCE_DL:
-		tableName = "edb_data_dl"
-	case utils.DATA_SOURCE_SH:
-		tableName = "edb_data_sh"
-	case utils.DATA_SOURCE_CFFEX:
-		tableName = "edb_data_cffex"
-	case utils.DATA_SOURCE_SHFE:
-		tableName = "edb_data_ine"
-	case utils.DATA_SOURCE_GIE:
-		tableName = "edb_data_gie"
-	case utils.DATA_SOURCE_CALCULATE_ZJPJ:
-		tableName = "edb_data_calculate_zjpj"
-	case utils.DATA_SOURCE_CALCULATE_TIME_SHIFT:
-		tableName = "edb_data_calculate_time_shift"
-	case utils.DATA_SOURCE_CALCULATE_LJZTBPJ:
-		tableName = "edb_data_calculate_ljztbpj"
-	case utils.DATA_SOURCE_LT:
-		tableName = "edb_data_lt"
-	case utils.DATA_SOURCE_COAL:
-		tableName = "edb_data_coal"
-	case utils.DATA_SOURCE_PYTHON:
-		tableName = "edb_data_python"
-	case utils.DATA_SOURCE_GOOGLE_TRAVEL:
-		tableName = "edb_data_google_travel"
-	case utils.DATA_SOURCE_PREDICT_CALCULATE:
-		tableName = "edb_data_predict_calculate"
-	case utils.DATA_SOURCE_PREDICT_CALCULATE_TBZ:
-		tableName = "edb_data_predict_calculate_tbz"
-	case utils.DATA_SOURCE_PREDICT_CALCULATE_TCZ:
-		tableName = "edb_data_predict_calculate_tcz"
-	case utils.DATA_SOURCE_MYSTEEL_CHEMICAL:
-		tableName = "edb_data_mysteel_chemical"
-	case utils.DATA_SOURCE_CALCULATE_CJJX:
-		tableName = "edb_data_calculate_cjjx"
-	case utils.DATA_SOURCE_EIA_STEO:
-		tableName = "edb_data_eia_steo"
-	case utils.DATA_SOURCE_CALCULATE_NHCC:
-		tableName = "edb_data_calculate_nhcc"
-	case utils.DATA_SOURCE_COM_TRADE:
-		tableName = "edb_data_com_trade"
-	case utils.DATA_SOURCE_PREDICT_CALCULATE_NSZYDPJJS:
-		tableName = "edb_data_predict_calculate_nszydpjjs"
-	case utils.DATA_SOURCE_CALCULATE_ADJUST:
-		tableName = "edb_data_calculate_adjust"
-	case utils.DATA_SOURCE_SCI:
-		tableName = "edb_data_sci"
-	case utils.DATA_SOURCE_PREDICT_CALCULATE_LJZZY:
-		tableName = "edb_data_predict_calculate_ljzzy"
-	case utils.DATA_SOURCE_PREDICT_CALCULATE_TIME_SHIFT:
-		tableName = "edb_data_predict_calculate_time_shift"
-	case utils.DATA_SOURCE_PREDICT_CALCULATE_ZJPJ:
-		tableName = "edb_data_predict_calculate_zjpj"
-	case utils.DATA_SOURCE_PREDICT_CALCULATE_LJZTBPJ:
-		tableName = "edb_data_predict_calculate_ljztbpj"
-	case utils.DATA_SOURCE_PREDICT_CALCULATE_NHCC:
-		tableName = "edb_data_predict_calculate_nhcc"
-	case utils.DATA_SOURCE_PREDICT_CALCULATE_CJJX:
-		tableName = "edb_data_predict_calculate_cjjx"
-	case utils.DATA_SOURCE_PREDICT_CALCULATE_HBZ:
-		tableName = "edb_data_predict_calculate_hbz"
-	case utils.DATA_SOURCE_PREDICT_CALCULATE_HCZ:
-		tableName = "edb_data_predict_calculate_hcz"
-	case utils.DATA_SOURCE_PREDICT_CALCULATE_BP:
-		tableName = "edb_data_predict_calculate_bp"
-	case utils.DATA_SOURCE_CALCULATE_JP:
-		tableName = "edb_data_calculate_jp"
-	case utils.DATA_SOURCE_CALCULATE_NH:
-		tableName = "edb_data_calculate_nh"
-	case utils.DATA_SOURCE_CALCULATE_KSZS:
-		tableName = "edb_data_calculate_kszs"
-	case utils.DATA_SOURCE_PREDICT_CALCULATE_JP:
-		tableName = "edb_data_predict_calculate_jp"
-	case utils.DATA_SOURCE_PREDICT_CALCULATE_NH:
-		tableName = "edb_data_predict_calculate_nh"
-	case utils.DATA_SOURCE_PREDICT_CALCULATE_KSZS:
-		tableName = "edb_data_predict_calculate_kszs"
-	case utils.DATA_SOURCE_BAIINFO:
-		tableName = "edb_data_baiinfo"
-	case utils.DATA_SOURCE_STOCK_PLANT:
-		tableName = "edb_data_stock_plant"
-	case utils.DATA_SOURCE_CALCULATE_CORRELATION:
-		tableName = "edb_data_calculate_correlation"
-	case utils.DATA_SOURCE_NATIONAL_STATISTICS:
-		tableName = "edb_data_national_statistics"
-	case utils.DATA_SOURCE_CALCULATE_LJZZJ: //累计值转季 -> 61
-		tableName = "edb_data_calculate_ljzzj"
-	case utils.DATA_SOURCE_CALCULATE_LJZ: //累计值 -> 62
-		tableName = "edb_data_calculate_ljz"
-	case utils.DATA_SOURCE_CALCULATE_LJZNCZJ: //累计值(年初至今） -> 63
-		tableName = "edb_data_calculate_ljznczj"
-	case utils.DATA_SOURCE_PREDICT_CALCULATE_LJZZJ: // 预测指标 - 累计值 -> 65
-		tableName = "edb_data_predict_calculate_ljzzj"
-	case utils.DATA_SOURCE_PREDICT_CALCULATE_LJZ: //预测指标 - 累计值转季->64
-		tableName = "edb_data_predict_calculate_ljz"
-	case utils.DATA_SOURCE_PREDICT_CALCULATE_LJZNCZJ: //预测指标 - 累计值(年初至今） -> 66
-		tableName = "edb_data_predict_calculate_ljznczj"
-	case utils.DATA_SOURCE_CALCULATE_STANDARD_DEVIATION: //标准差->67
-		tableName = "edb_data_calculate_standard_deviation"
-	case utils.DATA_SOURCE_CALCULATE_PERCENTILE: //百分位->68
-		tableName = "edb_data_calculate_percentile"
-	case utils.DATA_SOURCE_PREDICT_CALCULATE_STANDARD_DEVIATION: //预测标准差->69
-		tableName = "edb_data_predict_ccalculate_standard_deviation"
-	case utils.DATA_SOURCE_PREDICT_CALCULATE_PERCENTILE: //预测百分位->70
-		tableName = "edb_data_predict_ccalculate_percentile"
-	case utils.DATA_SOURCE_FUBAO: //富宝 -> 71
-		tableName = "edb_data_fubao"
-	case utils.DATA_SOURCE_CALCULATE_ZSXY:
-		tableName = "edb_data_calculate_zsxy" // 指数修匀->72
-	case utils.DATA_SOURCE_PREDICT_CALCULATE_ZSXY:
-		tableName = "edb_data_predict_calculate_zsxy" // 预测指数修匀->73
-	case utils.DATA_SOURCE_CALCULATE_ZDYFX:
-		tableName = "edb_data_calculate_zdyfx" // 自定义分析->74
-	case utils.DATA_SOURCE_CALCULATE_RJZ: //日均值->75
-		tableName = "edb_data_calculate_rjz"
-	default:
-		edbSource := EdbSourceIdMap[source]
-		if edbSource != nil {
-			tableName = edbSource.TableName
-		}
-	}
-	return
-}

models/data_manage/edb_info.go

@@ -2,7 +2,6 @@ package data_manage
 
 import (
 	"eta/eta_chart_lib/utils"
-	"fmt"
 	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
@@ -35,6 +34,10 @@ type EdbInfo struct {
 	MoveType         int     `description:"移动方式:1:领先(默认),2:滞后"`
 	MoveFrequency    string  `description:"移动频度"`
 	DataDateType     string  `orm:"column(data_date_type);size(255);null;default(交易日)"`
+	SubSource        int     `description:"子数据来源:0:经济数据库,1:日期序列"`
+	SubSourceName    string  `description:"子数据来源名称"`
+	IndicatorCode    string  `description:"指标代码"`
+	StockCode        string  `description:"证券代码"`
 }
 
 type EdbInfoMaxAndMinInfo struct {
@@ -45,29 +48,6 @@ type EdbInfoMaxAndMinInfo struct {
 	LatestValue float64 `description:"最新值"`
 }
 
-func GetEdbInfoMaxAndMinInfo(source int, edbCode string) (item *EdbInfoMaxAndMinInfo, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := ``
-	tableName := GetEdbDataTableName(source)
-	sql = ` SELECT MIN(data_time) AS min_date,MAX(data_time) AS max_date,MIN(value) AS min_value,MAX(value) AS max_value FROM %s WHERE edb_code=? `
-	sql = fmt.Sprintf(sql, tableName)
-	err = o.Raw(sql, edbCode).QueryRow(&item)
-
-	var latest_value float64
-	sql = ` SELECT value AS latest_value FROM %s WHERE edb_code=? ORDER BY data_time DESC LIMIT 1 `
-	sql = fmt.Sprintf(sql, tableName)
-	err = o.Raw(sql, edbCode).QueryRow(&latest_value)
-	item.LatestValue = latest_value
-	return
-}
-
-func ModifyEdbInfoMaxAndMinInfo(edbInfoId int, item *EdbInfoMaxAndMinInfo) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := ` UPDATE edb_info SET start_date=?,end_date=?,min_value=?,max_value=?,is_update=2,latest_date=?,latest_value=?,modify_time=NOW() WHERE edb_info_id=? `
-	_, err = o.Raw(sql, item.MinDate, item.MaxDate, item.MinValue, item.MaxValue, item.MaxDate, item.LatestValue, edbInfoId).Exec()
-	return
-}
-
 func GetEdbInfoById(edbInfoId int) (item *EdbInfo, err error) {
 	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_info WHERE edb_info_id=? `
@@ -113,31 +93,6 @@ type EdbInfoSearchData struct {
 	Value    float64 `description:"数据"`
 }
 
-// GetEdbDataListAll
-// order:1升序，其余值为降序
-func GetEdbDataListAll(condition string, pars []interface{}, source, order int) (item []*EdbInfoSearchData, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := ``
-	tableName := GetEdbDataTableName(source)
-	if tableName == "" {
-		err = fmt.Errorf("指标来源有误, source: %d", source)
-		return
-	}
-	sql = ` SELECT * FROM %s WHERE 1=1 `
-	sql = fmt.Sprintf(sql, tableName)
-
-	if condition != "" {
-		sql += condition
-	}
-	if order == 1 {
-		sql += ` ORDER BY data_time ASC `
-	} else {
-		sql += ` ORDER BY data_time DESC `
-	}
-	_, err = o.Raw(sql, pars).QueryRows(&item)
-	return
-}
-
 // TraceEdbInfoResp 指标追溯数据返回
 type TraceEdbInfoResp struct {
 	EdbInfoId   int                `description:"指标id"`

models/edb_data_base.go

@@ -5,12 +5,16 @@ import (
 	"eta/eta_chart_lib/utils"
 )
 
-func GetEdbDataTableName(source int) (tableName string) {
+func GetEdbDataTableName(source, subSource int) (tableName string) {
 	switch source {
 	case utils.DATA_SOURCE_THS:
 		tableName = "edb_data_ths"
 	case utils.DATA_SOURCE_WIND:
-		tableName = "edb_data_wind"
+		if subSource == utils.DATA_SUB_SOURCE_EDB {
+			tableName = "edb_data_wind"
+		} else {
+			tableName = "edb_data_wind_wsd"
+		}
 	case utils.DATA_SOURCE_PB, utils.DATA_SOURCE_PB_FINANCE:
 		tableName = "edb_data_pb"
 	case utils.DATA_SOURCE_CALCULATE:

services/data/chart_info.go

@@ -265,7 +265,7 @@ func getEdbDataMapList(chartInfoId, chartType int, calendar, startDate, endDate
 
 		switch v.EdbInfoCategoryType {
 		case 0:
-			dataList, err = models.GetEdbDataList(v.Source, v.EdbInfoId, startDateReal, endDate)
+			dataList, err = models.GetEdbDataList(v.Source, v.SubSource, v.EdbInfoId, startDateReal, endDate)
 		case 1:
 			_, dataList, _, _, err, _ = GetPredictDataListByPredictEdbInfoId(v.EdbInfoId, startDateReal, endDate, false)
 		default:

services/data/correlation/chart_info.go

@@ -224,7 +224,7 @@ func GetChartDataByEdbInfo(edbInfoMappingA, edbInfoMappingB *models.ChartEdbInfo
 	aDataList := make([]*models.EdbDataList, 0)
 	switch baseEdbInfo.EdbInfoCategoryType {
 	case 0:
-		aDataList, err = models.GetEdbDataList(baseEdbInfo.Source, baseEdbInfo.EdbInfoId, startDate, endDate)
+		aDataList, err = models.GetEdbDataList(baseEdbInfo.Source, baseEdbInfo.SubSource, baseEdbInfo.EdbInfoId, startDate, endDate)
 	case 1:
 		_, aDataList, _, _, err, _ = data.GetPredictDataListByPredictEdbInfoId(baseEdbInfo.EdbInfoId, startDate, endDate, false)
 	default:
@@ -236,7 +236,7 @@ func GetChartDataByEdbInfo(edbInfoMappingA, edbInfoMappingB *models.ChartEdbInfo
 	bDataList := make([]*models.EdbDataList, 0)
 	switch changeEdbInfo.EdbInfoCategoryType {
 	case 0:
-		bDataList, err = models.GetEdbDataList(changeEdbInfo.Source, changeEdbInfo.EdbInfoId, "", "")
+		bDataList, err = models.GetEdbDataList(changeEdbInfo.Source, changeEdbInfo.SubSource, changeEdbInfo.EdbInfoId, "", "")
 	case 1:
 		_, bDataList, _, _, err, _ = data.GetPredictDataListByPredictEdbInfoId(changeEdbInfo.EdbInfoId, "", "", false)
 	default:
@@ -426,7 +426,7 @@ func GetRollingCorrelationChartDataByEdbInfo(edbInfoMappingA, edbInfoMappingB *m
 	aDataList := make([]*models.EdbDataList, 0)
 	switch baseEdbInfo.EdbInfoCategoryType {
 	case 0:
-		aDataList, err = models.GetEdbDataList(baseEdbInfo.Source, baseEdbInfo.EdbInfoId, startDate, endDate)
+		aDataList, err = models.GetEdbDataList(baseEdbInfo.Source, baseEdbInfo.SubSource, baseEdbInfo.EdbInfoId, startDate, endDate)
 	case 1:
 		_, aDataList, _, _, err, _ = data.GetPredictDataListByPredictEdbInfoId(baseEdbInfo.EdbInfoId, startDate, endDate, false)
 	default:
@@ -438,7 +438,7 @@ func GetRollingCorrelationChartDataByEdbInfo(edbInfoMappingA, edbInfoMappingB *m
 	bDataList := make([]*models.EdbDataList, 0)
 	switch changeEdbInfo.EdbInfoCategoryType {
 	case 0:
-		bDataList, err = models.GetEdbDataList(changeEdbInfo.Source, changeEdbInfo.EdbInfoId, "", "")
+		bDataList, err = models.GetEdbDataList(changeEdbInfo.Source, changeEdbInfo.SubSource, changeEdbInfo.EdbInfoId, "", "")
 	case 1:
 		_, bDataList, _, _, err, _ = data.GetPredictDataListByPredictEdbInfoId(changeEdbInfo.EdbInfoId, "", "", false)
 	default:

services/data/excel_info.go

@@ -20,7 +20,7 @@ func GetFirstEdbDataList(edbInfo *data_manage.EdbInfo, num int, manualDateList [
 	var dataList []*models.EdbDataList
 	switch edbInfo.EdbInfoType {
 	case 0:
-		dataList, err = models.GetEdbDataList(edbInfo.Source, edbInfo.EdbInfoId, ``, ``)
+		dataList, err = models.GetEdbDataList(edbInfo.Source, edbInfo.SubSource, edbInfo.EdbInfoId, ``, ``)
 	case 1:
 		_, dataList, _, _, err, _ = GetPredictDataListByPredictEdbInfoId(edbInfo.EdbInfoId, ``, ``, false)
 	default:
@@ -120,7 +120,7 @@ func GetOtherEdbDataList(edbInfo *data_manage.EdbInfo, dateList []string) (resul
 	var dataList []*models.EdbDataList
 	switch edbInfo.EdbInfoType {
 	case 0:
-		dataList, err = models.GetEdbDataList(edbInfo.Source, edbInfo.EdbInfoId, ``, ``)
+		dataList, err = models.GetEdbDataList(edbInfo.Source, edbInfo.SubSource, edbInfo.EdbInfoId, ``, ``)
 	case 1:
 		_, dataList, _, _, err, _ = GetPredictDataListByPredictEdbInfoId(edbInfo.EdbInfoId, ``, ``, false)
 	default:
@@ -212,7 +212,7 @@ func GetFirstHistoryEdbDataList(edbInfo *data_manage.EdbInfo, num int, endDate s
 	var dataList []*models.EdbDataList
 	switch edbInfo.EdbInfoType {
 	case 0:
-		dataList, err = models.GetEdbDataList(edbInfo.Source, edbInfo.EdbInfoId, ``, endDate)
+		dataList, err = models.GetEdbDataList(edbInfo.Source, edbInfo.SubSource, edbInfo.EdbInfoId, ``, endDate)
 	case 1:
 		_, dataList, _, _, err, _ = GetPredictDataListByPredictEdbInfoId(edbInfo.EdbInfoId, ``, endDate, true)
 	default:
@@ -387,7 +387,7 @@ func GetTableDataConfig(reqData request.TableDataReq) (tableDataConfig TableData
 		var firstDataList []*models.EdbDataList
 		switch edbInfo.EdbInfoType {
 		case 0:
-			firstDataList, err = models.GetEdbDataList(edbInfo.Source, edbInfo.EdbInfoId, ``, ``)
+			firstDataList, err = models.GetEdbDataList(edbInfo.Source, edbInfo.SubSource, edbInfo.EdbInfoId, ``, ``)
 		case 1:
 			_, firstDataList, _, _, err, _ = GetPredictDataListByPredictEdbInfoId(edbInfo.EdbInfoId, ``, ``, false)
 		default:

services/data/future_good/chart_info.go

@@ -71,7 +71,7 @@ func GetChartEdbData(chartInfoId int, startDate, endDate string, edbInfoMapping,
 	{
 		dataList := make([]*models.EdbDataList, 0)
 
-		dataList, err = models.GetEdbDataList(edbInfoMapping.Source, edbInfoMapping.EdbInfoId, startDate, endDate)
+		dataList, err = models.GetEdbDataList(edbInfoMapping.Source, edbInfoMapping.SubSource, edbInfoMapping.EdbInfoId, startDate, endDate)
 		edbDataListMap[edbInfoMapping.EdbInfoId] = dataList
 		item.DataList = dataList
 

services/data/predict_edb_info.go

@@ -133,13 +133,13 @@ func GetPredictDataListByPredictEdbInfo(edbInfo *data_manage.EdbInfo, startDate,
 	// 所有数据
 	allDataList := make([]*models.EdbDataList, 0)
 	//获取指标数据（实际已生成）
-	dataList, err = models.GetEdbDataList(sourceEdbInfoItem.Source, sourceEdbInfoItem.EdbInfoId, startDate, endDate)
+	dataList, err = models.GetEdbDataList(sourceEdbInfoItem.Source, sourceEdbInfoItem.SubSource, sourceEdbInfoItem.EdbInfoId, startDate, endDate)
 	if err != nil {
 		return
 	}
 	// 如果选择了日期，那么需要筛选所有的数据，用于未来指标的生成
 	if startDate != `` {
-		allDataList, err = models.GetEdbDataList(sourceEdbInfoItem.Source, sourceEdbInfoItem.EdbInfoId, "", "")
+		allDataList, err = models.GetEdbDataList(sourceEdbInfoItem.Source, sourceEdbInfoItem.SubSource, sourceEdbInfoItem.EdbInfoId, "", "")
 		if err != nil {
 			return
 		}
@@ -184,7 +184,7 @@ func GetPredictDataListByPredictEdbInfo(edbInfo *data_manage.EdbInfo, startDate,
 
 // GetPredictCalculateDataListByPredictEdbInfo 根据预测运算指标信息获取预测指标的数据
 func GetPredictCalculateDataListByPredictEdbInfo(edbInfo *data_manage.EdbInfo, startDate, endDate string) (dataList []*models.EdbDataList, sourceEdbInfoItem *data_manage.EdbInfo, predictEdbConf *data_manage.PredictEdbConf, err error, errMsg string) {
-	dataList, err = models.GetEdbDataList(edbInfo.Source, edbInfo.EdbInfoId, startDate, endDate)
+	dataList, err = models.GetEdbDataList(edbInfo.Source, edbInfo.SubSource, edbInfo.EdbInfoId, startDate, endDate)
 	return
 }
 

services/data/predict_edb_info_rule.go

@@ -1333,7 +1333,7 @@ func getCalculateNhccData(secondDataList []*models.EdbDataList, ruleConf RuleLin
 		var firstDataList []*models.EdbDataList
 		switch edbInfo.EdbInfoType {
 		case 0:
-			firstDataList, err = models.GetEdbDataList(edbInfo.Source, edbInfo.EdbInfoId, ``, ``)
+			firstDataList, err = models.GetEdbDataList(edbInfo.Source, edbInfo.SubSource, edbInfo.EdbInfoId, ``, ``)
 		case 1:
 			_, firstDataList, _, _, err, _ = GetPredictDataListByPredictEdbInfoId(edbInfo.EdbInfoId, ``, ``, false)
 		default:

services/data/table/mixed_table.go

@@ -82,7 +82,7 @@ func GetMixedTableCellData(mixedTableReq request.MixedTableReq) (newMixedTableCe
 		dataList := make([]*models.EdbDataList, 0)
 		switch edbInfo.EdbInfoType {
 		case 0:
-			dataList, _ = models.GetEdbDataList(edbInfo.Source, edbInfo.EdbInfoId, ``, ``)
+			dataList, _ = models.GetEdbDataList(edbInfo.Source, edbInfo.SubSource, edbInfo.EdbInfoId, ``, ``)
 		case 1:
 			_, dataList, _, _, _, _ = data.GetPredictDataListByPredictEdbInfoId(edbInfo.EdbInfoId, ``, ``, false)
 		default:

utils/constants.go

@@ -192,3 +192,9 @@ var DataSourceEnMap = map[int]string{
 	DATA_SOURCE_MYSTEEL_CHEMICAL: "Horizon Insights",
 	DATA_SOURCE_FUBAO:            "FuBao",
 }
+
+// 子数据来源渠道
+const (
+	DATA_SUB_SOURCE_EDB  = iota //经济数据库
+	DATA_SUB_SOURCE_DATE        //日期序列
+)