Browse Source

Merge branch 'chart/10.9' into debug

# Conflicts:
#	models/tables/edb_data/query.go
#	utils/constants.go
Roc 2 years ago
parent
commit
cb1d2b189e
3 changed files with 9 additions and 2 deletions
  1. 2 0
      models/tables/edb_data/query.go
  2. 4 0
      services/chart/edb_data.go
  3. 3 2
      utils/constants.go

+ 2 - 0
models/tables/edb_data/query.go

@@ -73,6 +73,8 @@ func GetEdbDataTableName(source int) (tableName string) {
 		tableName = "edb_data_predict_calculate_tbz"
 		tableName = "edb_data_predict_calculate_tbz"
 	case utils.DATA_SOURCE_PREDICT_CALCULATE_TCZ:
 	case utils.DATA_SOURCE_PREDICT_CALCULATE_TCZ:
 		tableName = "edb_data_predict_calculate_tcz"
 		tableName = "edb_data_predict_calculate_tcz"
+	case utils.DATA_SOURCE_MYSTEEL_CHEMICAL:
+		tableName = "edb_data_mysteel_chemical"
 	default:
 	default:
 		tableName = ""
 		tableName = ""
 	}
 	}

+ 4 - 0
services/chart/edb_data.go

@@ -61,6 +61,10 @@ func RefreshEdbData(edbInfoId, source int, edbCode, startDate string) (resp *Ref
 		urlStr = "/lt/refresh"
 		urlStr = "/lt/refresh"
 	case utils.DATA_SOURCE_COAL:
 	case utils.DATA_SOURCE_COAL:
 		urlStr = "/coal/refresh"
 		urlStr = "/coal/refresh"
+	case utils.DATA_SOURCE_GOOGLE_TRAVEL:
+		urlStr = "google_travel/refresh"
+	case utils.DATA_SOURCE_MYSTEEL_CHEMICAL:
+		urlStr = "mysteel_chemical/refresh"
 	}
 	}
 	if urlStr == "" {
 	if urlStr == "" {
 		err = fmt.Errorf(fmt.Sprint("source:", source, ";未实现该指标的刷新接口,请联系管理员"))
 		err = fmt.Errorf(fmt.Sprint("source:", source, ";未实现该指标的刷新接口,请联系管理员"))

+ 3 - 2
utils/constants.go

@@ -73,8 +73,9 @@ const (
 	DATA_SOURCE_GOOGLE_TRAVEL                    //谷歌出行数据->29
 	DATA_SOURCE_GOOGLE_TRAVEL                    //谷歌出行数据->29
 	DATA_SOURCE_PREDICT                          //普通预测指标->30
 	DATA_SOURCE_PREDICT                          //普通预测指标->30
 	DATA_SOURCE_PREDICT_CALCULATE                //预测指标运算->31
 	DATA_SOURCE_PREDICT_CALCULATE                //预测指标运算->31
-	DATA_SOURCE_PREDICT_CALCULATE_TBZ            //同比值->32
-	DATA_SOURCE_PREDICT_CALCULATE_TCZ            //同差值->33
+	DATA_SOURCE_PREDICT_CALCULATE_TBZ            //预测指标同比值->32
+	DATA_SOURCE_PREDICT_CALCULATE_TCZ            //预测指标同差值->33
+	DATA_SOURCE_MYSTEEL_CHEMICAL                 //钢联化工->34
 )
 )
 
 
 const (
 const (