瀏覽代碼

ES 同步规则修改

xingzai 2 年之前
父節點
當前提交
a3c750ceab
共有 5 個文件被更改,包括 27 次插入27 次删除
  1. 1 1
      models/article.go
  2. 1 1
      services/article.go
  3. 1 1
      services/elastic.go
  4. 22 22
      services/tactics.go
  5. 2 2
      services/task.go

+ 1 - 1
models/article.go

@@ -255,7 +255,7 @@ type ArticleDetailTest struct {
 	Body      string `json:"-" description:"内容"`
 }
 
-func GetArticleDetailTestById(articleId int) (item *ArticleDetailTest, err error) {
+func GetArticleDetailTestById(articleId int) (item *ArticleDetail, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT * FROM cygx_article WHERE article_id = ? `
 	err = o.Raw(sql, articleId).QueryRow(&item)

+ 1 - 1
services/article.go

@@ -687,7 +687,7 @@ func HandleArticleListByApi(artcleId int) (err error) {
 	var clueApiUrl string
 	clueApiUrl = fmt.Sprint(utils.ApiUrl, "articles/", artcleId)
 	fmt.Println(clueApiUrl)
-
+	GetSummarytoEs(artcleId)
 	authorization := utils.ApiAuthorization
 	body, err := PublicGetDate(clueApiUrl, authorization)
 	if err != nil {

+ 1 - 1
services/elastic.go

@@ -981,7 +981,7 @@ func EsArticleSearch(keyWord string, startSize, pageSize int, orderColumn string
 	queryMap["highlight"] = highlightMap
 	jsonBytes, _ := json.Marshal(queryMap)
 	fmt.Println(string(jsonBytes))
-	//utils.FileLog.Info(string(jsonBytes))
+	utils.FileLog.Info(string(jsonBytes))
 	request := client.Search(indexName).Source(queryMap) // sets the JSON request
 	searchByMatch, err := request.Do(context.Background())
 	if searchByMatch != nil {

+ 22 - 22
services/tactics.go

@@ -719,38 +719,38 @@ func BodyAnalysis2(body string) (expertNumStr, expertContentStr, interviewDateSt
 	return
 }
 
-func GetSummarytoEs(cont context.Context) (err error) {
+func GetSummarytoEs(articleId int) (err error) {
 	defer func() {
 		if err != nil {
 			go utils.SendAlarmMsg("同步ES记录失败", 2)
 		}
 	}()
-	endDate := time.Now().AddDate(0, 0, -30).Format(utils.FormatDate)
-	//allList, err := models.GetArticleAll()
-	allList, err := models.GetArticleAllDate(endDate)
+	//endDate := time.Now().AddDate(0, 0, -30).Format(utils.FormatDate)
+	v, err := models.GetArticleDetailTestById(articleId)
+	//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 err
-		}
-		bodyText := doc.Text()
-		item := new(ElasticTestArticleDetail)
-		item.ArticleId = v.ArticleId
-		item.Title = v.Title
-		item.PublishDate = v.PublishDate
-		bodyText, _ = GetReportContentTextSub(v.Body)
-		item.BodyText = bodyText
-		item.CategoryId = strconv.Itoa(v.CategoryId)
-		item.ExpertBackground = v.ExpertBackground
-		EsAddOrEditData(indexName, strconv.Itoa(v.ArticleId), item)
-		fmt.Println(v.ArticleId)
+	//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 err
 	}
+	bodyText := doc.Text()
+	item := new(ElasticTestArticleDetail)
+	item.ArticleId = v.ArticleId
+	item.Title = v.Title
+	item.PublishDate = v.PublishDate
+	bodyText, _ = GetReportContentTextSubNew(v.Body)
+	item.BodyText = bodyText
+	item.CategoryId = strconv.Itoa(v.CategoryId)
+	item.ExpertBackground = v.ExpertBackground
+	EsAddOrEditData(indexName, strconv.Itoa(v.ArticleId), item)
+	fmt.Println(v.ArticleId)
+	//}
 	return
 }

+ 2 - 2
services/task.go

@@ -17,8 +17,8 @@ func Task() {
 	if utils.RunMode == "release" && utils.IsTask {
 		//syncTacticsListAddreport := task.NewTask("syncTacticsListAddreport", "0 */5 * * * *", SyncTacticsListAddreport) //同步文章
 		//task.AddTask("syncTacticsListAddreport", syncTacticsListAddreport)
-		getSummarytoEs := task.NewTask("getSummarytoEs", "0 */30 * * * *", GetSummarytoEs) //同步纪要库内容到Es
-		task.AddTask("getSummarytoEs", getSummarytoEs)
+		//getSummarytoEs := task.NewTask("getSummarytoEs", "0 */30 * * * *", GetSummarytoEs) //同步纪要库内容到Es
+		//task.AddTask("getSummarytoEs", getSummarytoEs)
 		getArticleListByApi := task.NewTask("getArticleListByApi", "0 */5 * * * *", GetArticleListByApi) //通过三方接口获取策略平台上的文章
 		task.AddTask("getArticleListByApi", getArticleListByApi)