Merge remote-tracking branch 'origin/eta/2.6.4' into debug

models/data_source/data_source.go

@@ -11,21 +11,21 @@ import (
 
 // SearchDataSource 数据源ES搜索
 type SearchDataSource struct {
-	PrimaryId   int     `description:"主键ID"`
-	IndexCode   string  `description:"指标编码"`
-	IndexName   string  `description:"指标名称"`
-	ClassifyId  int     `description:"分类ID"`
-	Unit        string  `description:"单位"`
-	Frequency   string  `description:"频度"`
-	StartDate   string  `description:"开始日期"`
-	EndDate     string  `description:"结束日期"`
-	LatestValue float64 `description:"最新值"`
-	Source      int     `description:"来源"`
-	SourceName  string  `description:"数据源名称"`
-	SubSource   int     `description:"子来源"`
-	IsDeleted   int     `description:"是否已删除：0-正常；1-已删除"`
-	CreateTime  string  `description:"创建时间"`
-	ModifyTime  string  `description:"修改时间"`
+	PrimaryId   int    `description:"主键ID"`
+	IndexCode   string `description:"指标编码"`
+	IndexName   string `description:"指标名称"`
+	ClassifyId  int    `description:"分类ID"`
+	Unit        string `description:"单位"`
+	Frequency   string `description:"频度"`
+	StartDate   string `description:"开始日期"`
+	EndDate     string `description:"结束日期"`
+	LatestValue string `description:"最新值"`
+	Source      int    `description:"来源"`
+	SourceName  string `description:"数据源名称"`
+	SubSource   int    `description:"子来源"`
+	IsDeleted   int    `description:"是否已删除：0-正常；1-已删除"`
+	CreateTime  string `description:"创建时间"`
+	ModifyTime  string `description:"修改时间"`
 }
 
 // SearchDataSourceItem 数据源ES搜索
@@ -197,7 +197,7 @@ func (m *BaseFromRzdIndex) Format2SearchDataSource(origin *BaseFromRzdIndex) (it
 	item.Frequency = origin.Frequency
 	item.StartDate = utils.TimeTransferString(utils.FormatDate, origin.StartDate)
 	item.EndDate = utils.TimeTransferString(utils.FormatDate, origin.EndDate)
-	item.LatestValue = origin.LatestValue
+	item.LatestValue = fmt.Sprint(origin.LatestValue)
 	item.Source = source
 	item.SubSource = subSource
 	item.SourceName = sourceName
@@ -273,7 +273,7 @@ func (m *BaseFromHisugarIndex) Format2SearchDataSource(origin *BaseFromHisugarIn
 	item.Frequency = origin.Frequency
 	item.StartDate = utils.TimeTransferString(utils.FormatDate, origin.StartDate)
 	item.EndDate = utils.TimeTransferString(utils.FormatDate, origin.EndDate)
-	item.LatestValue = origin.LatestValue
+	item.LatestValue = fmt.Sprint(origin.LatestValue)
 	item.Source = source
 	item.SubSource = subSource
 	item.SourceName = sourceName
@@ -347,7 +347,7 @@ func (m *BaseFromLyIndex) Format2SearchDataSource(origin *BaseFromLyIndex) (item
 	item.Frequency = origin.Frequency
 	item.StartDate = utils.TimeTransferString(utils.FormatDate, origin.StartDate)
 	item.EndDate = utils.TimeTransferString(utils.FormatDate, origin.EndDate)
-	item.LatestValue = origin.LatestValue
+	item.LatestValue = fmt.Sprint(origin.LatestValue)
 	item.Source = source
 	item.SubSource = subSource
 	item.SourceName = sourceName
@@ -424,7 +424,7 @@ func (m *BaseFromSciHqIndex) Format2SearchDataSource(origin *BaseFromSciHqIndex)
 	item.Frequency = origin.Frequency
 	item.StartDate = utils.TimeTransferString(utils.FormatDate, origin.StartDate)
 	item.EndDate = utils.TimeTransferString(utils.FormatDate, origin.EndDate)
-	item.LatestValue = origin.LatestValue
+	item.LatestValue = fmt.Sprint(origin.LatestValue)
 	item.Source = source
 	item.SubSource = subSource
 	item.SourceName = sourceName
@@ -497,7 +497,7 @@ func (m *BaseFromOilchemIndex) Format2SearchDataSource(origin *BaseFromOilchemIn
 	item.Frequency = origin.Frequency
 	item.StartDate = utils.TimeTransferString(utils.FormatDate, origin.StartDate)
 	item.EndDate = utils.TimeTransferString(utils.FormatDate, origin.EndDate)
-	item.LatestValue = origin.LatestValue
+	item.LatestValue = fmt.Sprint(origin.LatestValue)
 	item.Source = source
 	item.SubSource = subSource
 	item.SourceName = sourceName
@@ -580,7 +580,7 @@ func (m *BaseFromThsHfIndex) Format2SearchDataSource(origin *BaseFromThsHfIndex)
 	item.Frequency = origin.Frequency
 	item.StartDate = utils.TimeTransferString(utils.FormatDateTime, origin.StartDate) // 高频这里是到时分秒
 	item.EndDate = utils.TimeTransferString(utils.FormatDateTime, origin.EndDate)
-	item.LatestValue = origin.LatestValue
+	item.LatestValue = fmt.Sprint(origin.LatestValue)
 	item.Source = source
 	item.SubSource = subSource
 	item.SourceName = sourceName
@@ -653,7 +653,7 @@ func (m *BaseFromCcfIndex) Format2SearchDataSource(origin *BaseFromCcfIndex) (it
 	item.Frequency = origin.Frequency
 	item.StartDate = utils.TimeTransferString(utils.FormatDate, origin.StartDate)
 	item.EndDate = utils.TimeTransferString(utils.FormatDate, origin.EndDate)
-	item.LatestValue = origin.LatestValue
+	item.LatestValue = fmt.Sprint(origin.LatestValue)
 	item.Source = source
 	item.SubSource = subSource
 	item.SourceName = sourceName
@@ -726,7 +726,7 @@ func (m *BaseFromUsdaFasIndex) Format2SearchDataSource(origin *BaseFromUsdaFasIn
 	item.Frequency = origin.Frequency
 	item.StartDate = utils.TimeTransferString(utils.FormatDate, origin.StartDate)
 	item.EndDate = utils.TimeTransferString(utils.FormatDate, origin.EndDate)
-	item.LatestValue = origin.LatestValue
+	item.LatestValue = fmt.Sprint(origin.LatestValue)
 	item.Source = source
 	item.SubSource = subSource
 	item.SourceName = sourceName
@@ -799,7 +799,7 @@ func (m *BaseFromMysteelChemicalIndex) Format2SearchDataSource(origin *BaseFromM
 	item.Frequency = origin.Frequency
 	item.StartDate = utils.TimeTransferString(utils.FormatDate, origin.StartDate)
 	item.EndDate = utils.TimeTransferString(utils.FormatDate, origin.EndDate)
-	item.LatestValue = origin.LatestValue
+	item.LatestValue = fmt.Sprint(origin.LatestValue)
 	item.Source = source
 	item.SubSource = subSource
 	item.SourceName = sourceName
@@ -872,7 +872,7 @@ func (m *BaseFromSmmIndex) Format2SearchDataSource(origin *BaseFromSmmIndex) (it
 	item.Frequency = origin.Frequency
 	item.StartDate = utils.TimeTransferString(utils.FormatDate, origin.StartDate)
 	item.EndDate = utils.TimeTransferString(utils.FormatDate, origin.EndDate)
-	item.LatestValue = origin.LatestValue
+	item.LatestValue = fmt.Sprint(origin.LatestValue)
 	item.Source = source
 	item.SubSource = subSource
 	item.SourceName = sourceName
@@ -945,7 +945,7 @@ func (m *BaseFromBaiinfoIndex) Format2SearchDataSource(origin *BaseFromBaiinfoIn
 	item.Frequency = origin.Frequency
 	item.StartDate = utils.TimeTransferString(utils.FormatDate, origin.StartDate)
 	item.EndDate = utils.TimeTransferString(utils.FormatDate, origin.EndDate)
-	item.LatestValue = origin.LatestValue
+	item.LatestValue = fmt.Sprint(origin.LatestValue)
 	item.Source = source
 	item.SubSource = subSource
 	item.SourceName = sourceName
@@ -1018,7 +1018,7 @@ func (m *BaseFromSciIndex) Format2SearchDataSource(origin *BaseFromSciIndex) (it
 	item.Frequency = origin.Frequency
 	item.StartDate = utils.TimeTransferString(utils.FormatDate, origin.StartDate)
 	item.EndDate = utils.TimeTransferString(utils.FormatDate, origin.EndDate)
-	item.LatestValue = origin.LatestValue
+	item.LatestValue = fmt.Sprint(origin.LatestValue)
 	item.Source = source
 	item.SubSource = subSource
 	item.SourceName = sourceName
@@ -1091,7 +1091,7 @@ func (m *BaseFromCoalmineMapping) Format2SearchDataSource(origin *BaseFromCoalmi
 	item.Frequency = origin.Frequency
 	item.StartDate = utils.TimeTransferString(utils.FormatDate, origin.StartDate)
 	item.EndDate = utils.TimeTransferString(utils.FormatDate, origin.EndDate)
-	item.LatestValue = origin.LatestValue
+	item.LatestValue = fmt.Sprint(origin.LatestValue)
 	item.Source = source
 	item.SubSource = subSource
 	item.SourceName = sourceName
@@ -1164,7 +1164,7 @@ func (m *BaseFromEiaSteoIndex) Format2SearchDataSource(origin *BaseFromEiaSteoIn
 	item.Frequency = origin.Frequency
 	item.StartDate = utils.TimeTransferString(utils.FormatDate, origin.StartDate)
 	item.EndDate = utils.TimeTransferString(utils.FormatDate, origin.EndDate)
-	item.LatestValue = origin.LatestValue
+	item.LatestValue = fmt.Sprint(origin.LatestValue)
 	item.Source = source
 	item.SubSource = subSource
 	item.SourceName = sourceName
@@ -1237,7 +1237,7 @@ func (m *BaseFromIcpiIndex) Format2SearchDataSource(origin *BaseFromIcpiIndex) (
 	item.Frequency = origin.Frequency
 	item.StartDate = utils.TimeTransferString(utils.FormatDate, origin.StartDate)
 	item.EndDate = utils.TimeTransferString(utils.FormatDate, origin.EndDate)
-	item.LatestValue = origin.LatestValue
+	item.LatestValue = fmt.Sprint(origin.LatestValue)
 	item.Source = source
 	item.SubSource = subSource
 	item.SourceName = sourceName
@@ -1310,7 +1310,7 @@ func (m *BaseFromYongyiIndex) Format2SearchDataSource(origin *BaseFromYongyiInde
 	item.Frequency = origin.Frequency
 	item.StartDate = utils.TimeTransferString(utils.FormatDate, origin.StartDate)
 	item.EndDate = utils.TimeTransferString(utils.FormatDate, origin.EndDate)
-	item.LatestValue = origin.LatestValue
+	item.LatestValue = fmt.Sprint(origin.LatestValue)
 	item.Source = source
 	item.SubSource = subSource
 	item.SourceName = sourceName
@@ -1383,7 +1383,7 @@ func (m *BaseFromFenweiIndex) Format2SearchDataSource(origin *BaseFromFenweiInde
 	item.Frequency = origin.Frequency
 	item.StartDate = utils.TimeTransferString(utils.FormatDate, origin.StartDate)
 	item.EndDate = utils.TimeTransferString(utils.FormatDate, origin.EndDate)
-	item.LatestValue = origin.LatestValue
+	item.LatestValue = fmt.Sprint(origin.LatestValue)
 	item.Source = source
 	item.SubSource = subSource
 	item.SourceName = sourceName
@@ -1456,7 +1456,7 @@ func (m *BaseFromSci99Index) Format2SearchDataSource(origin *BaseFromSci99Index)
 	item.Frequency = origin.Frequency
 	item.StartDate = utils.TimeTransferString(utils.FormatDate, origin.StartDate)
 	item.EndDate = utils.TimeTransferString(utils.FormatDate, origin.EndDate)
-	item.LatestValue = origin.LatestValue
+	item.LatestValue = fmt.Sprint(origin.LatestValue)
 	item.Source = source
 	item.SubSource = subSource
 	item.SourceName = sourceName
@@ -1528,7 +1528,7 @@ func (m *BaseFromGlIndex) Format2SearchDataSource(origin *BaseFromGlIndex) (item
 	item.Frequency = origin.Frequency
 	item.StartDate = utils.TimeTransferString(utils.FormatDate, origin.StartDate)
 	item.EndDate = utils.TimeTransferString(utils.FormatDate, origin.EndDate)
-	item.LatestValue = origin.LatestValue
+	item.LatestValue = fmt.Sprint(origin.LatestValue)
 	item.Source = source
 	item.SubSource = subSource
 	item.SourceName = sourceName
@@ -1601,7 +1601,7 @@ func (m *BaseFromManualEdb) Format2SearchDataSource(origin *BaseFromManualEdb) (
 	item.Frequency = origin.Frequency
 	item.StartDate = utils.TimeTransferString(utils.FormatDate, origin.StartDate)
 	item.EndDate = utils.TimeTransferString(utils.FormatDate, origin.EndDate)
-	item.LatestValue = origin.LatestValue
+	item.LatestValue = fmt.Sprint(origin.LatestValue)
 	item.Source = source
 	item.SubSource = subSource
 	item.SourceName = sourceName
@@ -1674,7 +1674,7 @@ func (m *BaseFromBusinessIndex) Format2SearchDataSource(origin *BaseFromBusiness
 	item.Frequency = origin.Frequency
 	item.StartDate = utils.TimeTransferString(utils.FormatDate, origin.StartDate)
 	item.EndDate = utils.TimeTransferString(utils.FormatDate, origin.EndDate)
-	item.LatestValue = origin.LatestValue
+	item.LatestValue = fmt.Sprint(origin.LatestValue)
 	item.Source = source
 	item.SubSource = subSource
 	item.SourceName = sourceName
@@ -1747,7 +1747,7 @@ func (m *BaseFromBloombergIndex) Format2SearchDataSource(origin *BaseFromBloombe
 	item.Frequency = origin.Frequency
 	item.StartDate = utils.TimeTransferString(utils.FormatDate, origin.StartDate)
 	item.EndDate = utils.TimeTransferString(utils.FormatDate, origin.EndDate)
-	item.LatestValue = origin.LatestValue
+	item.LatestValue = fmt.Sprint(origin.LatestValue)
 	item.Source = source
 	item.SubSource = subSource
 	item.SourceName = sourceName
@@ -1820,7 +1820,7 @@ func (m *BaseFromMtjhMapping) Format2SearchDataSource(origin *BaseFromMtjhMappin
 	item.Frequency = origin.Frequency
 	item.StartDate = utils.TimeTransferString(utils.FormatDate, origin.StartDate)
 	item.EndDate = utils.TimeTransferString(utils.FormatDate, origin.EndDate)
-	item.LatestValue = origin.LatestValue
+	item.LatestValue = fmt.Sprint(origin.LatestValue)
 	item.Source = source
 	item.SubSource = subSource
 	item.SourceName = sourceName