Merge branch 'pool/move_n_aver' into debug

# Conflicts:
#	utils/constants.go

models/tables/edb_data/query.go

@@ -83,6 +83,8 @@ func GetEdbDataTableName(source int) (tableName string) {
 		tableName = "edb_data_calculate_nhcc"
 	case utils.DATA_SOURCE_COM_TRADE:
 		tableName = "edb_data_com_trade"
+	case utils.DATA_SOURCE_PREDICT_CALCULATE_NSZYDPJJS:
+		tableName = "edb_data_predict_calculate_nszydpjjs"
 	default:
 		tableName = ""
 	}

utils/constants.go

@@ -80,6 +80,7 @@ const (
 	DATA_SOURCE_EIA_STEO                         //eia steo报告->36
 	DATA_SOURCE_CALCULATE_NHCC                   //计算指标（拟合残差）->37
 	DATA_SOURCE_COM_TRADE                        //联合国商品贸易数据->38
+	DATA_SOURCE_PREDICT_CALCULATE_NSZYDPJJS            //预测指标 - N数值移动平均计算 -> 39
 )
 
 const (
@@ -172,26 +173,27 @@ const (
 
 // SystemSourceList 系统来源
 var SystemSourceList = []int{
-	DATA_SOURCE_CALCULATE,             //指标运算
-	DATA_SOURCE_CALCULATE_LJZZY,       //累计值转月
-	DATA_SOURCE_CALCULATE_TBZ,         //同比值
-	DATA_SOURCE_CALCULATE_TCZ,         //同差值
-	DATA_SOURCE_CALCULATE_NSZYDPJJS,   //N数值移动平均计算
-	DATA_SOURCE_MANUAL,                //手工指标
-	DATA_SOURCE_CALCULATE_HBZ,         //环比值->12
-	DATA_SOURCE_CALCULATE_HCZ,         //环差值->13
-	DATA_SOURCE_CALCULATE_BP,          //变频->14
-	DATA_SOURCE_CALCULATE_TIME_SHIFT,  //时间移位->22
-	DATA_SOURCE_CALCULATE_ZJPJ,        //直接拼接->23
-	DATA_SOURCE_CALCULATE_LJZTBPJ,     //累计值同比拼接->24
-	DATA_SOURCE_PYTHON,                //python代码->27
-	DATA_SOURCE_PREDICT,               //预测指标->30
-	DATA_SOURCE_PREDICT_CALCULATE,     //预测指标运算->31
-	DATA_SOURCE_PREDICT_CALCULATE_TBZ, //预测指标同比值->32
-	DATA_SOURCE_PREDICT_CALCULATE_TCZ, //预测指标同差值->33
-	DATA_SOURCE_MYSTEEL_CHEMICAL,      //钢联化工->34
-	DATA_SOURCE_CALCULATE_CJJX,        //超季节性->35
-	DATA_SOURCE_CALCULATE_NHCC,        //计算指标（拟合残差）->37
+	DATA_SOURCE_CALCULATE,                   //指标运算
+	DATA_SOURCE_CALCULATE_LJZZY,             //累计值转月
+	DATA_SOURCE_CALCULATE_TBZ,               //同比值
+	DATA_SOURCE_CALCULATE_TCZ,               //同差值
+	DATA_SOURCE_CALCULATE_NSZYDPJJS,         //N数值移动平均计算
+	DATA_SOURCE_MANUAL,                      //手工指标
+	DATA_SOURCE_CALCULATE_HBZ,               //环比值->12
+	DATA_SOURCE_CALCULATE_HCZ,               //环差值->13
+	DATA_SOURCE_CALCULATE_BP,                //变频->14
+	DATA_SOURCE_CALCULATE_TIME_SHIFT,        //时间移位->22
+	DATA_SOURCE_CALCULATE_ZJPJ,              //直接拼接->23
+	DATA_SOURCE_CALCULATE_LJZTBPJ,           //累计值同比拼接->24
+	DATA_SOURCE_PYTHON,                      //python代码->27
+	DATA_SOURCE_PREDICT,                     //预测指标->30
+	DATA_SOURCE_PREDICT_CALCULATE,           //预测指标运算->31
+	DATA_SOURCE_PREDICT_CALCULATE_TBZ,       //预测指标同比值->32
+	DATA_SOURCE_PREDICT_CALCULATE_TCZ,       //预测指标同差值->33
+	DATA_SOURCE_MYSTEEL_CHEMICAL,            //钢联化工->34
+	DATA_SOURCE_CALCULATE_CJJX,              //超季节性->35
+	DATA_SOURCE_CALCULATE_NHCC,              //计算指标（拟合残差）->37
+	DATA_SOURCE_PREDICT_CALCULATE_NSZYDPJJS, //预测指标 - N数值移动平均计算 -> 39
 }
 
 const (