浏览代码

Merge branch '13.8'

# Conflicts:
#	models/data_manage/edb_data_base.go
#	models/edb_data_base.go
#	utils/constants.go
Roc 2 年之前
父节点
当前提交
739d42dc16
共有 3 个文件被更改,包括 5 次插入0 次删除
  1. 2 0
      models/data_manage/edb_data_base.go
  2. 2 0
      models/edb_data_base.go
  3. 1 0
      utils/constants.go

+ 2 - 0
models/data_manage/edb_data_base.go

@@ -119,6 +119,8 @@ func GetEdbDataTableName(source int) (tableName string) {
 		tableName = "edb_data_baiinfo"
 	case utils.DATA_SOURCE_STOCK_PLANT:
 		tableName = "edb_data_stock_plant"
+	case utils.DATA_SOURCE_CALCULATE_CORRELATION:
+		tableName = "edb_data_calculate_correlation"
 	default:
 		tableName = ""
 	}

+ 2 - 0
models/edb_data_base.go

@@ -118,6 +118,8 @@ func GetEdbDataTableName(source int) (tableName string) {
 		tableName = "edb_data_baiinfo"
 	case utils.DATA_SOURCE_STOCK_PLANT:
 		tableName = "edb_data_stock_plant"
+	case utils.DATA_SOURCE_CALCULATE_CORRELATION:
+		tableName = "edb_data_calculate_correlation"
 	default:
 		tableName = ""
 	}

+ 1 - 0
utils/constants.go

@@ -90,6 +90,7 @@ const (
 	DATA_SOURCE_PREDICT_CALCULATE_KSZS                  //预测指标 - 计算指标(扩散指数)->56
 	DATA_SOURCE_BAIINFO                                 //百川盈孚 ->57
 	DATA_SOURCE_STOCK_PLANT                             //存量装置 ->58
+	DATA_SOURCE_CALCULATE_CORRELATION                   //相关性计算->59
 )
 
 // 数据刷新频率