xingzai 3 سال پیش
والد
کامیت
dd57a61261
2فایلهای تغییر یافته به همراه25 افزوده شده و 18 حذف شده
  1. 2 1
      services/activity.go
  2. 23 17
      services/task.go

+ 2 - 1
services/activity.go

@@ -1,6 +1,7 @@
 package services
 
 import (
+	"context"
 	"fmt"
 	"github.com/tealeg/xlsx"
 	"hongze/hongze_cygx/models"
@@ -124,7 +125,7 @@ func SendActivityBeginMsgMeeting() (err error) {
 }
 
 //预约外呼名单,会前1小时自动发送邮件给专家组
-func SendEmailFileToExpert() (err error) {
+func SendEmailFileToExpert(cont context.Context) (err error) {
 	var msg string
 	var touser string
 	defer func() {

+ 23 - 17
services/task.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"github.com/PuerkitoBio/goquery"
 	"github.com/beego/beego/v2/adapter/toolbox"
+	"github.com/beego/beego/v2/task"
 	"hongze/hongze_cygx/models"
 	"hongze/hongze_cygx/utils"
 	"html"
@@ -34,24 +35,29 @@ func Task() {
 
 	//UpdateActivitySattus()
 	//修改任务状态
-	updateActivitySattus := toolbox.NewTask("syncTacticsListAddreport", "0 */1 8-22 * * *", UpdateActivitySattus)
-	toolbox.AddTask("updateActivitySattus", updateActivitySattus)
-	//更新深 和新的标签
-	updateIndustrialManagementLabel := toolbox.NewTask("updateIndustrialManagementLabel", "0 */30 * * * *", UpdateIndustrialManagementLabel)
-	toolbox.AddTask("updateIndustrialManagementLabel", updateIndustrialManagementLabel)
-	//更新报告的搜索栏内容
-	//UpdateIndustrialManagementSubjectNnames()
-	//会议提醒模板消息推送
-	sendActivityBeginMsg := toolbox.NewTask("sendActivityBeginMsg", "0 */10 8-22 * * *", SendActivityBeginMsg) //会议前60分钟的提醒
-	toolbox.AddTask("sendActivityBeginMsg", sendActivityBeginMsg)
-	sendActivityBeginMsgMeeting := toolbox.NewTask("sendActivityBeginMsgMeeting", "0 */5 8-22 * * *", SendActivityBeginMsgMeeting) //会议前15分钟的提醒
-	toolbox.AddTask("sendActivityBeginMsgMeeting", sendActivityBeginMsgMeeting)
+	//updateActivitySattus := toolbox.NewTask("syncTacticsListAddreport", "0 */1 8-22 * * *", UpdateActivitySattus)
+	//toolbox.AddTask("updateActivitySattus", updateActivitySattus)
+	////更新深 和新的标签
+	//updateIndustrialManagementLabel := toolbox.NewTask("updateIndustrialManagementLabel", "0 */30 * * * *", UpdateIndustrialManagementLabel)
+	//toolbox.AddTask("updateIndustrialManagementLabel", updateIndustrialManagementLabel)
+	////更新报告的搜索栏内容
+	////UpdateIndustrialManagementSubjectNnames()
+	////会议提醒模板消息推送
+	//sendActivityBeginMsg := toolbox.NewTask("sendActivityBeginMsg", "0 */10 8-22 * * *", SendActivityBeginMsg) //会议前60分钟的提醒
+	//toolbox.AddTask("sendActivityBeginMsg", sendActivityBeginMsg)
+	//sendActivityBeginMsgMeeting := toolbox.NewTask("sendActivityBeginMsgMeeting", "0 */5 8-22 * * *", SendActivityBeginMsgMeeting) //会议前15分钟的提醒
+	//toolbox.AddTask("sendActivityBeginMsgMeeting", sendActivityBeginMsgMeeting)
+	//
+	////预约外呼名单,会前1小时自动发送邮件给专家组
+	//sendEmailFileToExpert := task.NewTask("sendEmailFileToExpert", "0 */1 8-22 * * *", SendEmailFileToExpert) //预约外呼名单,会前1小时自动发送邮件给专家组
+	SendEmailFileToExpert := task.NewTask("sendEmailFileToExpert", "0/3 * * * * *", SendEmailFileToExpert) //预约外呼名单,会前1小时自动发送邮件给专家组
+	task.AddTask("SendEmailFileToExpert", SendEmailFileToExpert)
+	//SendEmailFileToExpert()
 
-	//预约外呼名单,会前1小时自动发送邮件给专家组
-	sendEmailFileToExpert := toolbox.NewTask("sendEmailFileToExpert", "0 */5 8-22 * * *", SendEmailFileToExpert) //预约外呼名单,会前1小时自动发送邮件给专家组
-	toolbox.AddTask("sendEmailFileToExpert", sendEmailFileToExpert)
-	//UpdateActivitySattus()
-	toolbox.StartTask()
+	task.StartTask()
+	defer task.StopTask()
+
+	//toolbox.StartTask()
 	fmt.Println("end")
 }