Merge branch 'feature/pool151_predict_calculate' into debug

services/report_push.go

@@ -178,6 +178,7 @@ var permissionLabelMap = map[string]string{
 	"镍/不锈钢":     "镍+不锈钢",
 	"成品油":       "成品油",
 	"油品":        "成品油",
+	"纺服":        "织造终端",
 }
 
 //TshResult 同花顺返回信息

services/task.go

@@ -121,7 +121,7 @@ func Task() {
 	task.AddTask("定时发布研报语音播报", publishVoiceBroadcast)
 
 	// 定时生成本周研究汇总
-	cygxResearchSummary := task.NewTask("cygxResearchSummary", "0 0 15 * * 5", CygxResearchSummary)
+	cygxResearchSummary := task.NewTask("cygxResearchSummary", "0 0 10 * * 5", CygxResearchSummary)
 	task.AddTask("定时生成本周研究汇总", cygxResearchSummary)
 
 	// 定时生成上周纪要汇总

utils/constants.go

@@ -100,6 +100,21 @@ const (
 	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
+	DATA_SOURCE_CALCULATE_ADJUST                       //数据调整->40
+	DATA_SOURCE_SCI                                    //卓创数据（红桃三）->41
+	DATA_SOURCE_PREDICT_CALCULATE_LJZZY                //预测指标 - 累计值转月->42
+	DATA_SOURCE_PREDICT_CALCULATE_HBZ                  //预测指标 - 环比值->43
+	DATA_SOURCE_PREDICT_CALCULATE_HCZ                  //预测指标 - 环差值->44
+	DATA_SOURCE_PREDICT_CALCULATE_BP                   //预测指标 - 变频->45
+	DATA_SOURCE_PREDICT_CALCULATE_TIME_SHIFT           //预测指标 - 时间移位->46
+	DATA_SOURCE_PREDICT_CALCULATE_ZJPJ                 //预测指标 - 直接拼接->47
+	DATA_SOURCE_PREDICT_CALCULATE_LJZTBPJ              //预测指标 - 累计值同比拼接->48
+	DATA_SOURCE_PREDICT_CALCULATE_CJJX                 //预测指标 - 超季节性->49
+	DATA_SOURCE_PREDICT_CALCULATE_NHCC                 //预测指标 - 计算指标（拟合残差）->50
+	DATA_SOURCE_CALCULATE_JP                           //变频->51
 )
 
 //http://datawind.hzinsights.com:8040/hz_server