Merge branch 'pool/move_n_aver'

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

@@ -42,44 +42,45 @@ const (
 
 //数据来源渠道
 const (
-	DATA_SOURCE_THS                   = iota + 1 //同花顺
-	DATA_SOURCE_WIND                             //wind
-	DATA_SOURCE_PB                               //彭博
-	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_LZ                               //隆众
-	DATA_SOURCE_YS                               //有色
-	DATA_SOURCE_CALCULATE_HBZ                    //环比值->12
-	DATA_SOURCE_CALCULATE_HCZ                    //环差值->13
-	DATA_SOURCE_CALCULATE_BP                     //变频->14
-	DATA_SOURCE_GL                               //钢联->15
-	DATA_SOURCE_ZZ                               //郑商所->16
-	DATA_SOURCE_DL                               //大商所->17
-	DATA_SOURCE_SH                               //上期所->18
-	DATA_SOURCE_CFFEX                            //中金所->19
-	DATA_SOURCE_SHFE                             //上期能源->20
-	DATA_SOURCE_GIE                              //欧洲天然气->21
-	DATA_SOURCE_CALCULATE_TIME_SHIFT             //时间移位->22
-	DATA_SOURCE_CALCULATE_ZJPJ                   //直接拼接->23
-	DATA_SOURCE_CALCULATE_LJZTBPJ                //累计值同比拼接->24
-	DATA_SOURCE_LT                               //路透->25
-	DATA_SOURCE_COAL                             //中国煤炭网->26
-	DATA_SOURCE_PYTHON                           //python代码->27
-	DATA_SOURCE_PB_FINANCE                       //彭博财务数据->28
-	DATA_SOURCE_GOOGLE_TRAVEL                    //谷歌出行->29
-	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_EIA_STEO                         //eia steo报告->36
-	DATA_SOURCE_CALCULATE_NHCC                   //计算指标（拟合残差）->37
-	DATA_SOURCE_COM_TRADE                        //联合国商品贸易数据->38
+	DATA_SOURCE_THS                         = iota + 1 //同花顺
+	DATA_SOURCE_WIND                                   //wind
+	DATA_SOURCE_PB                                     //彭博
+	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_LZ                                     //隆众
+	DATA_SOURCE_YS                                     //有色
+	DATA_SOURCE_CALCULATE_HBZ                          //环比值->12
+	DATA_SOURCE_CALCULATE_HCZ                          //环差值->13
+	DATA_SOURCE_CALCULATE_BP                           //变频->14
+	DATA_SOURCE_GL                                     //钢联->15
+	DATA_SOURCE_ZZ                                     //郑商所->16
+	DATA_SOURCE_DL                                     //大商所->17
+	DATA_SOURCE_SH                                     //上期所->18
+	DATA_SOURCE_CFFEX                                  //中金所->19
+	DATA_SOURCE_SHFE                                   //上期能源->20
+	DATA_SOURCE_GIE                                    //欧洲天然气->21
+	DATA_SOURCE_CALCULATE_TIME_SHIFT                   //时间移位->22
+	DATA_SOURCE_CALCULATE_ZJPJ                         //直接拼接->23
+	DATA_SOURCE_CALCULATE_LJZTBPJ                      //累计值同比拼接->24
+	DATA_SOURCE_LT                                     //路透->25
+	DATA_SOURCE_COAL                                   //中国煤炭网->26
+	DATA_SOURCE_PYTHON                                 //python代码->27
+	DATA_SOURCE_PB_FINANCE                             //彭博财务数据->28
+	DATA_SOURCE_GOOGLE_TRAVEL                          //谷歌出行->29
+	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_EIA_STEO                               //eia steo报告->36
+	DATA_SOURCE_CALCULATE_NHCC                         //计算指标（拟合残差）->37
+	DATA_SOURCE_COM_TRADE                              //联合国商品贸易数据->38
+	DATA_SOURCE_PREDICT_CALCULATE_NSZYDPJJS            //预测指标 - N数值移动平均计算 -> 39
 )
 
 const (
@@ -169,26 +170,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 (