fix:调整来源

models/data_manage/edb_data_base.go

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

services/eta_bridge/handle_data.go

@@ -142,15 +142,15 @@ func handleInsert(edbUpdateLog *data_manage.EdbUpdateLog) (pushIndexData *PushIn
 			return
 		}
 
-		edbSource, ok := data_manage.EdbTableNameSourceMap[edbUpdateLog.OpTableName]
-		if !ok {
+		source, subSource := data_manage.GetSourceAndSubSourceTableName(edbUpdateLog.OpTableName, edbData.EdbCode)
+		if source <= 0 {
 			// 没有找到来源，那就过滤
 			return
 		}
 		// 数据信息
 		pushIndexValue = &PushIndexValueItemReq{
-			Id:           utils.MD5(fmt.Sprint(edbSource.EdbSourceId, "_", edbSource.SourceName, "_", edbData.EdbDataId)),
-			IndexCode:    fmt.Sprint(edbSource.EdbSourceId, "_", edbData.EdbCode),
+			Id:           utils.MD5(fmt.Sprint(source, "_", subSource, "_", edbData.EdbDataId)),
+			IndexCode:    fmt.Sprint(source, "_", edbData.EdbCode),
 			Value:        fmt.Sprint(edbData.Value),
 			BusinessDate: edbData.DataTime,
 			CreateTime:   edbData.CreateTime,
@@ -276,15 +276,15 @@ func handleDelete(edbUpdateLog *data_manage.EdbUpdateLog) (pushIndexData *PushIn
 			return
 		}
 
-		edbSource, ok := data_manage.EdbTableNameSourceMap[edbUpdateLog.OpTableName]
-		if !ok {
+		source, subSource := data_manage.GetSourceAndSubSourceTableName(edbUpdateLog.OpTableName, edbData.EdbCode)
+		if source <= 0 {
 			// 没有找到来源，那就过滤
 			return
 		}
 		// 数据信息
 		pushIndexValue = &PushIndexValueItemReq{
-			Id:           utils.MD5(fmt.Sprint(edbSource.EdbSourceId, "_", edbSource.SourceName, "_", edbData.EdbDataId)),
-			IndexCode:    fmt.Sprint(edbSource.EdbSourceId, "_", edbData.EdbCode),
+			Id:           utils.MD5(fmt.Sprint(source, "_", subSource, "_", edbData.EdbDataId)),
+			IndexCode:    fmt.Sprint(source, "_", edbData.EdbCode),
 			Value:        fmt.Sprint(edbData.Value),
 			BusinessDate: edbData.DataTime,
 			CreateTime:   edbData.CreateTime,
@@ -396,15 +396,15 @@ func handleUpdate(edbUpdateLog *data_manage.EdbUpdateLog) (pushIndexData *PushIn
 			return
 		}
 
-		edbSource, ok := data_manage.EdbTableNameSourceMap[edbUpdateLog.OpTableName]
-		if !ok {
+		source, subSource := data_manage.GetSourceAndSubSourceTableName(edbUpdateLog.OpTableName, edbData.EdbCode)
+		if source <= 0 {
 			// 没有找到来源，那就过滤
 			return
 		}
 		// 数据信息
 		pushIndexValue = &PushIndexValueItemReq{
-			Id:           utils.MD5(fmt.Sprint(edbSource.EdbSourceId, "_", edbSource.SourceName, "_", edbData.EdbDataId)),
-			IndexCode:    fmt.Sprint(edbSource.EdbSourceId, "_", edbData.EdbCode),
+			Id:           utils.MD5(fmt.Sprint(source, "_", subSource, "_", edbData.EdbDataId)),
+			IndexCode:    fmt.Sprint(source, "_", edbData.EdbCode),
 			Value:        fmt.Sprint(edbData.Value),
 			BusinessDate: edbData.DataTime,
 			CreateTime:   edbData.CreateTime,