Browse Source

Merge branch '8.2' into debug

# Conflicts:
#	models/data_manage/edb_data_base.go
#	utils/constants.go
Roc 3 years ago
parent
commit
475c9e6345
2 changed files with 3 additions and 0 deletions
  1. 2 0
      models/data_manage/edb_data_base.go
  2. 1 0
      utils/constants.go

+ 2 - 0
models/data_manage/edb_data_base.go

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

+ 1 - 0
utils/constants.go

@@ -58,6 +58,7 @@ const (
 	DATA_SOURCE_CALCULATE_LJZTBPJ               //累计值同比拼接->24
 	DATA_SOURCE_LT                              //路透->25
 	DATA_SOURCE_COAL                            //煤炭网->26
+	DATA_SOURCE_PYTHON                          //python代码->27
 )
 
 //数据刷新频率