更改部分定时任务

controllers/article.go

@@ -216,7 +216,7 @@ func (this *ArticleController) Detail() {
 			br.ErrMsg = "获取销售数据失败，Err:" + err.Error() + strconv.Itoa(uid) + ";articleId" + strconv.Itoa(articleId)
 			return
 		}
-		if detail.ArticleId >= 1000000 {
+		if detail.ArticleId >= utils.SummaryArticleId {
 			var hrefRegexp = regexp.MustCompile("[0-9]\\d*")
 			match := hrefRegexp.FindAllString(detail.SellerAndMobile, -1)
 			if match != nil {

models/article.go

@@ -208,6 +208,12 @@ func GetArticleAll() (item []*ArticleDetail, err error) {
 	_, err = o.Raw(sql).QueryRows(&item)
 	return
 }
+func GetArticleAllDate(endDate string) (item []*ArticleDetail, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM cygx_article WHERE is_summary=1 AND publish_date >= ?  `
+	_, err = o.Raw(sql, endDate).QueryRows(&item)
+	return
+}
 
 func GetArticleAll2() (item []*ArticleDetail, err error) {
 	o := orm.NewOrm()

services/tactics.go

@@ -715,3 +715,30 @@ func BodyAnalysis2(body string) (expertNumStr, expertContentStr, interviewDateSt
 	}
 	return
 }
+
+func GetSummarytoEs() (err error) {
+	endDate := time.Now().AddDate(0, 0, -30).Format(utils.FormatDate)
+	//allList, err := models.GetArticleAll()
+	allList, err := models.GetArticleAllDate(endDate)
+	if err != nil {
+		fmt.Println("GetArticleAll Err:", err.Error())
+		return
+	}
+	indexName := utils.IndexName
+	for _, v := range allList {
+		content := html.UnescapeString(v.Body)
+		doc, err := goquery.NewDocumentFromReader(strings.NewReader(content))
+		if err != nil {
+			fmt.Println("create doc err:", err.Error())
+			return
+		}
+		bodyText := doc.Text()
+		item := new(ElasticTestArticleDetail)
+		item.ArticleId = v.ArticleId
+		item.Title = v.Title
+		item.PublishDate = v.PublishDate
+		item.BodyText = bodyText
+		EsAddOrEditData(indexName, strconv.Itoa(v.ArticleId), item)
+		fmt.Println(v.ArticleId)
+	}
+}

services/task.go

@@ -9,6 +9,7 @@ import (
 	"html"
 	"strconv"
 	"strings"
+	"time"
 	//"github.com/astaxie/beego/cache"
 )
 
@@ -45,6 +46,9 @@ func Task() {
 	sendActivityBeginMsgMeeting := toolbox.NewTask("sendActivityBeginMsgMeeting", "0 */5 * * * *", SendActivityBeginMsgMeeting) //会议前15分钟的提醒
 	toolbox.AddTask("sendActivityBeginMsgMeeting", sendActivityBeginMsgMeeting)
 
+	getSummarytoEs := toolbox.NewTask("getSummarytoEs", "0 */30 * * * *", GetSummarytoEs) //同步纪要库内容到Es
+	toolbox.AddTask("getSummarytoEs", getSummarytoEs)
+
 	toolbox.StartTask()
 
 	//if utils.RunMode == "debug" {
@@ -261,14 +265,14 @@ func CreateIndex() {
 }
 
 func AddAllArticle() {
-	allList, err := models.GetArticleAll()
+	endDate := time.Now().AddDate(0, 0, -30).Format(utils.FormatDate)
+	//allList, err := models.GetArticleAll()
+	allList, err := models.GetArticleAllDate(endDate)
 	if err != nil {
 		fmt.Println("GetArticleAll Err:", err.Error())
 		return
 	}
-
-	indexName := "cygx_article_v3"
-
+	indexName := utils.IndexName
 	for _, v := range allList {
 		content := html.UnescapeString(v.Body)
 		doc, err := goquery.NewDocumentFromReader(strings.NewReader(content))
@@ -277,7 +281,6 @@ func AddAllArticle() {
 			return
 		}
 		bodyText := doc.Text()
-
 		item := new(ElasticTestArticleDetail)
 		item.ArticleId = v.ArticleId
 		item.Title = v.Title

utils/config.go

@@ -39,8 +39,9 @@ var (
 )
 
 var (
-	IndexName  string
-	OnlineTime string
+	IndexName        string
+	OnlineTime       string
+	SummaryArticleId int
 )
 
 func init() {
@@ -64,6 +65,7 @@ func init() {
 		panic(Re)
 	}
 	OnlineTime = "2021-06-01 00:00:01" //上线时间
+	SummaryArticleId = 1000000         //手动添加的纪要库开始ID
 	if RunMode == "release" {
 		WxAppId = "wxcc32b61f96720d2f"
 		WxAppSecret = "06894933fafb24dafead7eaae09c08e0"
@@ -76,7 +78,7 @@ func init() {
 		WxPublicAppId = "wx4a844c734d8c8e56"
 		WxPublicAppSecret = "26c586e7ccb3c575433f0f37797b3eeb"
 		WxPublicId = "gh_b67e0049fb8c"
-		IndexName = "cygx_article_v5"
+		IndexName = "cygx_article_v0712"
 	} else {
 		WxAppId = "wxcc32b61f96720d2f"
 		WxAppSecret = "06894933fafb24dafead7eaae09c08e0"
@@ -91,7 +93,7 @@ func init() {
 		WxPublicAppId = "wx9b5d7291e581233a"
 		WxPublicAppSecret = "f4d52e34021eee262dce9682b31f8861"
 		WxPublicId = "gh_5dc508325c6f"
-		IndexName = "cygx_article_v4"
+		IndexName = "cygx_article_v1"
 	}
 }