rdluck 4 years ago
parent
commit
997e535515
4 changed files with 26 additions and 18 deletions
  1. 18 15
      models/tactics.go
  2. 4 0
      services/elastic.go
  3. 3 2
      services/tactics.go
  4. 1 1
      services/task.go

+ 18 - 15
models/tactics.go

@@ -1,22 +1,25 @@
 package models
 
-import "rdluck_tools/orm"
+import (
+	"rdluck_tools/orm"
+	"time"
+)
 
 type Tactics struct {
-	ArticleId       int    `description:"文章id"`
-	Title           string `description:"标题"`
-	TitleEn         string `description:"英文标题"`
-	UpdateFrequency string `description:"更新周期"`
-	PublishDate     string `description:"发布时间"`
-	PublishStatus   int    `description:"发布状态"`
-	Department      string `description:"作者"`
-	Body            string `description:"内容"`
-	Abstract        string `description:"摘要"`
-	Annotation      string `description:"注解"`
-	CategoryName    string `description:"分类"`
-	SubCategoryName string `description:"子级分类"`
-	CategoryId      int    `description:"分类id"`
-	CreateDate      string `description:"创建日期"`
+	ArticleId       int       `description:"文章id"`
+	Title           string    `description:"标题"`
+	TitleEn         string    `description:"英文标题"`
+	UpdateFrequency string    `description:"更新周期"`
+	PublishDate     time.Time `description:"发布时间"`
+	PublishStatus   int       `description:"发布状态"`
+	Department      string    `description:"作者"`
+	Body            string    `description:"内容"`
+	Abstract        string    `description:"摘要"`
+	Annotation      string    `description:"注解"`
+	CategoryName    string    `description:"分类"`
+	SubCategoryName string    `description:"子级分类"`
+	CategoryId      int       `description:"分类id"`
+	CreateDate      string    `description:"创建日期"`
 }
 
 func GetTacticsList(endDate string) (list []*Tactics, err error) {

+ 4 - 0
services/elastic.go

@@ -72,6 +72,7 @@ func EsAddOrEditData(indexName, docId string, item *ElasticTestArticleDetail) (e
 		resp, err := client.Update().Index(indexName).Id(docId).Doc(map[string]interface{}{
 			"BodyText": item.BodyText,
 			"Title":    item.Title,
+			"PublishDate":item.PublishDate,
 		}).Do(context.Background())
 		if err != nil {
 			return err
@@ -445,6 +446,9 @@ func EsMultiMatchFunctionScoreQuery(indexName, keyWord string, startSize, pageSi
 				}
 				searchItem.Title = title
 				searchItem.PublishDate = article.PublishDate
+
+
+
 				result = append(result, searchItem)
 			}
 		}

+ 3 - 2
services/tactics.go

@@ -32,7 +32,7 @@ func SyncTacticsList() (err error) {
 	for k, v := range list {
 		v.Department = "弘则权益研究"
 		fmt.Println(k, v.ArticleId)
-
+		//
 		publishDate, err := time.Parse(utils.FormatDateTime, v.PublishDate)
 		if err != nil {
 			fmt.Println("time.Parse:", err.Error())
@@ -92,7 +92,7 @@ func SyncTacticsList() (err error) {
 			item.TitleEn = v.TitleEn
 			item.UpdateFrequency = v.UpdateFrequency
 			item.CreateDate = v.CreateDate
-			item.PublishDate = v.PublishDate
+			item.PublishDate = v.PublishDate.Format(utils.FormatDateTime)
 			item.Body = html.EscapeString(v.Body)
 			item.Abstract = html.EscapeString(v.Abstract)
 			item.CategoryName = v.CategoryName
@@ -125,6 +125,7 @@ func SyncTacticsList() (err error) {
 		item.ArticleId = v.ArticleId
 		item.Title = v.Title
 		item.BodyText = bodyText
+		item.PublishDate = v.PublishDate.Format(utils.FormatDateTime)
 		EsAddOrEditData(indexName, strconv.Itoa(v.ArticleId), item)
 	}
 	return

+ 1 - 1
services/task.go

@@ -15,7 +15,6 @@ func Task() {
 		toolbox.AddTask("syncTacticsList", syncTacticsList)
 		toolbox.StartTask()
 	}
-	//SyncTacticsList()
 	fmt.Println("end")
 }
 
@@ -241,5 +240,6 @@ type ElasticTestArticleDetail struct {
 	ArticleId        int    `description:"报告id"`
 	Title            string `description:"标题"`
 	BodyText         string `description:"内容"`
+	PublishDate      string `description:"发布时间"`
 }