Merge branch 'feature/new_task_calculate_edb' of eta_server/eta_task into custom

services/task.go

@@ -15,6 +15,7 @@ import (
 
 func Task() {
 	fmt.Println("task start")
+	
 	//如果是生产环境，才需要走这些任务
 	if utils.RunMode == "release" {
 		releaseTask()
@@ -65,6 +66,14 @@ func releaseTask() {
 	configRefreshData := task.NewTask("syncBaseDataExt", "0 */30 * * * * ", ConfigRefreshData)
 	task.AddTask("configRefreshData", configRefreshData)
 
+	// 定时刷新计算指标-默认每天的7:05，8:05分刷新计算指标
+	refreshCalculateEdbTaskTime := utils.RefreshCalculateEdbTaskTime
+	if refreshCalculateEdbTaskTime == "" {
+		refreshCalculateEdbTaskTime = "0 5 7,8 * * *"
+	}
+	refreshAllCalculateEdbData := task.NewTask("refreshAllCalculateEdbData", refreshCalculateEdbTaskTime, RefreshAllCalculateEdbData)
+	task.AddTask("refreshAllCalculateEdbData", refreshAllCalculateEdbData)
+
 	// 定时禁用钢联化工和wind指标的刷新状态
 	disableEdbRefresh := task.NewTask("disableEdbRefresh", "0 0 10 * * *", DisableEdbRefresh)
 	task.AddTask("disableEdbRefresh", disableEdbRefresh)
@@ -218,6 +227,13 @@ func RefreshData(cont context.Context) (err error) {
 	return
 }
 
+// 刷新所有计算指标数据
+func RefreshAllCalculateEdbData(cont context.Context) (err error) {
+	////计算指标
+	err = data.RefreshDataFromCalculateAll()
+	return
+}
+
 // SyncBaseData 刷新基础数据
 func SyncBaseData(cont context.Context) (err error) {
 	now := time.Now()

utils/config.go

@@ -148,6 +148,10 @@ var (
 )
 var HzDataApi string
 
+var (
+	RefreshCalculateEdbTaskTime string // 刷新计算指标的任务时间
+)
+
 func init() {
 	tmpRunMode, err := web.AppConfig.String("run_mode")
 	if err != nil {
@@ -321,4 +325,7 @@ func init() {
 	PbRefreshFrequency = config["pb_refresh_frequency"]
 	// 彭博刷新开关
 	PbRefreshOpen = config["pb_refresh_open"]
+
+	//任务刷新时间
+	RefreshCalculateEdbTaskTime = config["refresh_calculate_edb_task_time"]
 }