ziwen 2 年之前
父節點
當前提交
faf669fc7a
共有 2 個文件被更改,包括 81 次插入0 次删除
  1. 62 0
      services/data/edb_info.go
  2. 19 0
      services/task.go

+ 62 - 0
services/data/edb_info.go

@@ -1600,3 +1600,65 @@ func RefreshDataFromCoal(wg *sync.WaitGroup) (err error) {
 	}
 	return err
 }
+
+// RefreshDataFromEic 刷欧洲天然气数据
+func RefreshDataFromEic(wg *sync.WaitGroup) (err error) {
+	defer func() {
+		if err != nil {
+			fmt.Println("RefreshDataFromEic Err:" + err.Error())
+			//go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "RefreshDataFromCoal ErrMsg:"+err.Error(), utils.EmailSendToUsers)
+			go alarm_msg.SendAlarmMsg("RefreshDataFromEic ErrMsg:"+err.Error(), 3)
+		}
+		wg.Done()
+	}()
+	var condition string
+	var pars []interface{}
+	condition += " AND source=? "
+	pars = append(pars, utils.DATA_SOURCE_GIE)
+	items, err := data_manage.GetEdbInfoByCondition(condition, pars, 0)
+	if err != nil {
+		return errors.New("GetEdbInfoByCondition:" + err.Error())
+	}
+
+	//var endDate string
+	//endDate = time.Now().AddDate(utils.DATA_END_DATE_LIMIT, 0, 0).Format(utils.FormatDateUnSpace)
+	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)
+		}
+		//fmt.Println(startDate, endDate)
+		//err = data_manage.RefreshEdbDataByZz(v.EdbInfoId, v.EdbCode, startDate, endDate)
+		//if err != nil {
+		//	return errors.New("RefreshEdbDataByZz:" + err.Error())
+		//}
+		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.EdbCode, startDate)
+		if err != nil {
+			return errors.New("RefreshEdbData Err:" + err.Error())
+		}
+		if resp.Ret != 200 {
+			return errors.New("RefreshEdbData Err:" + resp.Msg + ";ErrMsg:" + resp.ErrMsg)
+		}
+		item, err := data_manage.GetEdbInfoMaxAndMinInfo(v.Source, v.EdbCode)
+		if err != nil {
+			return err
+		}
+		if item != nil {
+			err = data_manage.ModifyEdbInfoMaxAndMinInfo(v.EdbInfoId, item)
+			if err != nil {
+				return err
+			}
+		}
+	}
+	return err
+}

+ 19 - 0
services/task.go

@@ -153,6 +153,10 @@ func releaseTask() {
 	refreshTradeData := task.NewTask("refreshData", "0 1 4 * * *", RefreshTradeData)
 	task.AddTask("refreshTradeData", refreshTradeData)
 
+	//刷新欧洲天然气指标数据
+	refreshEicData := task.NewTask("refreshData", "0 1 3,7 * * *", RefreshEicData)
+	task.AddTask("refreshEicData", refreshEicData)
+
 	//刷新指标基础数据
 	refreshBaseData := task.NewTask("refreshBaseData", "0 */30 * * * * ", RefreshBaseData)
 	task.AddTask("refreshBaseData", refreshBaseData)
@@ -272,6 +276,21 @@ func RefreshTradeData(cont context.Context) (err error) {
 	return
 }
 
+
+// RefreshEicData 刷新欧洲天然气数据
+func RefreshEicData(cont context.Context) (err error) {
+	wg := sync.WaitGroup{}
+	wg.Add(1)
+
+	//欧洲天然气
+	go data.RefreshDataFromEic(&wg)
+	wg.Wait()
+	//计算指标
+	data.RefreshDataFromCalculateAll()
+
+	return
+}
+
 //刷新基础数据
 func RefreshBaseData(cont context.Context) (err error) {
 	now := time.Now()