新增富宝数据刷新

services/data/base_edb_lib.go

@@ -72,6 +72,8 @@ func RefreshEdbData(edbInfoId, source, subSource int, edbCode, startDate string)
 		urlStr = "baiinfo/refresh"
 	case utils.DATA_SOURCE_NATIONAL_STATISTICS:
 		urlStr = "national_statistics/refresh"
+	case utils.DATA_SOURCE_FUBAO:
+		urlStr = "fubao/refresh"
 	default:
 		urlStr = data_manage.EdbDataRefreshMethodMap[source] // 没有对应的从edb_source中取
 	}

services/data/edb_info.go

@@ -1102,3 +1102,56 @@ func RefreshJiaYueDataFromBridge(cont context.Context) (err error) {
 	}
 	return
 }
+
+// RefreshDataFromFubao 刷新富宝数据
+func RefreshDataFromFubao(wg *sync.WaitGroup) (err error) {
+	errMsgList := make([]string, 0)
+	defer func() {
+		if err != nil {
+			fmt.Println("RefreshDataFromFubao Err:" + err.Error())
+			go alarm_msg.SendAlarmMsg("RefreshDataFromFubao ErrMsg:"+err.Error(), 3)
+		}
+		if len(errMsgList) > 0 {
+			errMsg := "RefreshDataFromFubao Err:" + strings.Join(errMsgList, "\n")
+			fmt.Println(errMsg)
+			go alarm_msg.SendAlarmMsg(errMsg, 3)
+		}
+		wg.Done()
+	}()
+	var condition string
+	var pars []interface{}
+	condition += ` AND source=? AND no_update = 0 `
+	pars = append(pars, utils.DATA_SOURCE_FUBAO)
+
+	items, err := data_manage.GetEdbInfoByCondition(condition, pars, 0)
+	if err != nil {
+		return err
+	}
+	for _, v := range items {
+		startDate := ""
+		if v.Frequency == "日度" {
+			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
+		} else if v.Frequency == "周度" {
+			startDate = v.EndDate.AddDate(0, 0, -(utils.DATA_REFRESH * 7)).Format(utils.FormatDate)
+		} else if v.Frequency == "月度" {
+			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH, 0).Format(utils.FormatDate)
+		} else if v.Frequency == "季度" {
+			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH*3, 0).Format(utils.FormatDate)
+		} else if v.Frequency == "年度" {
+			startDate = v.EndDate.AddDate(-utils.DATA_REFRESH, 0, 0).Format(utils.FormatDate)
+		} else {
+			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
+		}
+		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
+		if err != nil {
+			errMsgList = append(errMsgList, v.EdbCode+"RefreshEdbData Err:"+err.Error())
+			continue
+		}
+		if resp.Ret != 200 {
+			errMsgList = append(errMsgList, v.EdbCode+";RefreshEdbData Err:"+resp.Msg+";ErrMsg:"+resp.ErrMsg)
+			continue
+		}
+	}
+	fmt.Println("Fubao刷新结束")
+	return err
+}

services/task.go

@@ -106,7 +106,7 @@ func releaseTask() {
 
 func RefreshData(cont context.Context) (err error) {
 	wg := sync.WaitGroup{}
-	wg.Add(15)
+	wg.Add(16)
 	//hour := time.Now().Hour()
 	//if hour != 0 {
 	//}
@@ -141,7 +141,8 @@ func RefreshData(cont context.Context) (err error) {
 	go data.RefreshDataFromSci(&wg)
 	//国家统计局指标
 	go data.RefreshDataFromNationalStatistics(&wg)
-
+	//富宝指标刷新
+	go data.RefreshDataFromFubao(&wg)
 	wg.Wait()
 	////计算指标
 	data.RefreshDataFromCalculateAll()

utils/constants.go

@@ -25,67 +25,82 @@ 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_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
-	DATA_SOURCE_CALCULATE_NH                            //年化->52
-	DATA_SOURCE_CALCULATE_KSZS                          //扩散指数->53
-	DATA_SOURCE_PREDICT_CALCULATE_JP                    //预测指标 - 计算指标(降频)->54
-	DATA_SOURCE_PREDICT_CALCULATE_NH                    //预测指标 - 计算指标(年化)->55
-	DATA_SOURCE_PREDICT_CALCULATE_KSZS                  //预测指标 - 计算指标(扩散指数)->56
-	DATA_SOURCE_BAIINFO                                 //百川盈孚 ->57
-	DATA_SOURCE_STOCK_PLANT                             //存量装置 ->58
-	DATA_SOURCE_CALCULATE_CORRELATION                   //相关性计算->59
-	DATA_SOURCE_NATIONAL_STATISTICS                     //国家统计局->60
-	DATA_SOURCE_MEETING_PROBABILITIES                   //美联储加息概率->61
+	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
+	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
+	DATA_SOURCE_CALCULATE_NH                                    //年化->52
+	DATA_SOURCE_CALCULATE_KSZS                                  //扩散指数->53
+	DATA_SOURCE_PREDICT_CALCULATE_JP                            //预测指标 - 计算指标(降频)->54
+	DATA_SOURCE_PREDICT_CALCULATE_NH                            //预测指标 - 计算指标(年化)->55
+	DATA_SOURCE_PREDICT_CALCULATE_KSZS                          //预测指标 - 计算指标(扩散指数)->56
+	DATA_SOURCE_BAIINFO                                         //百川盈孚 ->57
+	DATA_SOURCE_STOCK_PLANT                                     //存量装置 ->58
+	DATA_SOURCE_CALCULATE_CORRELATION                           //相关性计算->59
+	DATA_SOURCE_NATIONAL_STATISTICS                             //国家统计局->60
+	DATA_SOURCE_MEETING_PROBABILITIES                           //美联储加息概率->61
+	DATA_SOURCE_CALCULATE_LJZ                                   //累计值 -> 62
+	DATA_SOURCE_CALCULATE_LJZNCZJ                               //累计值(年初至今） -> 63
+	DATA_SOURCE_PREDICT_CALCULATE_LJZZJ                         //预测指标 - 累计值转季->64
+	DATA_SOURCE_PREDICT_CALCULATE_LJZ                           //预测指标 - 累计值 -> 65
+	DATA_SOURCE_PREDICT_CALCULATE_LJZNCZJ                       //预测指标 - 累计值(年初至今） -> 66
+	DATA_SOURCE_CALCULATE_STANDARD_DEVIATION                    //标准差->67
+	DATA_SOURCE_CALCULATE_PERCENTILE                            //百分位图表->68
+	DATA_SOURCE_PREDICT_CALCULATE_STANDARD_DEVIATION            //预测标准差->69
+	DATA_SOURCE_PREDICT_CALCULATE_PERCENTILE                    //预测百分位->70
+	DATA_SOURCE_FUBAO                                           //富宝->71
+	DATA_SOURCE_CALCULATE_ZSXY                                  // 指数修匀->72
+	DATA_SOURCE_PREDICT_CALCULATE_ZSXY                          // 预测指数修匀->73
+	DATA_SOURCE_CALCULATE_ZDYFX                                 // 自定义分析->74
+	DATA_SOURCE_CALCULATE_RJZ                                   // 日均值计算->75
+
 )
 
 // 数据刷新频率