Merge branch '14.4'

models/data_manage/edb_data_base.go

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

models/edb_data_base.go

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

services/data/base_edb_lib.go

@@ -10,7 +10,7 @@ import (
 	"strings"
 )
 
-//新增指标数据
+// 新增指标数据
 func AddEdbData(source int, edbCode string) (resp *models.BaseResponse, err error) {
 	param := make(map[string]interface{})
 	param["EdbCode"] = edbCode
@@ -52,6 +52,8 @@ func AddEdbData(source int, edbCode string) (resp *models.BaseResponse, err erro
 		urlStr = "/sci/add"
 	case utils.DATA_SOURCE_BAIINFO:
 		urlStr = "/baiinfo/add"
+	case utils.DATA_SOURCE_NATIONAL_STATISTICS:
+		urlStr = "/national_statistics/add"
 	default:
 	}
 	if urlStr == "" {
@@ -116,6 +118,8 @@ func RefreshEdbData(edbInfoId, source int, edbCode, startDate string) (resp *mod
 		urlStr = "/sci/refresh"
 	case utils.DATA_SOURCE_BAIINFO:
 		urlStr = "/baiinfo/refresh"
+	case utils.DATA_SOURCE_NATIONAL_STATISTICS:
+		urlStr = "/national_statistics/refresh"
 	}
 	if urlStr == "" {
 		err = fmt.Errorf(fmt.Sprint("source:", source, ";未实现该指标的刷新接口，请联系管理员"))

utils/constants.go

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