定时发布研报，定时发布英文研报

models/english_report.go

@@ -90,10 +90,10 @@ type ElasticEnglishReportDetail struct {
 }
 
 // GetPrePublishedEnglishReports 获取定时发布时间为当前时间的未发布的英文报告列表
-func GetPrePublishedEnglishReports(prePublishTime string) (list []*EnglishReport, err error) {
+func GetPrePublishedEnglishReports(startTime, endTime string) (list []*EnglishReport, err error) {
 	o := orm.NewOrmUsingDB("rddp")
-	sql := `SELECT * FROM english_report WHERE state = 1 and pre_publish_time = ?`
-	_, err = o.Raw(sql, prePublishTime).QueryRows(&list)
+	sql := `SELECT * FROM english_report WHERE state = 1 and pre_publish_time >= ? and pre_publish_time <= ?`
+	_, err = o.Raw(sql, startTime, endTime).QueryRows(&list)
 	return
 }
 

models/report.go

@@ -84,10 +84,10 @@ func EditReportContentHtml(reportId int, content string) (err error) {
 }
 
 // GetPrePublishedReports 获取定时发布时间为当前时间的未发布的报告列表
-func GetPrePublishedReports(prePublishTime string) (list []*Report, err error) {
+func GetPrePublishedReports(startTime, endTime string) (list []*Report, err error) {
 	o := orm.NewOrmUsingDB("rddp")
-	sql := `SELECT * FROM report WHERE state = 1 and pre_publish_time = ?`
-	_, err = o.Raw(sql, prePublishTime).QueryRows(&list)
+	sql := `SELECT * FROM report WHERE state = 1 and pre_publish_time >= ? and pre_publish_time <=?`
+	_, err = o.Raw(sql, startTime, endTime).QueryRows(&list)
 	return
 }
 

services/english_report.go

@@ -19,8 +19,10 @@ func PublishEnglishReport(cont context.Context) (err error) {
 		}
 	}()
 	// 获取所有未发布的语音播报
-	now := time.Now().Format(utils.FormatDateTime)
-	list, e := models.GetPrePublishedEnglishReports(now)
+	now := time.Now().Format(utils.FormatDateTimeMinute)
+	startTime := now + ":00"
+	endTime := now + ":59"
+	list, e := models.GetPrePublishedEnglishReports(startTime, endTime)
 	if e != nil {
 		return
 	}

services/report.go

@@ -251,8 +251,10 @@ func PublishReport(cont context.Context) (err error) {
 		}
 	}()
 
-	now := time.Now().Format(utils.FormatDateTime)
-	list, e := models.GetPrePublishedReports(now)
+	now := time.Now().Format(utils.FormatDateTimeMinute)
+	startTime := now + ":00"
+	endTime := now + ":59"
+	list, e := models.GetPrePublishedReports(startTime, endTime)
 	if e != nil {
 		return
 	}

services/task.go

@@ -146,11 +146,11 @@ func Task() {
 	task.AddTask("定时发布研报语音播报", publishVoiceBroadcast)
 
 	// 定时发布研报
-	publishReport := task.NewTask("publishReport", "* * * * * *", PublishReport)
+	publishReport := task.NewTask("publishReport", "0 */1 * * * *", PublishReport)
 	task.AddTask("定时发布研报", publishReport)
 
 	// 定时发布英文研报
-	publishEnglishReport := task.NewTask("publishEnglishReport", "* * * * * *", PublishEnglishReport)
+	publishEnglishReport := task.NewTask("publishEnglishReport", "0 */1 * * * *", PublishEnglishReport)
 	task.AddTask("定时发布英文研报", publishEnglishReport)
 
 	// 定时生成本周研究汇总

utils/constants.go

@@ -13,6 +13,7 @@ const (
 	FormatDateTime        = "2006-01-02 15:04:05"     //完整时间格式
 	HlbFormatDateTime     = "2006-01-02_15:04:05.999" //完整时间格式
 	FormatDateTimeUnSpace = "20060102150405"          //完整时间格式
+	FormatDateTimeMinute  = "2006-01-02 15:04"        //时间格式只精确到分钟
 	PageSize15            = 15                        //列表页每页数据量
 	PageSize5             = 5
 	PageSize10            = 10