Browse Source

定时任务

ziwen 3 years ago
parent
commit
9d6c1a5e9b

+ 6 - 5
services/commodity_coal_coastal.go

@@ -11,11 +11,12 @@ import (
 	"time"
 )
 
-func FileCoalCoastal() (err error) {
+func FileCoalCoastal() () {
+	var err error
 	defer func() {
 		if err != nil {
-			fmt.Println("RefreshDataFromDalian Err:" + err.Error())
-			go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "RefreshDataFromDalian ErrMsg:"+err.Error(), utils.EmailSendToUsers)
+			fmt.Println("RefreshDataFromCoalCoastal  Err:" + err.Error())
+			go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "RefreshDataFromCoalCoastal ErrMsg:"+err.Error(), utils.EmailSendToUsers)
 		}
 	}()
 	//path := "static/file/沿海八省动力煤终端用户供耗存数据更新03.07.xlsx"
@@ -46,7 +47,7 @@ func FileCoalCoastal() (err error) {
 	codeList, err := models.GetBaseFromCoalmineMapping()
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		utils.FileLog.Info("获取煤炭指标失败:", err)
-		return err
+		return
 	}
 	if len(codeList) > 0 {
 		for _, v := range codeList {
@@ -56,7 +57,7 @@ func FileCoalCoastal() (err error) {
 	indexCompanyList, err := models.GetBaseFromCoalmineCoastalIndex()
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		utils.FileLog.Info("获取煤炭公司指标失败:", err)
-		return err
+		return
 	}
 	if len(indexCompanyList) > 0 {
 		for _, v := range indexCompanyList {

+ 6 - 5
services/commodity_coal_firm.go

@@ -12,11 +12,12 @@ import (
 	"time"
 )
 
-func FileCoalFirm() (err error) {
+func FileCoalFirm() () {
+	var err error
 	defer func() {
 		if err != nil {
-			fmt.Println("RefreshDataFromDalian Err:" + err.Error())
-			go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "RefreshDataFromDalian ErrMsg:"+err.Error(), utils.EmailSendToUsers)
+			fmt.Println("RefreshDataFromCoalFirm Err:" + err.Error())
+			go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "RefreshDataFromCoalFirm ErrMsg:"+err.Error(), utils.EmailSendToUsers)
 		}
 	}()
 	var xlFile *xlsx.File
@@ -86,7 +87,7 @@ func FileCoalFirm() (err error) {
 	codeList, err := models.GetBaseFromCoalmineMapping()
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		utils.FileLog.Info("获取煤炭指标失败:", err)
-		return err
+		return
 	}
 	if len(codeList) > 0 {
 		for _, v := range codeList {
@@ -96,7 +97,7 @@ func FileCoalFirm() (err error) {
 	indexCompanyList, err := models.GetBaseFromCoalmineFirmIndex()
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		utils.FileLog.Info("获取煤炭公司指标失败:", err)
-		return err
+		return
 	}
 	if len(indexCompanyList) > 0 {
 		for _, v := range indexCompanyList {

+ 6 - 5
services/commodity_coal_inland.go

@@ -10,11 +10,12 @@ import (
 	"time"
 )
 
-func FileCoalInland() (err error) {
+func FileCoalInland() () {
+	var err error
 	defer func() {
 		if err != nil {
-			fmt.Println("RefreshDataFromDalian Err:" + err.Error())
-			go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "RefreshDataFromDalian ErrMsg:"+err.Error(), utils.EmailSendToUsers)
+			fmt.Println("RefreshDataFromCoalInland Err:" + err.Error())
+			go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "RefreshDataFromCoalInland ErrMsg:"+err.Error(), utils.EmailSendToUsers)
 		}
 	}()
 	//path := "static/file/内陆17省动力煤终端用户供耗存20220322.xlsx"
@@ -37,7 +38,7 @@ func FileCoalInland() (err error) {
 	codeList, err := models.GetBaseFromCoalmineMapping()
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		utils.FileLog.Info("获取煤炭指标失败:", err)
-		return err
+		return
 	}
 	if len(codeList) > 0 {
 		for _, v := range codeList {
@@ -47,7 +48,7 @@ func FileCoalInland() (err error) {
 	indexCompanyList, err := models.GetBaseFromCoalmineInlandIndex()
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		utils.FileLog.Info("获取煤炭公司指标失败:", err)
-		return err
+		return
 	}
 	if len(indexCompanyList) > 0 {
 		for _, v := range indexCompanyList {

+ 8 - 8
services/commodity_coal_mine.go

@@ -11,12 +11,12 @@ import (
 	"time"
 )
 
-func FileCoalJsm() (err error) {
-
+func FileCoalJsm() () {
+	var err error
 	defer func() {
 		if err != nil {
-			fmt.Println("RefreshDataFromDalian Err:" + err.Error())
-			go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "RefreshDataFromDalian ErrMsg:"+err.Error(), utils.EmailSendToUsers)
+			fmt.Println("RefreshDataFromCoalJsm Err:" + err.Error())
+			go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "RefreshDataFromCoalJsm ErrMsg:"+err.Error(), utils.EmailSendToUsers)
 		}
 	}()
 	//path := "static/file/442家晋陕蒙煤矿周度产量数据-20220328.xlsx"
@@ -62,7 +62,7 @@ func FileCoalJsm() (err error) {
 	codeList, err := models.GetBaseFromCoalmineMapping()
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		utils.FileLog.Info("获取煤炭指标失败:", err)
-		return err
+		return
 	}
 
 	if len(codeList) > 0 {
@@ -74,7 +74,7 @@ func FileCoalJsm() (err error) {
 	codeCompanyList, err := models.GetBaseFromCoalmineMapping()
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		utils.FileLog.Info("获取煤炭公司指标失败:", err)
-		return err
+		return
 	}
 	if len(codeCompanyList) > 0 {
 		for _, v := range codeCompanyList {
@@ -85,7 +85,7 @@ func FileCoalJsm() (err error) {
 	indexList, err := models.GetBaseFromCoalmineIndex()
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		utils.FileLog.Info("获取煤炭公司指标失败:", err)
-		return err
+		return
 	}
 	if len(indexList) > 0 {
 		for _, v := range indexList {
@@ -96,7 +96,7 @@ func FileCoalJsm() (err error) {
 	indexCompanyList, err := models.GetBaseFromCoalmineCompanyIndex()
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		utils.FileLog.Info("获取煤炭公司指标失败:", err)
-		return err
+		return
 	}
 	if len(indexCompanyList) > 0 {
 		for _, v := range indexCompanyList {

+ 20 - 9
services/task.go

@@ -3,19 +3,22 @@ package services
 import (
 	"context"
 	"fmt"
+	"github.com/beego/beego/v2/task"
 )
 
 func Task() {
 	fmt.Println("start crawler")
-	//refreshData := task.NewTask("refreshData", "0 0,30 16-20 * * *", RefreshData)
-	//refreshEic := task.NewTask("refreshData", "0 0 1,6 * * *", RefreshEic)
-	//task.AddTask("数据爬取", refreshData)
-	//task.AddTask("欧洲天然气爬取", refreshEic)
-	//task.StartTask()
-	FileCoalJsm()
-	FileCoalFirm()
-	FileCoalCoastal()
-	FileCoalInland()
+	refreshData := task.NewTask("refreshData", "0 0,30 16-20 * * *", RefreshData)
+	refreshEic := task.NewTask("refreshData", "0 0 1,6 * * *", RefreshEic)
+	refreshCoal := task.NewTask("refreshData", "0 0 18-23 * * *", RefreshCoal)
+	task.AddTask("数据爬取", refreshData)
+	task.AddTask("欧洲天然气爬取", refreshEic)
+	task.AddTask("中国煤炭网爬取", refreshCoal)
+	task.StartTask()
+	//FileCoalJsm()
+	//FileCoalFirm()
+	//FileCoalCoastal()
+	//FileCoalInland()
 	fmt.Println("end crawler")
 }
 
@@ -35,3 +38,11 @@ func RefreshEic(cont context.Context) (err error) {
 	SyncStorageFromEic()
 	return
 }
+
+func RefreshCoal(cont context.Context) (err error) {
+	FileCoalJsm()
+	//FileCoalFirm()
+	FileCoalCoastal()
+	FileCoalInland()
+	return
+}

+ 1 - 1
utils/constants.go

@@ -21,5 +21,5 @@ const (
 
 const (
 	APPNAME          = "弘则-数据爬虫"
-	EmailSendToUsers = "glji@hzinsights.com;pyan@hzinsights.com;cxzhang@hzinsights.com"
+	EmailSendToUsers = "glji@hzinsights.com;pyan@hzinsights.com;cxzhang@hzinsights.com;zwxi@hzinsights.com;"
 )