Selaa lähdekoodia

修改发布时间

rdluck 4 vuotta sitten
vanhempi
commit
bac56b650a
5 muutettua tiedostoa jossa 30 lisäystä ja 9 poistoa
  1. 7 1
      controllers/home.go
  2. 15 3
      services/elastic.go
  3. 5 2
      services/tactics.go
  4. 2 2
      services/task.go
  5. 1 1
      services/user.go

+ 7 - 1
controllers/home.go

@@ -5,6 +5,7 @@ import (
 	"hongze/hongze_cygx/services"
 	"hongze/hongze_cygx/utils"
 	"rdluck_tools/paging"
+	"time"
 )
 
 type HomeController struct {
@@ -79,7 +80,12 @@ func (this *HomeController) ListHome() {
 	}
 	lenList := len(list)
 	for i := 0; i < lenList; i++ {
-		list[i].Body, _ = services.GetReportContentTextSub(list[i].Body)
+		item := list[i]
+		publishDate, _ := time.Parse(utils.FormatDateTime, item.PublishDate)
+		hh, _ := time.ParseDuration("8h")
+		publishDate = publishDate.Add(hh)
+		list[i].PublishDate = publishDate.Format(utils.FormatDateTime)
+		list[i].Body, _ = services.GetReportContentTextSub(item.Body)
 	}
 	resp.List = list
 	resp.Paging = page

+ 15 - 3
services/elastic.go

@@ -11,6 +11,7 @@ import (
 	"os"
 	"sort"
 	"strconv"
+	"strings"
 )
 
 func NewClient() (client *elastic.Client, err error) {
@@ -63,10 +64,11 @@ func EsAddOrEditData(indexName, docId string, item *ElasticArticleDetail) (err e
 		return
 	}
 	searchById, err := client.Get().Index(indexName).Id(docId).Do(context.Background())
-	if err != nil {
+	if err != nil && !strings.Contains(err.Error(), "404") {
+		fmt.Println("Get Err" + err.Error())
 		return
 	}
-	if searchById.Found {
+	if searchById != nil && searchById.Found {
 		resp, err := client.Update().Index(indexName).Id(docId).Doc(map[string]interface{}{
 			"BodyText": item.BodyText,
 			"Title":    item.Title,
@@ -83,10 +85,12 @@ func EsAddOrEditData(indexName, docId string, item *ElasticArticleDetail) (err e
 	} else {
 		resp, err := client.Index().Index(indexName).Id(docId).BodyJson(item).Do(context.Background())
 		if err != nil {
+			fmt.Println("新增失败:",err.Error())
 			return err
 		}
 		if resp.Status == 0 && resp.Result == "created" {
 			fmt.Println("新增成功")
+			err = nil
 		} else {
 			fmt.Println("AddData", resp.Status, resp.Result)
 		}
@@ -453,7 +457,6 @@ func EsMultiMatchFunctionScoreQuery(indexName, keyWord string, startSize, pageSi
 	return
 }
 
-
 func GetWeight(length int) []int {
 	steep := 10
 	intArr := make([]int, 0)
@@ -480,3 +483,12 @@ func GetArrSum(intArr []int) (sum int) {
 	}
 	return
 }
+
+//func init() {
+//	fmt.Println("start")
+//	keyWord:="阿里巴巴"
+//	keyWordArr, _ := GetIndustryMapNameSliceV2(keyWord)
+//	keyWordArr = RemoveDuplicatesAndEmpty(keyWordArr)
+//	fmt.Println(keyWordArr)
+//	fmt.Println("end")
+//}

+ 5 - 2
services/tactics.go

@@ -18,16 +18,19 @@ func SyncTacticsList() (err error) {
 			fmt.Println("同步失败,Err:", err.Error())
 		}
 	}()
-
+	fmt.Println("同步数据")
 	indexName := "article_list"
 
-	endDate := time.Now().Format(utils.FormatDate)
+	endDate := time.Now().AddDate(0, 0, -5).Format(utils.FormatDate)
 	list, err := models.GetTacticsList(endDate)
 	if err != nil {
 		fmt.Println("GetTacticsList Err:", err.Error())
 		return
 	}
+	fmt.Println("list len:", len(list))
+
 	for k, v := range list {
+		fmt.Println(k,v.ArticleId)
 		//判断是否已经存在
 		if v.ArticleId < 0 {
 			fmt.Println("参数错误")

+ 2 - 2
services/task.go

@@ -9,10 +9,10 @@ import (
 func Task() {
 	fmt.Println("start")
 	//同步数据
-	syncTacticsList := toolbox.NewTask("syncTacticsList", "0 */2 0-18 * * *", SyncTacticsList)
+	syncTacticsList := toolbox.NewTask("syncTacticsList", "0 */5 * * * *", SyncTacticsList)
 	toolbox.AddTask("syncTacticsList", syncTacticsList)
-	toolbox.StartTask()
 
+	//toolbox.StartTask()
 	//keyWord := "专家"
 	//pageSize := 20
 	//SearchByKeyWord(keyWord, pageSize)

+ 1 - 1
services/user.go

@@ -352,4 +352,4 @@ func AddUserRecord(openId, unionId, nickName, realName, province, city, country,
 	}
 	userRecord.UserRecordId = int(recordId)
 	return
-}
+}