指标全称

models/data_manage/edb_info.go

@@ -49,6 +49,7 @@ type EdbInfo struct {
 	TerminalCode     string  `description:"终端编码，用于配置在机器上"`
 	DataUpdateTime   string  `description:"最近一次数据发生变化的时间"`
 	ErDataUpdateDate string  `description:"本次更新，数据发生变化的最早日期"`
+	SourceIndexName  string  `description:"数据源中的指标名称"`
 }
 
 type EdbInfoFullClassify struct {

models/data_manage/edb_terminal.go

@@ -51,6 +51,7 @@ func GetEdbTerminalListBySource(source int) (items []*EdbTerminal, err error) {
 
 type BaseIndexTerminalCode struct {
 	TerminalCode string `description:"终端编码，用于配置在机器上"`
+	IndexName    string
 }
 
 type EdbTerminalListResp struct {
@@ -81,7 +82,7 @@ type SetEdbTerminalStatusReq struct {
 // GetBaseIndexTerminalCode 获取数据源的终端code
 func GetBaseIndexTerminalCode(edbCode, tableName string) (item BaseIndexTerminalCode, err error) {
 	o := orm.NewOrmUsingDB("data")
-	sql := fmt.Sprintf(`select terminal_code from %s where index_code = ? `, tableName)
+	sql := fmt.Sprintf(`select terminal_code, index_name from %s where index_code = ? `, tableName)
 	err = o.Raw(sql, edbCode).QueryRow(&item)
 	return
 }

models/data_stat/edb_info_update_time.go

@@ -1 +0,0 @@
-package data_stat

services/data/edb_info.go

@@ -2569,8 +2569,9 @@ func EdbInfoAdd(source, classifyId int, edbCode, edbName, frequency, unit, start
 	if tE != nil {
 		utils.FileLog.Info(fmt.Sprintf("从缓存中获取数据源终端信息失败, Err: %s", tE))
 	}
+	var sourceIndexName string
 	if terminalCode == "" {
-		terminalCode, tE = GetTerminalFromBaseIndex(source, edbCode)
+		terminalCode, sourceIndexName, tE = GetTerminalFromBaseIndex(source, edbCode)
 		if tE != nil {
 			utils.FileLog.Info(fmt.Sprintf("获取数据源终端信息失败, Err: %s", tE))
 		}
@@ -2599,6 +2600,7 @@ func EdbInfoAdd(source, classifyId int, edbCode, edbName, frequency, unit, start
 	edbInfo.Sort = maxSort + 1
 	edbInfo.DataDateType = `交易日`
 	edbInfo.TerminalCode = terminalCode
+	edbInfo.SourceIndexName = sourceIndexName
 	timestamp := strconv.FormatInt(time.Now().UnixNano(), 10)
 	edbInfo.UniqueCode = utils.MD5(utils.DATA_PREFIX + "_" + timestamp)
 	itemVal, err := data_manage.GetEdbInfoMaxAndMinInfo(source, edbCode)
@@ -3123,7 +3125,7 @@ func GetChartMenuTreeRecursive(list []*data_manage.ChartClassifyItems, parentId
 	return res
 }
 
-func GetTerminalFromBaseIndex(source int, edbCode string) (terminalCode string, err error) {
+func GetTerminalFromBaseIndex(source int, edbCode string) (terminalCode string, sourceIndexName string, err error) {
 	tbName := GetBaseIndexTableName(source)
 	if tbName != "" {
 		var item data_manage.BaseIndexTerminalCode
@@ -3133,6 +3135,7 @@ func GetTerminalFromBaseIndex(source int, edbCode string) (terminalCode string,
 			return
 		}
 		terminalCode = item.TerminalCode
+		sourceIndexName = item.IndexName
 	}
 	return
 }

services/data_stat/edb_delete_log.go

@@ -19,7 +19,7 @@ func AddEdbDeleteLog(edbInfo *data_manage.EdbInfo, sysUser *system.Admin) (err e
 		log.EdbCode = edbInfo.EdbCode
 		log.EdbName = edbInfo.EdbName
 		log.EdbNameEn = edbInfo.EdbNameEn
-		log.EdbNameSource = edbInfo.EdbNameSource
+		log.EdbNameSource = edbInfo.SourceIndexName
 		log.Frequency = edbInfo.Frequency
 		log.Unit = edbInfo.Unit
 		log.UnitEn = edbInfo.UnitEn
@@ -50,7 +50,7 @@ func AddEdbDeleteLog(edbInfo *data_manage.EdbInfo, sysUser *system.Admin) (err e
 		log.DelSysUserRealName = sysUser.RealName
 		log.DataUpdateTime = edbInfo.DataUpdateTime
 		log.ErDataUpdateDate = edbInfo.ErDataUpdateDate
-		
+
 		_, err = data_stat.AddEdbDeleteLog(log)
 		if err != nil {
 			err = fmt.Errorf("新增指标删除日志失败，Err: %s", err)

services/data_stat/edb_info_stat.go

@@ -25,7 +25,7 @@ func AddEdbInfoUpdateLog(edbInfoId int, updateResult int, updateFailedReason str
 		log.Source = edbInfo.Source
 		log.EdbCode = edbInfo.EdbCode
 		log.EdbName = edbInfo.EdbName
-		log.EdbNameSource = edbInfo.EdbNameSource
+		log.EdbNameSource = edbInfo.SourceIndexName
 		log.Frequency = edbInfo.Frequency
 		log.Unit = edbInfo.Unit
 		log.StartDate = edbInfo.StartDate