Merge remote-tracking branch 'origin/11.3' into debug

models/db.go

@@ -38,8 +38,10 @@ func init() {
 	//注册对象
 	orm.RegisterModel(
 		new(data_manage.EdbInfo),
-		new(ShareChartRefreshLog),       //分享图表刷新日志表
-		new(ExcelInfo),                  //excel表格
-		new(data_manage.PredictEdbConf), //预测指标配置
+		new(ShareChartRefreshLog),                       //分享图表刷新日志表
+		new(ExcelInfo),                                  //excel表格
+		new(data_manage.PredictEdbConf),                 //预测指标配置
+		new(data_manage.PredictEdbRuleData),             //预测指标配置生成的数据
+		new(data_manage.PredictEdbConfCalculateMapping), //预测指标关系表
 	)
 }

services/data/base_edb_lib.go

@@ -104,6 +104,8 @@ func RefreshEdbData(edbInfoId, source int, edbCode, startDate string) (resp *mod
 		urlStr = "mysteel_chemical/refresh"
 	case utils.DATA_SOURCE_EIA_STEO:
 		urlStr = "eia_steo/refresh"
+	case utils.DATA_SOURCE_PREDICT:
+		urlStr = "predict/refresh"
 	}
 	if urlStr == "" {
 		err = fmt.Errorf(fmt.Sprint("source:", source, ";未实现该指标的刷新接口，请联系管理员"))