fix: wind、同花顺日期序列代码

controllers/edb.go

@@ -231,7 +231,7 @@ func (this *EdbController) EdbData() {
 
 	// 获取指标数据
 	dataOb := new(data_manage.EdbData)
-	dataList, e := dataOb.GetItemsBySourceAndCode(edb.Source, edb.EdbCode, []string{}, "")
+	dataList, e := dataOb.GetItemsBySourceAndCode(edb.Source, edb.SubSource, edb.EdbCode, []string{}, "")
 	if e != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "EdbData GetItemsBySourceAndCode err: " + e.Error()
@@ -276,4 +276,4 @@ func (this *EdbInfoController) TraceEdbInfo() {
 	br.Ret = 200
 	br.Data = resp
 	br.Msg = "刷新成功"
-}
+}

models/data_manage/edb_data.go

@@ -9,12 +9,20 @@ import (
 )
 
 // GetEdbDataTableName 指标数据->存储表
-func GetEdbDataTableName(source int) (tableName string) {
+func GetEdbDataTableName(source, subSource int) (tableName string) {
 	switch source {
 	case utils.DATA_SOURCE_THS:
-		tableName = "edb_data_ths"
+		if subSource == utils.DATA_SUB_SOURCE_DATE {
+			tableName = "edb_data_ths_ds"
+		} else {
+			tableName = "edb_data_ths"
+		}
 	case utils.DATA_SOURCE_WIND:
-		tableName = "edb_data_wind"
+		if subSource == utils.DATA_SUB_SOURCE_DATE {
+			tableName = "edb_data_wind_wsd"
+		} else {
+			tableName = "edb_data_wind"
+		}
 	case utils.DATA_SOURCE_PB, utils.DATA_SOURCE_PB_FINANCE: //彭博经济数据、彭博财务数据
 		tableName = "edb_data_pb"
 	case utils.DATA_SOURCE_CALCULATE:
@@ -184,8 +192,8 @@ type EdbDataItem struct {
 	UpdateTime string  `description:"更新时间"`
 }
 
-func (m *EdbData) GetItemsBySourceAndCode(source int, edbCode string, fieldArr []string, orderRule string) (items []*EdbData, err error) {
-	tableName := GetEdbDataTableName(source)
+func (m *EdbData) GetItemsBySourceAndCode(source, subSource int, edbCode string, fieldArr []string, orderRule string) (items []*EdbData, err error) {
+	tableName := GetEdbDataTableName(source, subSource)
 	if tableName == "" {
 		err = fmt.Errorf("table name empty")
 		return

models/data_manage/edb_info.go

@@ -43,6 +43,15 @@ type EdbInfo struct {
 	Calendar         string    `description:"公历/农历" orm:"default(公历);"`
 	DataDateType     string    `orm:"column(data_date_type);size(255);null;default(交易日)"`
 	ManualSave       int       `description:"是否有手动保存过上下限: 0-否; 1-是"`
+	TerminalCode     string    `description:"终端编码，用于配置在机器上"`
+	DataUpdateTime   string    `description:"最近一次数据发生变化的时间"`
+	ErDataUpdateDate string    `description:"本次更新，数据发生变化的最早日期"`
+	SourceIndexName  string    `description:"数据源中的指标名称"`
+	SubSource        int       `description:"子数据来源:0:经济数据库,1:日期序列"`
+	SubSourceName    string    `description:"子数据来源名称"`
+	IndicatorCode    string    `description:"指标代码"`
+	StockCode        string    `description:"证券代码"`
+	Extra            string    `description:"指标的额外配置"`
 }
 
 func (m *EdbInfo) GetItemsByCondition(cond string, pars []interface{}, fieldArr []string, orderRule string) (items []*EdbInfo, err error) {
@@ -76,31 +85,31 @@ func (m *EdbInfo) GetItemByEdbCode(code string) (item *EdbInfo, err error) {
 
 // EdbInfoItem 指标信息
 type EdbInfoItem struct {
-	EdbInfoId    int     `description:"指标信息ID"`
-	UniqueCode   string  `description:"指标唯一编码"`
-	EdbCode      string  `description:"指标编码"`
-	EdbInfoType  int     `description:"指标类型: 0-普通指标; 1-预测指标"`
-	EdbType      int     `description:"指标类型: 1-基础指标; 2-计算指标"`
-	EdbName      string  `description:"指标名称"`
-	ClassifyId   int     `description:"分类ID"`
-	Source       int     `description:"来源ID"`
-	SourceName   string  `description:"来源名称"`
-	Frequency    string  `description:"频率"`
-	Unit         string  `description:"单位"`
-	StartDate    string  `description:"起始日期"`
-	EndDate      string  `description:"终止日期"`
-	MinValue     float64 `description:"指标最小值"`
-	MaxValue     float64 `description:"指标最大值"`
-	LatestDate   string  `description:"数据最新日期"`
-	LatestValue  float64 `description:"数据最新值"`
-	ChartImage   string  `description:"图表图片"`
-	Calendar     string  `description:"公历/农历"`
-	DataDateType string  `description:"数据日期类型: 交易日/自然日"`
-	Sort         int     `description:"排序"`
-	NoUpdate     int     `description:"是否停更: 0-继续更新; 1-停止更新"`
-	CreateTime   string  `description:"创建时间"`
-	ModifyTime   string  `description:"更新时间"`
-	SysUserRealName  string    `description:"创建人姓名"`
+	EdbInfoId       int     `description:"指标信息ID"`
+	UniqueCode      string  `description:"指标唯一编码"`
+	EdbCode         string  `description:"指标编码"`
+	EdbInfoType     int     `description:"指标类型: 0-普通指标; 1-预测指标"`
+	EdbType         int     `description:"指标类型: 1-基础指标; 2-计算指标"`
+	EdbName         string  `description:"指标名称"`
+	ClassifyId      int     `description:"分类ID"`
+	Source          int     `description:"来源ID"`
+	SourceName      string  `description:"来源名称"`
+	Frequency       string  `description:"频率"`
+	Unit            string  `description:"单位"`
+	StartDate       string  `description:"起始日期"`
+	EndDate         string  `description:"终止日期"`
+	MinValue        float64 `description:"指标最小值"`
+	MaxValue        float64 `description:"指标最大值"`
+	LatestDate      string  `description:"数据最新日期"`
+	LatestValue     float64 `description:"数据最新值"`
+	ChartImage      string  `description:"图表图片"`
+	Calendar        string  `description:"公历/农历"`
+	DataDateType    string  `description:"数据日期类型: 交易日/自然日"`
+	Sort            int     `description:"排序"`
+	NoUpdate        int     `description:"是否停更: 0-继续更新; 1-停止更新"`
+	CreateTime      string  `description:"创建时间"`
+	ModifyTime      string  `description:"更新时间"`
+	SysUserRealName string  `description:"创建人姓名"`
 	//EdbData      []*EdbDataItem `description:"指标数据"`
 }
 

utils/constants.go

@@ -155,5 +155,11 @@ const (
 )
 
 const (
-	DesKeySalt    = "JMCqSoUrTAmyNNIRb0TtlrPk" // DesKey盐值
-)
+	DesKeySalt = "JMCqSoUrTAmyNNIRb0TtlrPk" // DesKey盐值
+)
+
+// 子数据来源渠道
+const (
+	DATA_SUB_SOURCE_EDB  = iota //经济数据库
+	DATA_SUB_SOURCE_DATE        //日期序列
+)