|
@@ -60,7 +60,7 @@ func handleInsert(edbUpdateLog *data_manage.EdbUpdateLog) (pushIndexData *PushIn
|
|
|
}
|
|
|
|
|
|
// 获取数据源中指标的基础信息
|
|
|
- origInfo := getOrigInfo(edbInfo.Source, edbInfo.SubSource, edbInfo.EdbCode)
|
|
|
+ origInfo := getOrigInfo(edbInfo.Source, edbInfo.SubSource, edbInfo.EdbCode, edbInfo.EdbName)
|
|
|
|
|
|
// 指标信息
|
|
|
pushIndexData = &PushIndexParamDataReq{
|
|
@@ -194,7 +194,7 @@ func handleDelete(edbUpdateLog *data_manage.EdbUpdateLog) (pushIndexData *PushIn
|
|
|
}
|
|
|
|
|
|
// 获取数据源中指标的基础信息
|
|
|
- origInfo := getOrigInfo(edbInfo.Source, edbInfo.SubSource, edbInfo.EdbCode)
|
|
|
+ origInfo := getOrigInfo(edbInfo.Source, edbInfo.SubSource, edbInfo.EdbCode, edbInfo.EdbName)
|
|
|
|
|
|
// 指标信息
|
|
|
pushIndexData = &PushIndexParamDataReq{
|
|
@@ -339,7 +339,7 @@ func handleUpdate(edbUpdateLog *data_manage.EdbUpdateLog) (pushIndexData *PushIn
|
|
|
if isUpdateEdbInfo {
|
|
|
|
|
|
// 获取数据源中指标的基础信息
|
|
|
- origInfo := getOrigInfo(newEdbInfo.Source, newEdbInfo.SubSource, newEdbInfo.EdbCode)
|
|
|
+ origInfo := getOrigInfo(newEdbInfo.Source, newEdbInfo.SubSource, newEdbInfo.EdbCode, newEdbInfo.EdbName)
|
|
|
|
|
|
pushIndexData = &PushIndexParamDataReq{
|
|
|
SourceIndexCode: newEdbInfo.EdbCode,
|
|
@@ -599,8 +599,9 @@ type OrigInfo struct {
|
|
|
// @param source int
|
|
|
// @param subSource int
|
|
|
// @param edbCode string
|
|
|
+// @param edbName string
|
|
|
// @return origInfo OrigInfo
|
|
|
-func getOrigInfo(source, subSource int, edbCode string) (origInfo OrigInfo) {
|
|
|
+func getOrigInfo(source, subSource int, edbCode, edbName string) (origInfo OrigInfo) {
|
|
|
switch source {
|
|
|
case utils.DATA_SOURCE_THS, utils.DATA_SOURCE_WIND: // 同花顺、wind
|
|
|
origInfo.SourceName = "经济数据库"
|
|
@@ -624,6 +625,11 @@ func getOrigInfo(source, subSource int, edbCode string) (origInfo OrigInfo) {
|
|
|
origInfo.SourceName = edbInfo.Interface
|
|
|
}
|
|
|
|
|
|
+ // 如果原始名称为空,则使用ETA指标库的名称作为原始名称
|
|
|
+ if origInfo.EdbName == `` {
|
|
|
+ origInfo.EdbName = edbName
|
|
|
+ }
|
|
|
+
|
|
|
return
|
|
|
}
|
|
|
|