Просмотр исходного кода

Merge branch 'fix_chart_source' of hongze/hongze_yb into master

hsun 3 лет назад
Родитель
Сommit
56d1edd84c
3 измененных файлов с 8 добавлено и 1 удалено
  1. 4 0
      models/tables/edb_data/query.go
  2. 2 0
      services/chart/edb_data.go
  3. 2 1
      utils/constants.go

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

@@ -62,6 +62,10 @@ func GetEdbDataTableName(source int) (tableName string) {
 		tableName = "edb_data_calculate_ljztbpj"
 	case utils.DATA_SOURCE_LT:
 		tableName = "edb_data_lt"
+	case utils.DATA_SOURCE_COAL:
+		tableName = "edb_data_coal"
+	case utils.DATA_SOURCE_PYTHON:
+		tableName = "edb_data_python"
 	default:
 		tableName = ""
 	}

+ 2 - 0
services/chart/edb_data.go

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

+ 2 - 1
utils/constants.go

@@ -68,7 +68,8 @@ const (
 	DATA_SOURCE_CALCULATE_ZJPJ                  //直接拼接->23
 	DATA_SOURCE_CALCULATE_LJZTBPJ               //累计值同比拼接->24
 	DATA_SOURCE_LT                              //路透->25
-
+	DATA_SOURCE_COAL                            //中国煤炭网->26
+	DATA_SOURCE_PYTHON                          //python代码->27
 )
 
 const (